aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Love <carll@gcc.gnu.org>2017-07-06 14:34:41 +0000
committerCarl Love <carll@gcc.gnu.org>2017-07-06 14:34:41 +0000
commitd87f00baa2444a85a43c3a532eba40b3b3fa4918 (patch)
tree7c0b564e3daefa28508bd7b496812e91ff37da2e
parent08e60e19c0f3e4e6756b4b9ee8f37a7b22a26e83 (diff)
downloadgcc-d87f00baa2444a85a43c3a532eba40b3b3fa4918.zip
gcc-d87f00baa2444a85a43c3a532eba40b3b3fa4918.tar.gz
gcc-d87f00baa2444a85a43c3a532eba40b3b3fa4918.tar.bz2
ChangeLog: Clean up from mid air collision
gcc/ChangeLog: 2017-07-06 Carl Love <cel@us.ibm.com> * ChangeLog: Clean up from mid air collision gcc/testsuite/ChangeLog: 2017-07-06 Carl Love <cel@us.ibm.com> * ChangeLog: Clean up from mid air collision From-SVN: r250024
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/testsuite/ChangeLog4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7ac4c1c..647ca92 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2017-07-06 Carl Love <cel@us.ibm.com>
+ * ChangeLog: Clean up from mid air collision
+
+2017-07-06 Carl Love <cel@us.ibm.com>
+
* config/rs6000/rs6000-c.c: Add support for built-in functions
vector signed int vec_subc (vector signed int, vector signed int);
vector signed __int128 vec_subc (vector signed __int128,
@@ -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 <sebastian.peryt@intel.com>
* config/i386/avx512fintrin.h (_mm_mask_getexp_round_ss,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 46992f4..54e7bd2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,6 @@
+2017-07-06 Carl Love <cel@us.ibm.com>
+
+ * ChangeLog: Clean up from mid air collision
2017-07-06 Carl Love <cel@us.ibm.com>
@@ -27,7 +30,6 @@
* gcc.dg/spellcheck-fields-2.c (test_macro): Update expected
underlining within macro expansion.
->>>>>>> .r250022
2017-07-06 Sebastian Peryt <sebastian.peryt@intel.com>
* gcc.target/i386/avx512f-vgetexpsd-1.c (_mm_mask_getexp_sd,