Require string merging support in gnat.dg/string_merge?.adb etc.

	* gcc.dg/merge-all-constants-2.c: Require string_merging support.
	* gnat.dg/string_merge1.adb: Likewise.
	* gnat.dg/string_merge2.adb: Likewise.

From-SVN: r264918

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dd4852f3ea96b6c4687890e93fe83c4454e95fab..e3f48d7655e0bda0f4591f2f0527856233cc4654 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gcc/testsuite/gcc.dg/merge-all-constants-2.c b/gcc/testsuite/gcc.dg/merge-all-constants-2.c
index fbdb2bb517273e43d26be76759c8a7b65ed68c1b..852d35e33c740923aeccb5661e864242f9bd3740 100644 (file)
--- 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 52b9f3c5783e923497e4a053aabdcd0fe668af4f..f3fcac977d2760fd5b7fed205b2a0f079ce15cc4 100644 (file)
--- 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 a2d37bde93ac026dddd6e79f2625872971b011c8..3615b0d4055ed258d8a5a80b82062acff3cd0f0a 100644 (file)
--- 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