From b593a195f96010854466ecf46c00c8b0e31bd4a8 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 20 Apr 2018 11:20:46 -0600 Subject: [PATCH] stack-check-5.c: Improve dg-skip-if selector for the stack protector. * gcc.dg/stack-check-5.c: Improve dg-skip-if selector for the stack protector. * gcc.dg/stack-check-6.c: Likewise. * gcc.dg/stack-check-6a.c: Likewise. * gcc.target/i386/stack-check-17.c: Add dg-skip-if selector. * gcc.target/i386/stack-check-18.c: Likewise. * gcc.target/i386/stack-check-19.c: Likewise. From-SVN: r259528 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/gcc.dg/stack-check-5.c | 2 +- gcc/testsuite/gcc.dg/stack-check-6.c | 2 +- gcc/testsuite/gcc.dg/stack-check-6a.c | 2 +- gcc/testsuite/gcc.target/i386/stack-check-17.c | 2 ++ gcc/testsuite/gcc.target/i386/stack-check-18.c | 1 + gcc/testsuite/gcc.target/i386/stack-check-19.c | 1 + 7 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4bc930152b8..5c33c35892b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2018-04-20 Jeff Law + + * gcc.dg/stack-check-5.c: Improve dg-skip-if selector for the + stack protector. + * gcc.dg/stack-check-6.c: Likewise. + * gcc.dg/stack-check-6a.c: Likewise. + * gcc.target/i386/stack-check-17.c: Add dg-skip-if selector. + * gcc.target/i386/stack-check-18.c: Likewise. + * gcc.target/i386/stack-check-19.c: Likewise. + 2018-04-20 Kyrylo Tkachov PR testsuite/85483 diff --git a/gcc/testsuite/gcc.dg/stack-check-5.c b/gcc/testsuite/gcc.dg/stack-check-5.c index 850e023ea4e..604fa3cf6c5 100644 --- a/gcc/testsuite/gcc.dg/stack-check-5.c +++ b/gcc/testsuite/gcc.dg/stack-check-5.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */ /* { dg-require-effective-target supports_stack_clash_protection } */ -/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */ +/* { dg-skip-if "" { *-*-* } { "-fstack-protector*" } { "" } } */ /* Otherwise the S/390 back-end might save the stack pointer in f2 () diff --git a/gcc/testsuite/gcc.dg/stack-check-6.c b/gcc/testsuite/gcc.dg/stack-check-6.c index ab4b0e8894c..fe75612b737 100644 --- a/gcc/testsuite/gcc.dg/stack-check-6.c +++ b/gcc/testsuite/gcc.dg/stack-check-6.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */ /* { dg-require-effective-target supports_stack_clash_protection } */ -/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */ +/* { dg-skip-if "" { *-*-* } { "-fstack-protector*" } { "" } } */ extern void foo (char *); diff --git a/gcc/testsuite/gcc.dg/stack-check-6a.c b/gcc/testsuite/gcc.dg/stack-check-6a.c index 468d649a4fa..8fb9c621585 100644 --- a/gcc/testsuite/gcc.dg/stack-check-6a.c +++ b/gcc/testsuite/gcc.dg/stack-check-6a.c @@ -4,7 +4,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=16" } */ /* { dg-require-effective-target supports_stack_clash_protection } */ -/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */ +/* { dg-skip-if "" { *-*-* } { "-fstack-protector*" } { "" } } */ #include "stack-check-6.c" diff --git a/gcc/testsuite/gcc.target/i386/stack-check-17.c b/gcc/testsuite/gcc.target/i386/stack-check-17.c index d2ef83b348a..25ae9774061 100644 --- a/gcc/testsuite/gcc.target/i386/stack-check-17.c +++ b/gcc/testsuite/gcc.target/i386/stack-check-17.c @@ -1,6 +1,8 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fomit-frame-pointer" } */ /* { dg-require-effective-target supports_stack_clash_protection } */ +/* { dg-skip-if "" { *-*-* } { "-fstack-protector*" } { "" } } */ + int x0, x1; diff --git a/gcc/testsuite/gcc.target/i386/stack-check-18.c b/gcc/testsuite/gcc.target/i386/stack-check-18.c index 6dbff4402da..1cf4bbcfafb 100644 --- a/gcc/testsuite/gcc.target/i386/stack-check-18.c +++ b/gcc/testsuite/gcc.target/i386/stack-check-18.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fdump-rtl-expand" } */ /* { dg-require-effective-target supports_stack_clash_protection } */ +/* { dg-skip-if "" { *-*-* } { "-fstack-protector*" } { "" } } */ int f1 (char *); diff --git a/gcc/testsuite/gcc.target/i386/stack-check-19.c b/gcc/testsuite/gcc.target/i386/stack-check-19.c index b92c126d57f..bf6af5ffc3e 100644 --- a/gcc/testsuite/gcc.target/i386/stack-check-19.c +++ b/gcc/testsuite/gcc.target/i386/stack-check-19.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fdump-rtl-expand" } */ /* { dg-require-effective-target supports_stack_clash_protection } */ +/* { dg-skip-if "" { *-*-* } { "-fstack-protector*" } { "" } } */ int f1 (char *); -- 2.30.2