[Darwin, testsuite ] Fix for PR58321.

Darwin doesn't emit a .file directive by default
and one of the scan-asm hits for ELF targets comes from
this directive. Adjust for Darwin and explain.

2019-09-06  Iain Sandoe  <iain@sandoe.co.uk>

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

	PR testsuite/58321
	* gcc.target/i386/memcpy-strategy-3.c: Adjust count for Darwin and
	add a comment as to the reason for the difference.
	* gcc.target/i386/memset-strategy-1.c: Likewise.

From-SVN: r275466

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 791e89584e9d3babafe62823dbcd7d13d5b93a0e..c665cd8062d13835e4dbf5df24f282519f83475f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2019-09-06  Iain Sandoe  <iain@sandoe.co.uk>
+
+       Backport from mainline.
+       2019-05-20  Iain Sandoe  <iain@sandoe.co.uk>
+
+       PR testsuite/58321
+       * gcc.target/i386/memcpy-strategy-3.c: Adjust count for Darwin and
+       add a comment as to the reason for the difference.
+       * gcc.target/i386/memset-strategy-1.c: Likewise.
+
 2019-09-05  Iain Sandoe  <iain@sandoe.co.uk>
 
        Backport from mainline.
@@ -144,6 +154,7 @@
 
 2019-09-02  Richard Biener  <rguenther@suse.de>
 
+
        Backport from mainline
        2019-03-14  Richard Biener  <rguenther@suse.de>
 

diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-3.c b/gcc/testsuite/gcc.target/i386/memcpy-strategy-3.c
index ddd1ef7c0b2315b98d640266b5cb4ca9fdf82f16..11687e8c9b5dead0a5f6b54c642ddb6eff389f79 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-3.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-3.c
@@ -1,6 +1,9 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -march=atom -mmemcpy-strategy=vector_loop:2000:align,libcall:-1:align" } */
-/* { dg-final { scan-assembler-times "memcpy" 2  } } */
+/* On ELF platforms, one hit comes from the .file directive.  */
+/* { dg-final { scan-assembler-times "memcpy" 2 { target { ! *-*-darwin* } } } } */
+/* But not on Darwin, which doesn't have a .file directive by default.  */
+/* { dg-final { scan-assembler-times "_memcpy" 1  { target *-*-darwin* } } } */
 
 char a[2048];
 char b[2048];

diff --git a/gcc/testsuite/gcc.target/i386/memset-strategy-1.c b/gcc/testsuite/gcc.target/i386/memset-strategy-1.c
index d1b97c5df10a851071d28be2e9080e776764d418..b4b8e2cfa6f1c654f23f04c3cb801b02c20d63d0 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/memset-strategy-1.c
+++ b/gcc/testsuite/gcc.target/i386/memset-strategy-1.c
@@ -1,10 +1,12 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -march=atom -mmemset-strategy=libcall:-1:align" } */
-/* { dg-final { scan-assembler-times "memset" 2  } } */
+/* On ELF platforms, one hit comes from the .file directive.  */
+/* { dg-final { scan-assembler-times "memset" 2 { target { ! *-*-darwin* } } } } */
+/* But not on Darwin, which doesn't have a .file directive by default.  */
+/* { dg-final { scan-assembler-times "_memset" 1 { target *-*-darwin* } } } */
 
 char a[2048];
 void t (void)
 {
   __builtin_memset (a, 1, 2048);
 }
-