From: Iain Sandoe <iain@sandoe.co.uk>
Date: Tue, 10 Sep 2019 20:39:23 +0000 (+0000)
Subject: [Darwin, X86, testsuite] Amend popcnt spelling for Darwin.
X-Git-Tag: releases/gcc-7.5.0~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21246e04828d4bc24ed459651cc1dfc76abf774f;p=thirdparty%2Fgcc.git

[Darwin, X86, testsuite] Amend popcnt spelling for Darwin.

Darwin uses a different spelling for popcnt (popcnt instead of popcntw).
Check for this in the test.

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

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

	* gcc.target/i386/pr59874-3.c: Use the spelling of popcnt
	expected for Darwin.

From-SVN: r275610
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1043cf256d17..8505ca0d1ecd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-09-10  Iain Sandoe  <iain@sandoe.co.uk>
+
+	Backport from mainline.
+	2019-05-25  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pr59874-3.c: Use the spelling of popcnt
+	expected for Darwin.
+
 2019-09-09  Iain Sandoe  <iain@sandoe.co.uk>
 
 	Backport from mainline.
diff --git a/gcc/testsuite/gcc.target/i386/pr59874-3.c b/gcc/testsuite/gcc.target/i386/pr59874-3.c
index ec55a12e2a0d..0332f04a977a 100644
--- a/gcc/testsuite/gcc.target/i386/pr59874-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr59874-3.c
@@ -1,7 +1,8 @@
 /* PR target/59874 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -mpopcnt -masm=att" } */
-/* { dg-final { scan-assembler "popcntw" } } */
+/* { dg-final { scan-assembler "\tpopcntw" { target { ! *-*-darwin* } } } } */
+/* { dg-final { scan-assembler "\tpopcnt" { target *-*-darwin* } } } */
 
 unsigned int
 foo (unsigned short x)