[PATCH fix PR71767 4/4 : testsuite] Fix testsuite fallout from section and linker sym visibility changes.

Iain Sandoe Sun, 06 Nov 2016 11:42:02 -0800

Hi folks,

As per $SUBJECT.



OK for trunk (after the relevant patches are applied)?
OK for open branches (likewise)?

Iain

gcc/testsuite/

….   Dominique d'Humieres  <domi...@lps.ens.fr>
       Iain Sandoe  <i...@codesourcery.com>

       PR target/71767

        * g++.dg/abi/key2.C: Adjust for changed Darwin sections and 
linker-visible symbols.
        * g++.dg/torture/darwin-cfstring-3.C: Likewise.
        * gcc.dg/const-uniq-1.c: Likewise.
        * gcc.dg/torture/darwin-cfstring-3.c: Likewise.
        * gcc.target/i386/pr70799-1.c: Likewise.
        
---
 gcc/testsuite/g++.dg/abi/key2.C                  | 1 +
 gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C | 4 ++--
 gcc/testsuite/gcc.dg/const-uniq-1.c              | 2 +-
 gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c | 4 ++--
 gcc/testsuite/gcc.target/i386/pr70799-1.c        | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/g++.dg/abi/key2.C b/gcc/testsuite/g++.dg/abi/key2.C
index 0d1347a..c79b3b2 100644
--- a/gcc/testsuite/g++.dg/abi/key2.C
+++ b/gcc/testsuite/g++.dg/abi/key2.C
@@ -2,6 +2,7 @@
 // PR darwin/25908
 
 // { dg-do compile { target *-*-darwin* } }
+// { dg-options "-mtarget-linker 85.2" }
 // { dg-final { scan-assembler ".globl __ZTV1f\\n      .weak_definition 
__ZTV1f(\\n    .section __DATA,__const_coal,coalesced)?\\n     .align" } }
 // { dg-final { scan-assembler ".globl __ZTS1f\\n      .weak_definition 
__ZTS1f\\n     .section __TEXT,__const_coal,coalesced" } }
 // { dg-final { scan-assembler ".globl __ZTI1f\\n      .weak_definition 
__ZTI1f(\\n    .section __DATA,__const_coal,coalesced)?\\n     .align" } }
diff --git a/gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C 
b/gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C
index 2d755ec..ee4b385 100644
--- a/gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C
+++ b/gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C
@@ -24,7 +24,7 @@ void foo(void) {
   s0 = s1;
 }
 
-/* { dg-final { scan-assembler "\\.long\[ 
\\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ 
\\t\]*\\.long\[ \\t\]+LC.*\n\[ \\t\]*\\.long\[ \\t\]+4\n" { target { 
*-*-darwin* && { ! lp64 } } } } } */
-/* { dg-final { scan-assembler "\\.long\[ 
\\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ 
\\t\]*\\.long\[ \\t\]+LC.*\n\[ \\t\]*\\.long\[ \\t\]+10\n" { target { 
*-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler "\\.long\[ 
\\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ 
\\t\]*\\.long\[ \\t\]+\[lL\]C.*\n\[ \\t\]*\\.long\[ \\t\]+4\n" { target { 
*-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler "\\.long\[ 
\\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ 
\\t\]*\\.long\[ \\t\]+\[lL\]C.*\n\[ \\t\]*\\.long\[ \\t\]+10\n" { target { 
*-*-darwin* && { ! lp64 } } } } } */
 /* { dg-final { scan-assembler 
".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 
4\n\t.quad\t.*\n\t.quad\t4\n" { target { *-*-darwin* && {  lp64 } } } } } */
 /* { dg-final { scan-assembler 
".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 
4\n\t.quad\t.*\n\t.quad\t10\n" { target { *-*-darwin* && {  lp64 } } } } } */
diff --git a/gcc/testsuite/gcc.dg/const-uniq-1.c 
b/gcc/testsuite/gcc.dg/const-uniq-1.c
index 2cb4f8a..0e0718b 100644
--- a/gcc/testsuite/gcc.dg/const-uniq-1.c
+++ b/gcc/testsuite/gcc.dg/const-uniq-1.c
@@ -20,4 +20,4 @@ int lookup2 (int i)
   return a[i+1];
 }
 
-/* { dg-final { scan-tree-dump-times "L\\\$?C\\\.*0" 2 "gimple" } } */
+/* { dg-final { scan-tree-dump-times "\[lL\]\\\$?C\\\.*0" 2 "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c 
b/gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c
index 2d755ec..ee4b385 100644
--- a/gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c
+++ b/gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c
@@ -24,7 +24,7 @@ void foo(void) {
   s0 = s1;
 }
 
-/* { dg-final { scan-assembler "\\.long\[ 
\\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ 
\\t\]*\\.long\[ \\t\]+LC.*\n\[ \\t\]*\\.long\[ \\t\]+4\n" { target { 
*-*-darwin* && { ! lp64 } } } } } */
-/* { dg-final { scan-assembler "\\.long\[ 
\\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ 
\\t\]*\\.long\[ \\t\]+LC.*\n\[ \\t\]*\\.long\[ \\t\]+10\n" { target { 
*-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler "\\.long\[ 
\\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ 
\\t\]*\\.long\[ \\t\]+\[lL\]C.*\n\[ \\t\]*\\.long\[ \\t\]+4\n" { target { 
*-*-darwin* && { ! lp64 } } } } } */
+/* { dg-final { scan-assembler "\\.long\[ 
\\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ 
\\t\]*\\.long\[ \\t\]+\[lL\]C.*\n\[ \\t\]*\\.long\[ \\t\]+10\n" { target { 
*-*-darwin* && { ! lp64 } } } } } */
 /* { dg-final { scan-assembler 
".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 
4\n\t.quad\t.*\n\t.quad\t4\n" { target { *-*-darwin* && {  lp64 } } } } } */
 /* { dg-final { scan-assembler 
".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 
4\n\t.quad\t.*\n\t.quad\t10\n" { target { *-*-darwin* && {  lp64 } } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr70799-1.c 
b/gcc/testsuite/gcc.target/i386/pr70799-1.c
index 5860a8d..44c795c 100644
--- a/gcc/testsuite/gcc.target/i386/pr70799-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-1.c
@@ -3,7 +3,7 @@
 /* { dg-options "-O2 -march=slm -mno-stackrealign" } */
 /* { dg-final { scan-assembler "pxor" } } */
 /* { dg-final { scan-assembler "pcmpeqd" } } */
-/* { dg-final { scan-assembler "movdqa\[ \\t\]+.?LC0" } } */
+/* { dg-final { scan-assembler "movdqa\[ \\t\]+.?\[lL\]C0" } } */
 
 long long a, b, c;
 
-- 
2.8.1

[PATCH fix PR71767 4/4 : testsuite] Fix testsuite fallout from section and linker sym visibility changes.

Reply via email to