From 87454aad9964de6234e661e29f96d73dff65a0e4 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Mon, 8 Oct 2018 11:03:22 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.dg/merge-all-constants-2.c | 1 + gcc/testsuite/gnat.dg/string_merge1.adb | 1 + gcc/testsuite/gnat.dg/string_merge2.adb | 1 + 4 files changed, 9 insertions(+) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dd4852f3ea9..e3f48d7655e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-10-08 Rainer Orth + + * 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 * 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 fbdb2bb5172..852d35e33c7 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 52b9f3c5783..f3fcac977d2 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 a2d37bde93a..3615b0d4055 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 -- 2.30.2