From f6f668797534e4166f62b602df41ead276ec62b6 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Mon, 9 Sep 2019 20:13:24 +0000 Subject: [PATCH] [Darwin, X86, testsuite] Adjust match strings. Some of the i386.exp tests fail on Darwin because their scan-asm match strings are too general. In some cases the strings also match instances in the .file and size directives or in comment output. This makes the match strings more specific. 2019-09-09 Iain Sandoe Backport from mainline. 2019-05-24 Iain Sandoe * gcc.target/i386/pr66819-3.c: Specifically, check that there is no call to "bar". * gcc.target/i386/pr66819-4.c: Likewise. From-SVN: r275545 --- gcc/testsuite/ChangeLog | 9 +++++++++ gcc/testsuite/gcc.target/i386/pr66819-3.c | 2 +- gcc/testsuite/gcc.target/i386/pr66819-4.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 833f4be56f3e..e7ed816a74fd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2019-09-09 Iain Sandoe + + Backport from mainline. + 2019-05-24 Iain Sandoe + + * gcc.target/i386/pr66819-3.c: Specifically, check that there is no + call to "bar". + * gcc.target/i386/pr66819-4.c: Likewise. + 2019-09-09 Iain Sandoe Backport from mainline. diff --git a/gcc/testsuite/gcc.target/i386/pr66819-3.c b/gcc/testsuite/gcc.target/i386/pr66819-3.c index 3bc5a3471e61..76e3726b38ae 100644 --- a/gcc/testsuite/gcc.target/i386/pr66819-3.c +++ b/gcc/testsuite/gcc.target/i386/pr66819-3.c @@ -1,6 +1,6 @@ /* { dg-do compile { target ia32 } } */ /* { dg-options "-O2 -mregparm=3" } */ -/* { dg-final { scan-assembler-not "call" } } */ +/* { dg-final { scan-assembler-not {call[ \t]+_?bar} } } */ void (*bar)(int, int); diff --git a/gcc/testsuite/gcc.target/i386/pr66819-4.c b/gcc/testsuite/gcc.target/i386/pr66819-4.c index 18b2ccf8120e..143360d0de38 100644 --- a/gcc/testsuite/gcc.target/i386/pr66819-4.c +++ b/gcc/testsuite/gcc.target/i386/pr66819-4.c @@ -1,6 +1,6 @@ /* { dg-do compile { target ia32 } } */ /* { dg-options "-O2 -mregparm=3" } */ -/* { dg-final { scan-assembler-not "call" } } */ +/* { dg-final { scan-assembler-not {call[ \t]+_?bar} } } */ #include -- 2.47.2