|
 |
8178f7 |
diff --git a/gcc/testsuite/gcc.target/i386/stack-check-17.c b/gcc/testsuite/gcc.target/i386/stack-check-17.c
|
|
|
8178f7 |
index d2ef83b..dcd2930 100644
|
|
|
8178f7 |
--- a/gcc/testsuite/gcc.target/i386/stack-check-17.c
|
|
|
8178f7 |
+++ b/gcc/testsuite/gcc.target/i386/stack-check-17.c
|
|
|
8178f7 |
@@ -29,9 +29,11 @@ f3 (void)
|
|
|
8178f7 |
into either a stack slot or callee saved register. The former
|
|
|
8178f7 |
would be rather dumb. So assume it does not happen.
|
|
|
8178f7 |
|
|
|
8178f7 |
- So search for two/four pushes for the callee register saves/argument
|
|
|
8178f7 |
- pushes and no pops (since the function has no reachable epilogue). */
|
|
|
8178f7 |
-/* { dg-final { scan-assembler-times "push\[ql\]" 2 { target { ! ia32 } } } } */
|
|
|
8178f7 |
-/* { dg-final { scan-assembler-times "push\[ql\]" 4 { target { ia32 } } } } */
|
|
|
8178f7 |
+ So search for two pushes for the callee register saves pushes
|
|
|
8178f7 |
+ and no pops (since the function has no reachable epilogue).
|
|
|
8178f7 |
+
|
|
|
8178f7 |
+ This is slightly different than upstream because the code we
|
|
|
8178f7 |
+ generate for argument setup is slightly different. */
|
|
|
8178f7 |
+/* { dg-final { scan-assembler-times "push\[ql\]" 2 } } */
|
|
|
8178f7 |
/* { dg-final { scan-assembler-not "pop" } } */
|
|
|
8178f7 |
|
|
|
8178f7 |
diff --git a/gcc/testsuite/gcc.target/i386/stack-check-18.c b/gcc/testsuite/gcc.target/i386/stack-check-18.c
|
|
|
8178f7 |
index 6dbff44..1638f77 100644
|
|
|
8178f7 |
--- a/gcc/testsuite/gcc.target/i386/stack-check-18.c
|
|
|
8178f7 |
+++ b/gcc/testsuite/gcc.target/i386/stack-check-18.c
|
|
|
8178f7 |
@@ -1,6 +1,7 @@
|
|
|
8178f7 |
/* { dg-do compile } */
|
|
|
8178f7 |
/* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fdump-rtl-expand" } */
|
|
|
8178f7 |
/* { dg-require-effective-target supports_stack_clash_protection } */
|
|
|
8178f7 |
+/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */
|
|
|
8178f7 |
|
|
|
8178f7 |
int f1 (char *);
|
|
|
8178f7 |
|
|
|
8178f7 |
diff --git a/gcc/testsuite/gcc.target/i386/stack-check-19.c b/gcc/testsuite/gcc.target/i386/stack-check-19.c
|
|
|
8178f7 |
index b92c126..c341801 100644
|
|
|
8178f7 |
--- a/gcc/testsuite/gcc.target/i386/stack-check-19.c
|
|
|
8178f7 |
+++ b/gcc/testsuite/gcc.target/i386/stack-check-19.c
|
|
|
8178f7 |
@@ -1,6 +1,7 @@
|
|
|
8178f7 |
/* { dg-do compile } */
|
|
|
8178f7 |
/* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fdump-rtl-expand" } */
|
|
|
8178f7 |
/* { dg-require-effective-target supports_stack_clash_protection } */
|
|
|
8178f7 |
+/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */
|
|
|
8178f7 |
|
|
|
8178f7 |
int f1 (char *);
|
|
|
8178f7 |
|
|
|
8178f7 |
@@ -24,6 +25,6 @@ f2 (const int size)
|
|
|
8178f7 |
in the probe loop and one that bypasses the residual probe.
|
|
|
8178f7 |
|
|
|
8178f7 |
These will all be equality tests. */
|
|
|
8178f7 |
-/* { dg-final { scan-assembler-times "(\?:je|jne)" 3 } } */
|
|
|
8178f7 |
+/* { dg-final { scan-assembler-times "(\?:jmp|je|jne)" 3 } } */
|
|
|
8178f7 |
|
|
|
8178f7 |
|