Update x86 gas tests for mingw

	* gas/i386/avx512f-nondef.d: Updated for mingw.
	* gas/i386/mpx-add-bnd-prefix.d: Likewise.
	* gas/i386/x86-64-avx512f-nondef.d: Likewise.
	* gas/i386/x86-64-mpx-add-bnd-prefix.d: Likewise.
	* gas/i386/x86-64-mpx-addr32.d: Likewise.
	* gas/i386/x86-64-opcode.d: Likewise.
	* gas/i386/x86-64-sha.d: Likewise.

8 files changed, 21 insertions, 9 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 174ca8eeff8..1d38ed2db71 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2013-11-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/avx512f-nondef.d: Updated for mingw.
+	* gas/i386/mpx-add-bnd-prefix.d: Likewise.
+	* gas/i386/x86-64-avx512f-nondef.d: Likewise.
+	* gas/i386/x86-64-mpx-add-bnd-prefix.d: Likewise.
+	* gas/i386/x86-64-mpx-addr32.d: Likewise.
+	* gas/i386/x86-64-opcode.d: Likewise.
+	* gas/i386/x86-64-sha.d: Likewise.
+
 2013-11-18  Renlin Li  <Renlin.Li@arm.com>
 
 	* gas/arm/attr-march-armv7ve.d: New test case for armv7ve.
diff --git a/gas/testsuite/gas/i386/avx512f-nondef.d b/gas/testsuite/gas/i386/avx512f-nondef.d
index e9668c4954f..d768b7c27e4 100644
--- a/gas/testsuite/gas/i386/avx512f-nondef.d
+++ b/gas/testsuite/gas/i386/avx512f-nondef.d
@@ -14,6 +14,6 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 c2 55 1f 3b f4    	vpminud %zmm4,%zmm5,%zmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 7e 48 31 72 7f 	vpmovdb %zmm6,0x7f0\(%edx\)
 [ 	]*[a-f0-9]+:	62                   	vpmovdb %zmm6,\(bad\)
-[ 	]*[a-f0-9]+:	f2 7e 58             	bnd jle 0x7d
+[ 	]*[a-f0-9]+:	f2 7e 58             	bnd jle (0x7d|7d <.text\+0x7d>)
 [ 	]*[a-f0-9]+:	31 72 7f             	xor    %esi,0x7f\(%edx\)
 #pass
diff --git a/gas/testsuite/gas/i386/mpx-add-bnd-prefix.d b/gas/testsuite/gas/i386/mpx-add-bnd-prefix.d
index 1e925efc252..571f0da5897 100644
--- a/gas/testsuite/gas/i386/mpx-add-bnd-prefix.d
+++ b/gas/testsuite/gas/i386/mpx-add-bnd-prefix.d
@@ -7,7 +7,7 @@
 
 Disassembly of section .text:
 
-0+ <foo-0x14>:
+0+ <.*>:
 [ 	]*[a-f0-9]+:	f2 e8 0e 00 00 00    	bnd call 14 <foo>
 [ 	]*[a-f0-9]+:	f2 ff 10             	bnd call \*\(%eax\)
 [ 	]*[a-f0-9]+:	f2 74 08             	bnd je 14 <foo>
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f-nondef.d b/gas/testsuite/gas/i386/x86-64-avx512f-nondef.d
index 19c15ca74ef..bce2d80588d 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f-nondef.d
+++ b/gas/testsuite/gas/i386/x86-64-avx512f-nondef.d
@@ -14,6 +14,6 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 c2 55 1f 3b f4    	vpminud %zmm12,%zmm5,%zmm22\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 7e 48 31 72 7f 	vpmovdb %zmm6,0x7f0\(%rdx\)
 [ 	]*[a-f0-9]+:	62                   	vpmovdb %zmm6,\(bad\)
-[ 	]*[a-f0-9]+:	f2 7e 58             	bnd jle 0x7d
+[ 	]*[a-f0-9]+:	f2 7e 58             	bnd jle (0x7d|7d <.text\+0x7d>)
 [ 	]*[a-f0-9]+:	31 72 7f             	xor    %esi,0x7f\(%rdx\)
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d b/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
index cbd77b8b6fc..cef644f5c9b 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
+++ b/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
@@ -7,7 +7,7 @@
 
 Disassembly of section .text:
 
