Arm: Clean up PE GAS testsuite correct THUMB tests.

The PE targets don't support mapping symbols and so the disassembler is unable
to correctly output thumb instructions when the input was thumb.

So for testcases that only have thumb output, I have copied them and skipped the
ones for which auto-detection is supposed to work on PE, and added a new one
that will force thumb output.  This so that the tests still check the mapping
symbols.

For the tests that switch between thumb and arm in one file I just skip them
entirely on PE targets.

This cleans up the PE GAS testsuite.

gas/

	* testsuite/gas/arm/archv6t2-1-pe.d: New test.
	* testsuite/gas/arm/archv6t2-1.d: Skip pe.
	* testsuite/gas/arm/csdb.d: Skip pe.
	* testsuite/gas/arm/sb-thumb1-pe.d: New test.
	* testsuite/gas/arm/sb-thumb1.d: Skip pe.
	* testsuite/gas/arm/sb-thumb2-pe.d: New test.
	* testsuite/gas/arm/sb-thumb2.d: Skip pe.
	* testsuite/gas/arm/udf.d: Skip pe.

9 files changed, 51 insertions, 1 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index cd80c48673c..d3aa8dc43ae 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+2019-01-17  Tamar Christina  <tamar.christina@arm.com>
+
+	* testsuite/gas/arm/archv6t2-1-pe.d: New test.
+	* testsuite/gas/arm/archv6t2-1.d: Skip pe.
+	* testsuite/gas/arm/csdb.d: Skip pe.
+	* testsuite/gas/arm/sb-thumb1-pe.d: New test.
+	* testsuite/gas/arm/sb-thumb1.d: Skip pe.
+	* testsuite/gas/arm/sb-thumb2-pe.d: New test.
+	* testsuite/gas/arm/sb-thumb2.d: Skip pe.
+	* testsuite/gas/arm/udf.d: Skip pe.
+
 2019-01-16  Kito Cheng  <kito@andestech.com>
 
 	* testsuite/gas/riscv/attribute-empty.d: New.
diff --git a/gas/testsuite/gas/arm/archv6t2-1-pe.d b/gas/testsuite/gas/arm/archv6t2-1-pe.d
new file mode 100644
index 00000000000..5f98e61c8de
--- /dev/null
+++ b/gas/testsuite/gas/arm/archv6t2-1-pe.d
@@ -0,0 +1,12 @@
+# name: ARMv6T2 THUMB mode
+# as: -march=armv6t2 -mthumb
+# source: archv6t2-1.s
+# objdump: -dr --prefix-addresses --show-raw-insn -M force-thumb
+
+.*: +file format .*arm.*
+
+Disassembly of section .text:
+0[0-9a-f]+ <[^>]+> bf10      	yield
+0[0-9a-f]+ <[^>]+> bf20      	wfe
+0[0-9a-f]+ <[^>]+> bf30      	wfi
+0[0-9a-f]+ <[^>]+> bf40      	sev
diff --git a/gas/testsuite/gas/arm/archv6t2-1.d b/gas/testsuite/gas/arm/archv6t2-1.d
index a4b4c34f5d3..49853eaa060 100644
--- a/gas/testsuite/gas/arm/archv6t2-1.d
+++ b/gas/testsuite/gas/arm/archv6t2-1.d
@@ -2,6 +2,7 @@
 # as: -march=armv6t2 -mthumb
 # source: archv6t2-1.s
 # objdump: -dr --prefix-addresses --show-raw-insn
+# skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/csdb.d b/gas/testsuite/gas/arm/csdb.d
index db73907be43..0ba5b6feac3 100644
--- a/gas/testsuite/gas/arm/csdb.d
+++ b/gas/testsuite/gas/arm/csdb.d
@@ -1,6 +1,7 @@
 #name: CSDB
 #source: csdb.s
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/sb-thumb1-pe.d b/gas/testsuite/gas/arm/sb-thumb1-pe.d
new file mode 100644
index 00000000000..850c93fd0de
--- /dev/null
+++ b/gas/testsuite/gas/arm/sb-thumb1-pe.d
@@ -0,0 +1,11 @@
+#objdump: -dr --prefix-addresses --show-raw-insn -M force-thumb
+#name: SB instruction (Thumb)
+#source: sb.s
+#as: -march=armv8.5-a -mthumb
+
+# Test SB Instruction
+
+.*: *file format .*arm.*
+
+Disassembly of section .text:
+.*> f3bf 8f70 	sb
diff --git a/gas/testsuite/gas/arm/sb-thumb1.d b/gas/testsuite/gas/arm/sb-thumb1.d
index dc3bc4945dd..3ee55139b02 100644
--- a/gas/testsuite/gas/arm/sb-thumb1.d
+++ b/gas/testsuite/gas/arm/sb-thumb1.d
@@ -2,8 +2,9 @@
 #name: SB instruction (Thumb)
 #source: sb.s
 #as: -march=armv8.5-a -mthumb
+#skip: *-*-pe *-*-wince
 
-# Test SB Instructio
+# Test SB Instruction
 
 .*: *file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/sb-thumb2-pe.d b/gas/testsuite/gas/arm/sb-thumb2-pe.d
new file mode 100644
index 00000000000..681d985dfbf
--- /dev/null
+++ b/gas/testsuite/gas/arm/sb-thumb2-pe.d
@@ -0,0 +1,11 @@
+#objdump: -dr --prefix-addresses --show-raw-insn -M force-thumb
+#name: SB instruction (Thumb) with +sb
+#source: sb.s
+#as: -march=armv8-a+sb -mthumb
+
+# Test SB Instructio
+
+.*: *file format .*arm.*
+
+Disassembly of section .text:
+.*> f3bf 8f70 	sb
diff --git a/gas/testsuite/gas/arm/sb-thumb2.d b/gas/testsuite/gas/arm/sb-thumb2.d
index 892ca8f0758..c9badee3d06 100644
--- a/gas/testsuite/gas/arm/sb-thumb2.d
+++ b/gas/testsuite/gas/arm/sb-thumb2.d
@@ -2,6 +2,7 @@
 #name: SB instruction (Thumb) with +sb
 #source: sb.s
 #as: -march=armv8-a+sb -mthumb
+#skip: *-*-pe *-*-wince
 
 # Test SB Instructio
 
diff --git a/gas/testsuite/gas/arm/udf.d b/gas/testsuite/gas/arm/udf.d
index ef24209aec2..f53a43757e4 100644
--- a/gas/testsuite/gas/arm/udf.d
+++ b/gas/testsuite/gas/arm/udf.d
@@ -2,6 +2,7 @@
 #name: UDF
 #as: -march=armv8-a
 #warning_output: udf.l
+#skip: *-*-pe *-*-wince
 
 .*: +file format .*arm.*