Tested on x86_64-darwin, pushed to trunk, thanks
Iain
--- 8< ---
These tests assume some ELF defaults and need alterante matches for
Mach-O.
gcc/testsuite/ChangeLog:
* gcc.target/i386/harden-sls-4.c: Amend for mach-o
* gcc.target/i386/harden-sls-5.c: Likewise.
Signed-off-by: Iain Sandoe <[email protected]>
---
gcc/testsuite/gcc.target/i386/harden-sls-4.c | 3 ++-
gcc/testsuite/gcc.target/i386/harden-sls-5.c | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-4.c
b/gcc/testsuite/gcc.target/i386/harden-sls-4.c
index f70dd1379d3..38ecdec0d9f 100644
--- a/gcc/testsuite/gcc.target/i386/harden-sls-4.c
+++ b/gcc/testsuite/gcc.target/i386/harden-sls-4.c
@@ -10,7 +10,8 @@ foo (void)
fptr ();
}
-/* { dg-final { scan-assembler "jmp\[ \t\]+\\*_?fptr" { target { ! x32 } } } }
*/
+/* { dg-final { scan-assembler "jmp\[ \t\]+\\*_?fptr" { target { { ! x32 } &&
{ ! *-*-darwin* } } } } } */
+/* { dg-final { scan-assembler "jmp\[ \t\]+\\*\\(%\[re\]ax\\)" { target
*-*-darwin* } } } */
/* { dg-final { scan-assembler "movl\[ \t\]+fptr\\(%rip\\), %eax" { target x32
} } } */
/* { dg-final { scan-assembler "jmp\[ \t\]+\\*%rax" { target x32 } } } */
/* { dg-final { scan-assembler-times "int3" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-5.c
b/gcc/testsuite/gcc.target/i386/harden-sls-5.c
index 613c44c6f82..41ed6c25d09 100644
--- a/gcc/testsuite/gcc.target/i386/harden-sls-5.c
+++ b/gcc/testsuite/gcc.target/i386/harden-sls-5.c
@@ -1,6 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep
-mindirect-branch=thunk-extern -mharden-sls=return" } */
/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */
+/* { dg-additional-options "-mdynamic-no-pic" { target { ia32 && *-*-darwin* }
} } */
typedef void (*dispatch_t)(long offset);
--
2.50.1 (Apple Git-155)
