From d87f00baa2444a85a43c3a532eba40b3b3fa4918 Mon Sep 17 00:00:00 2001 From: Carl Love Date: Thu, 6 Jul 2017 14:34:41 +0000 Subject: [PATCH] ChangeLog: Clean up from mid air collision gcc/ChangeLog: 2017-07-06 Carl Love * ChangeLog: Clean up from mid air collision gcc/testsuite/ChangeLog: 2017-07-06 Carl Love * ChangeLog: Clean up from mid air collision From-SVN: r250024 --- gcc/ChangeLog | 5 ++++- gcc/testsuite/ChangeLog | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7ac4c1cc05a..647ca92b706 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2017-07-06 Carl Love + + * ChangeLog: Clean up from mid air collision + 2017-07-06 Carl Love * config/rs6000/rs6000-c.c: Add support for built-in functions @@ -51,7 +55,6 @@ (linemap_client_expand_location_to_spelling_point): Add "aspect" param, and pass it to expand_location_1. ->>>>>>> .r250022 2017-07-06 Sebastian Peryt * config/i386/avx512fintrin.h (_mm_mask_getexp_round_ss, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 46992f44b29..54e7bd231ef 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,6 @@ +2017-07-06 Carl Love + + * ChangeLog: Clean up from mid air collision 2017-07-06 Carl Love @@ -27,7 +30,6 @@ * gcc.dg/spellcheck-fields-2.c (test_macro): Update expected underlining within macro expansion. ->>>>>>> .r250022 2017-07-06 Sebastian Peryt * gcc.target/i386/avx512f-vgetexpsd-1.c (_mm_mask_getexp_sd, -- 2.30.2