aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gcc.dg/merge-all-constants-2.c1
-rw-r--r--gcc/testsuite/gnat.dg/string_merge1.adb1
-rw-r--r--gcc/testsuite/gnat.dg/string_merge2.adb1
4 files changed, 9 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dd4852f..e3f48d7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2018-10-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+ * gcc.dg/merge-all-constants-2.c: Require string_merging support.
+ * gnat.dg/string_merge1.adb: Likewise.
+ * gnat.dg/string_merge2.adb: Likewise.
+
+2018-10-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
* c-c++-common/Wprio-ctor-dtor.c: Require init_priority support.
2018-10-08 Martin Liska <mliska@suse.cz>
diff --git a/gcc/testsuite/gcc.dg/merge-all-constants-2.c b/gcc/testsuite/gcc.dg/merge-all-constants-2.c
index fbdb2bb..852d35e 100644
--- a/gcc/testsuite/gcc.dg/merge-all-constants-2.c
+++ b/gcc/testsuite/gcc.dg/merge-all-constants-2.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-require-effective-target string_merging } */
/* { dg-options "-w -O2 -fmerge-all-constants" } */
const char str1[36] = "0123456789abcdefghijklmnopqrstuvwxyz";
diff --git a/gcc/testsuite/gnat.dg/string_merge1.adb b/gcc/testsuite/gnat.dg/string_merge1.adb
index 52b9f3c..f3fcac9 100644
--- a/gcc/testsuite/gnat.dg/string_merge1.adb
+++ b/gcc/testsuite/gnat.dg/string_merge1.adb
@@ -1,4 +1,5 @@
-- { dg-do compile }
+-- { dg-require-effective-target string_merging }
-- { dg-options "-O1 -fmerge-all-constants" }
procedure String_Merge1 is
diff --git a/gcc/testsuite/gnat.dg/string_merge2.adb b/gcc/testsuite/gnat.dg/string_merge2.adb
index a2d37bd..3615b0d 100644
--- a/gcc/testsuite/gnat.dg/string_merge2.adb
+++ b/gcc/testsuite/gnat.dg/string_merge2.adb
@@ -1,4 +1,5 @@
-- { dg-do compile }
+-- { dg-require-effective-target string_merging }
-- { dg-options "-O1 -fmerge-all-constants" }
procedure String_Merge2 is