From 1ac221f2df51105f89f4b72a2ba0779609003760 Mon Sep 17 00:00:00 2001 From: Kean Johnston Date: Mon, 28 Nov 2005 18:01:50 +0000 Subject: [PATCH] re PR testsuite/19231 (Execute failure in gcc.c-torture/execute/builtins/strlen-3.c with -fpic/-fPIC) * g++.dg/opt/range-test-1.C: Prevent re-inclusion of system headers. * g++.old-deja/g++.law/profile1.C: No longer expect fail on OSR5. * gcc.c-torture/compile/20000804-1.c: Skip if using -fPIC on X86. * gcc.target/i386/asm-3.c: Ditto. * gcc.target/i386/clobbers.c: Ditto. * gcc.dg/tree-ssa/ssa-dce-2.c: Make t() static and prototype it. * gcc.target/i386/cmov1.c: Make magic* static so it matches the test regexp. * gcc.target/i386/mul.c: Ditto. * gcc.target/i386/ssetype-1.c: Ditto. * gcc.dg/20040813-1.c: Skip on SVR5 systems. * gcc.c-torture/execute/builtins/strlen-3.c: Declare variables as static so the test works with -fPIC mode too. Based on comment in PR19231 by Pinski. * gcc.dg/nest.c: No longer fail on SCO systems as it has -pg again. From-SVN: r107608 --- gcc/testsuite/ChangeLog | 19 +++++++++++++++++++ gcc/testsuite/g++.dg/opt/range-test-1.C | 4 ++++ gcc/testsuite/g++.old-deja/g++.law/profile1.C | 2 +- .../gcc.c-torture/compile/20000804-1.c | 1 + .../gcc.c-torture/execute/builtins/strlen-3.c | 6 +++--- gcc/testsuite/gcc.dg/20040813-1.c | 2 +- gcc/testsuite/gcc.dg/nest.c | 1 - gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c | 4 ++-- gcc/testsuite/gcc.target/i386/asm-3.c | 1 + gcc/testsuite/gcc.target/i386/clobbers.c | 1 + gcc/testsuite/gcc.target/i386/cmov1.c | 14 +++++++------- gcc/testsuite/gcc.target/i386/mul.c | 4 ++-- gcc/testsuite/gcc.target/i386/ssetype-1.c | 2 +- 13 files changed, 43 insertions(+), 18 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7b1a5436316..3c3c8ce6172 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,22 @@ +2005-11-28 Kean Johnston + + * g++.dg/opt/range-test-1.C: Prevent re-inclusion of system + headers. + * g++.old-deja/g++.law/profile1.C: No longer expect fail on OSR5. + * gcc.c-torture/compile/20000804-1.c: Skip if using -fPIC on X86. + * gcc.target/i386/asm-3.c: Ditto. + * gcc.target/i386/clobbers.c: Ditto. + * gcc.dg/tree-ssa/ssa-dce-2.c: Make t() static and prototype it. + * gcc.target/i386/cmov1.c: Make magic* static so it matches the + test regexp. + * gcc.target/i386/mul.c: Ditto. + * gcc.target/i386/ssetype-1.c: Ditto. + * gcc.dg/20040813-1.c: Skip on SVR5 systems. + * gcc.c-torture/execute/builtins/strlen-3.c: Declare variables as + static so the test works with -fPIC mode too. Based on comment in + PR19231 by Pinski. + * gcc.dg/nest.c: No longer fail on SCO systems as it has -pg again. + 2005-11-28 Richard Guenther * gcc.dg/alias-9.c: New testcase. diff --git a/gcc/testsuite/g++.dg/opt/range-test-1.C b/gcc/testsuite/g++.dg/opt/range-test-1.C index 9391748837e..cc5ba669479 100644 --- a/gcc/testsuite/g++.dg/opt/range-test-1.C +++ b/gcc/testsuite/g++.dg/opt/range-test-1.C @@ -2,9 +2,13 @@ // { dg-do run } */ // { dg-options "-O2" } */ +#ifndef __RANGE_TEST_HDR_INCL +#define __RANGE_TEST_HDR_INCL +/* Protect against fix-header weakness */ #include #include #include +#endif #if (INT_MAX == 2147483647) && (INT_MIN == -2147483648) \ && (SCHAR_MIN == -128) && (SCHAR_MAX == 127) \ diff --git a/gcc/testsuite/g++.old-deja/g++.law/profile1.C b/gcc/testsuite/g++.old-deja/g++.law/profile1.C index 56c52d1ef9a..acc20d0ad92 100644 --- a/gcc/testsuite/g++.old-deja/g++.law/profile1.C +++ b/gcc/testsuite/g++.old-deja/g++.law/profile1.C @@ -1,4 +1,4 @@ -// { dg-do run { xfail i[3456]86-*-sco3.2v5* } } +// { dg-do run } // { dg-require-profiling "-pg" } // { dg-options "-pg" } // { dg-options "-pg -static" { target hppa*-*-hpux* } } diff --git a/gcc/testsuite/gcc.c-torture/compile/20000804-1.c b/gcc/testsuite/gcc.c-torture/compile/20000804-1.c index 782764b31bb..6942ae7c9ec 100644 --- a/gcc/testsuite/gcc.c-torture/compile/20000804-1.c +++ b/gcc/testsuite/gcc.c-torture/compile/20000804-1.c @@ -1,6 +1,7 @@ /* This does not work on m68hc11 or h8300 due to the use of an asm statement to force a 'long long' (64-bits) to go in a register. */ /* { dg-do assemble { xfail m6811-*-* m6812-*-* h8300-*-* } } */ +/* { dg-skip-if "" { i?86-*-* } { "-fpic" "-fPIC" } { "" } } */ /* Copyright (C) 2000, 2003 Free Software Foundation */ __complex__ long long f () diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/strlen-3.c b/gcc/testsuite/gcc.c-torture/execute/builtins/strlen-3.c index 74075fdd3c6..221e306247a 100644 --- a/gcc/testsuite/gcc.c-torture/execute/builtins/strlen-3.c +++ b/gcc/testsuite/gcc.c-torture/execute/builtins/strlen-3.c @@ -7,9 +7,9 @@ extern void abort (void); extern __SIZE_TYPE__ strlen (const char *); extern char *strcpy (char *, const char *); -const char bar[] = "Hello, World!"; -const char baz[] = "hello, world?"; -const char larger[20] = "short string"; +static const char bar[] = "Hello, World!"; +static const char baz[] = "hello, world?"; +static const char larger[20] = "short string"; extern volatile int inside_main; int l1 = 1; diff --git a/gcc/testsuite/gcc.dg/20040813-1.c b/gcc/testsuite/gcc.dg/20040813-1.c index aa8d166302d..a983886da29 100644 --- a/gcc/testsuite/gcc.dg/20040813-1.c +++ b/gcc/testsuite/gcc.dg/20040813-1.c @@ -2,7 +2,7 @@ /* Contributed by Devang Patel */ /* { dg-do compile } */ -/* { dg-skip-if "No stabs" { mmix-*-* *-*-aix* *-*-netware* alpha*-*-* hppa*64*-*-* ia64-*-* } { "*" } { "" } } */ +/* { dg-skip-if "No stabs" { mmix-*-* *-*-aix* *-*-netware* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-sysv5* } { "*" } { "" } } */ /* { dg-options "-gstabs" } */ int diff --git a/gcc/testsuite/gcc.dg/nest.c b/gcc/testsuite/gcc.dg/nest.c index 89ecdd58a06..b9476600ae2 100644 --- a/gcc/testsuite/gcc.dg/nest.c +++ b/gcc/testsuite/gcc.dg/nest.c @@ -4,7 +4,6 @@ /* { dg-options "-O2 -pg" } */ /* { dg-options "-O2 -pg -static" { target hppa*-*-hpux* } } */ /* { dg-error "profiler" "No profiler support" { target xstormy16-*-* } 0 } */ -/* { dg-error "-pg not supported" "Profiler support missing" { target *-*-sco3.2v5* } 0 } */ /* { dg-bogus "\[Uu\]nresolved symbol ._mcount" "Profiling unsupported" { xfail *-*-netware* } 0 } */ extern void abort (void); diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c index 81a11a97bda..655f61c6f73 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c @@ -2,11 +2,11 @@ /* { dg-options "-O2 -fdump-tree-dce3" } */ /* We should notice constantness of this function. */ -int t(int a) +static int __attribute__((noinline)) t(int a) { return a+1; } -q() +void q(void) { int i = t(1); if (!i) diff --git a/gcc/testsuite/gcc.target/i386/asm-3.c b/gcc/testsuite/gcc.target/i386/asm-3.c index 19bf1534521..e85d1c1ebdd 100644 --- a/gcc/testsuite/gcc.target/i386/asm-3.c +++ b/gcc/testsuite/gcc.target/i386/asm-3.c @@ -1,6 +1,7 @@ /* PR inline-asm/6806 */ /* { dg-do run { target i?86-*-* x86_64-*-* } } */ /* { dg-options "-O2" } */ +/* { dg-skip-if "" { i?86-*-* } { "-fpic" "-fPIC" } { "" } } */ extern void abort (void); diff --git a/gcc/testsuite/gcc.target/i386/clobbers.c b/gcc/testsuite/gcc.target/i386/clobbers.c index 44c46b0bf02..91179a9d1ca 100644 --- a/gcc/testsuite/gcc.target/i386/clobbers.c +++ b/gcc/testsuite/gcc.target/i386/clobbers.c @@ -1,6 +1,7 @@ /* Test asm clobbers on x86. */ /* { dg-do run { target i?86-*-* x86_64-*-* } } */ +/* { dg-skip-if "" { i?86-*-* } { "-fpic" "-fPIC" } { "" } } */ extern void abort (void); diff --git a/gcc/testsuite/gcc.target/i386/cmov1.c b/gcc/testsuite/gcc.target/i386/cmov1.c index 71f03ae9fea..9252d868f96 100644 --- a/gcc/testsuite/gcc.target/i386/cmov1.c +++ b/gcc/testsuite/gcc.target/i386/cmov1.c @@ -9,15 +9,15 @@ /* Check code generation for several conditional moves doable by single arithmetics. */ -int magic_namea; -char magic_nameb; -short magic_namec; -int magic_named; -char magic_namee; -short magic_namef; +static int magic_namea; +static char magic_nameb; +static short magic_namec; +static int magic_named; +static char magic_namee; +static short magic_namef; unsigned int gen; -m() +void m(void) { magic_namec=magic_namec>=0?0:-1; magic_namea=magic_namea>=0?0:-1; diff --git a/gcc/testsuite/gcc.target/i386/mul.c b/gcc/testsuite/gcc.target/i386/mul.c index 2a864af76d0..72069fe2cf8 100644 --- a/gcc/testsuite/gcc.target/i386/mul.c +++ b/gcc/testsuite/gcc.target/i386/mul.c @@ -3,8 +3,8 @@ /* { dg-final { scan-assembler "and\[^\\n\]*magic" } } */ /* Should be done as "andw $32767, magic". */ -unsigned short magic; -t() +static unsigned short magic; +void t(void) { magic%=(unsigned short)0x8000U; } diff --git a/gcc/testsuite/gcc.target/i386/ssetype-1.c b/gcc/testsuite/gcc.target/i386/ssetype-1.c index 50d0fcaa58a..47a68918d8c 100644 --- a/gcc/testsuite/gcc.target/i386/ssetype-1.c +++ b/gcc/testsuite/gcc.target/i386/ssetype-1.c @@ -11,7 +11,7 @@ #include -__m128d magic_a, magic_b; +static __m128d magic_a, magic_b; __m128d t1(void) -- 2.30.2