[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  <iain@sandoe.co.uk>

	Backport from mainline.
	2019-05-24  Iain Sandoe  <iain@sandoe.co.uk>

	* 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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 833f4be56f3e6dde9c1545c14a719ee6a32dcfa3..e7ed816a74fd4ff4f66f60a5c946d5c82fa47d07 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-09-09  Iain Sandoe  <iain@sandoe.co.uk>
+
+       Backport from mainline.
+       2019-05-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * 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  <iain@sandoe.co.uk>
 
        Backport from mainline.

diff --git a/gcc/testsuite/gcc.target/i386/pr66819-3.c b/gcc/testsuite/gcc.target/i386/pr66819-3.c
index 3bc5a3471e61cc23bbecc86c12b7946a5ffdd0c3..76e3726b38ae560906822752bfd497b2d6a536a5 100644 (file)
--- 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 18b2ccf8120e625d5aedfd0111877df588ff1678..143360d0de38d3c7d22f5d4d785af96fa5c45704 100644 (file)
--- 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 <stdarg.h>