Move assembler "IRP \+" test into a separate file. Add XFAILs for targets that do...

diff --git a/gas/testsuite/gas/macros/count.l b/gas/testsuite/gas/macros/count.l
index ca666ea019516e7c458d08b4bc6f3b59ad697535..dc4951dd699512177347786ed17693a89812d782 100644 (file)
--- a/gas/testsuite/gas/macros/count.l
+++ b/gas/testsuite/gas/macros/count.l
@@ -1,3 +1,4 @@
+#...
 0
 0
 1
@@ -8,5 +9,3 @@
 1
 4
 2
-\+
-\+

diff --git a/gas/testsuite/gas/macros/count.s b/gas/testsuite/gas/macros/count.s
index 4a5b078ba6081d4c9a49ef7648b229045408ce18..c752ca8367d3856e553ce35b5d94499205cf591e 100644 (file)
--- a/gas/testsuite/gas/macros/count.s
+++ b/gas/testsuite/gas/macros/count.s
@@ -17,10 +17,3 @@
 
        mac1 2
        mac2 3
-
-       .irp i,1
-       .print "\+"
-       .endr
-       .irpc i,1
-       .print "\+"
-       .endr

diff --git a/gas/testsuite/gas/macros/irp-count.d b/gas/testsuite/gas/macros/irp-count.d
new file mode 100644 (file)
index 0000000..66c51a6
--- /dev/null
+++ b/gas/testsuite/gas/macros/irp-count.d
@@ -0,0 +1,2 @@
+#name: Macro counters inside IRP commands (irp-count.d)
+# Tests that \+ does not trip up IRP commands

diff --git a/gas/testsuite/gas/macros/irp-count.l b/gas/testsuite/gas/macros/irp-count.l
new file mode 100644 (file)
index 0000000..d101555
--- /dev/null
+++ b/gas/testsuite/gas/macros/irp-count.l
@@ -0,0 +1,3 @@
+#...
+\+
+\+

diff --git a/gas/testsuite/gas/macros/irp-count.s b/gas/testsuite/gas/macros/irp-count.s
new file mode 100644 (file)
index 0000000..1ff5c7b
--- /dev/null
+++ b/gas/testsuite/gas/macros/irp-count.s
@@ -0,0 +1,7 @@
+       .irp i,1
+       .print "\+"
+       .endr
+       
+       .irpc i,1
+       .print "\+"
+       .endr

diff --git a/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp
index 3108f3fcd566cf556034246de03b72fa29360959..ed08e75d5431912b04d4dac4436cfd60d5391d2a 100644 (file)
--- a/gas/testsuite/gas/macros/macros.exp
+++ b/gas/testsuite/gas/macros/macros.exp
@@ -103,3 +103,9 @@ gas_test_error "exit.s" "" ".exitm outside of a macro"
 
 run_list_test altmacro
 run_list_test count
+
+# The AVR, CRIS, MSP430 and Z80 targets define ONLY_STANDARD_ESCAPES,
+#  so \+ is rejected.
+# AIX targets need an extended regexp to match "\+".
+setup_xfail "avr-*-*" "cris*-*-*" "msp430-*-*" "z80-*-*" "*-*-aix*"
+run_list_test irp-count