From 5a9638e9fa3d2b5044836c20b8a8aaa7f35eeced Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sun, 4 Aug 2019 11:43:19 +0000 Subject: [PATCH] Darwin, X86, backport testsuite fixes for align syntax. Darwin has a .align taking a power of 2 by default, so that some tests expecting a byte count are failing. 2019-08-04 Iain Sandoe Backport from mainline. 2019-05-31 Iain Sandoe * gcc.target/i386/falign-functions-3.c: Adjust align syntax and label for Darwin. * gcc.target/i386/attr-aligned-2.c: Adjust align syntax for Darwin. From-SVN: r274071 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/gcc.target/i386/attr-aligned-2.c | 4 ++-- gcc/testsuite/gcc.target/i386/falign-functions-3.c | 9 +++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6033ee0248fd..b9be7087f6c9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2019-08-04 Iain Sandoe + + Backport from mainline. + 2019-05-31 Iain Sandoe + + * gcc.target/i386/falign-functions-3.c: Adjust align syntax + and label for Darwin. + * gcc.target/i386/attr-aligned-2.c: Adjust align syntax for + Darwin. + 2019-08-04 Iain Sandoe Backport from mainline. diff --git a/gcc/testsuite/gcc.target/i386/attr-aligned-2.c b/gcc/testsuite/gcc.target/i386/attr-aligned-2.c index b99a28a8f3d5..384178202013 100644 --- a/gcc/testsuite/gcc.target/i386/attr-aligned-2.c +++ b/gcc/testsuite/gcc.target/i386/attr-aligned-2.c @@ -14,8 +14,8 @@ void f4 (void); ALIGN (4) void f4 (void) { } -/* { dg-final { scan-assembler ".align 4\n\t.globl\tf4" } } */ - +/* { dg-final { scan-assembler ".align 4\n\t.globl\tf4" { target { ! *-*-darwin* } } } } */ +/* { dg-final { scan-assembler {.align[ \t]2,0x90\n\t.globl[ \t]_f4} { target *-*-darwin* } } } */ void g (void) { } diff --git a/gcc/testsuite/gcc.target/i386/falign-functions-3.c b/gcc/testsuite/gcc.target/i386/falign-functions-3.c index f4a6acee0c87..86423c4e4a9e 100644 --- a/gcc/testsuite/gcc.target/i386/falign-functions-3.c +++ b/gcc/testsuite/gcc.target/i386/falign-functions-3.c @@ -9,15 +9,16 @@ ALIGN (4) void f4 (void) { } -/* { dg-final { scan-assembler ".align 4\n\t.globl\tf4" } } */ - +/* { dg-final { scan-assembler ".align 4\n\t.globl\tf4" { target { ! *-*-darwin* } } } } */ +/* { dg-final { scan-assembler {.align 2,0x90\n\t.globl[ \t]_f4} { target *-*-darwin* } } } */ void f32 (void) { } -/* { dg-final { scan-assembler ".p2align 5\n\t.globl\tf32" } } */ +/* { dg-final { scan-assembler {.p2align 5\n\t.globl[ \t]_?f32} } } */ ALIGN (64) void f64 (void) { } -/* { dg-final { scan-assembler ".align 64\n\t.globl\tf64" } } */ +/* { dg-final { scan-assembler ".align 64\n\t.globl\tf64" { target { ! *-*-darwin* } } } } */ +/* { dg-final { scan-assembler {.align 6,0x90\n\t.globl[ \t]_f64} { target *-*-darwin* } } } */ -- 2.47.2