-0+ <foo-0x14>:
+0+ <.*>:
 [ 	]*[a-f0-9]+:	f2 e8 0e 00 00 00    	bnd callq 14 <foo>
 [ 	]*[a-f0-9]+:	f2 ff 10             	bnd callq \*\(%rax\)
 [ 	]*[a-f0-9]+:	f2 74 08             	bnd je 14 <foo>
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-addr32.d b/gas/testsuite/gas/i386/x86-64-mpx-addr32.d
index 4bf830ce3af..cb53535eb0a 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-addr32.d
+++ b/gas/testsuite/gas/i386/x86-64-mpx-addr32.d
@@ -38,3 +38,4 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 0f 1b 14 1d 03 00 00 00 	addr32 bndstx %bnd2,0x3\(,%rbx,1\)
 [ 	]*[a-f0-9]+:	67 0f 1a 44 18 03    	addr32 bndldx 0x3\(%rax,%rbx,1\),%bnd0
 [ 	]*[a-f0-9]+:	67 0f 1a 14 1d 03 00 00 00 	addr32 bndldx 0x3\(,%rbx,1\),%bnd2
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-opcode.d b/gas/testsuite/gas/i386/x86-64-opcode.d
index 127791f38a5..d29c2abfbf0 100644
--- a/gas/testsuite/gas/i386/x86-64-opcode.d
+++ b/gas/testsuite/gas/i386/x86-64-opcode.d
@@ -51,11 +51,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	48 0f c3 00          	movnti %rax,\(%rax\)
 [ 	]*[a-f0-9]+:	4d 0f c3 00          	movnti %r8,\(%r8\)
 [ 	]*[a-f0-9]+:	4c 0f c3 00          	movnti %r8,\(%rax\)
-[ 	]*[a-f0-9]+:	e2 fe                	loop   0x[0-9a-f]+
-[ 	]*[a-f0-9]+:	e2 fe                	loop   0x[0-9a-f]+
-[ 	]*[a-f0-9]+:	67 e2 fd             	loopl  0x[0-9a-f]+
-[ 	]*[a-f0-9]+:	e3 fe                	jrcxz  0x[0-9a-f]+
-[ 	]*[a-f0-9]+:	67 e3 fd             	jecxz  0x[0-9a-f]+
+[ 	]*[a-f0-9]+:	e2 fe                	loop   .*
+[ 	]*[a-f0-9]+:	e2 fe                	loop   .*
+[ 	]*[a-f0-9]+:	67 e2 fd             	loopl  .*
+[ 	]*[a-f0-9]+:	e3 fe                	jrcxz  .*
+[ 	]*[a-f0-9]+:	67 e3 fd             	jecxz  .*
 [ 	]*[a-f0-9]+:	41 f6 38             	idivb  \(%r8\)
 [ 	]*[a-f0-9]+:	f6 38                	idivb  \(%rax\)
 [ 	]*[a-f0-9]+:	66 41 f7 38          	idivw  \(%r8\)
diff --git a/gas/testsuite/gas/i386/x86-64-sha.d b/gas/testsuite/gas/i386/x86-64-sha.d
index 64f515d156c..99aad8a4dfd 100644
--- a/gas/testsuite/gas/i386/x86-64-sha.d
+++ b/gas/testsuite/gas/i386/x86-64-sha.d
@@ -70,3 +70,4 @@ Disassembly of section \.text:
 [ 	]*[a-f0-9]+:	0f 38 cd 10          	sha256msg2 \(%rax\),%xmm2
 [ 	]*[a-f0-9]+:	0f 38 cd 58 12       	sha256msg2 0x12\(%rax\),%xmm3
 [ 	]*[a-f0-9]+:	0f 38 cd 24 58       	sha256msg2 \(%rax,%rbx,2\),%xmm4
+#pass