[PATCH] macro test failures

["Jan Beulich" <JBeulich at novell dot com>]

A number of targets had problems with the recently added 'macros dot' and
'macros purge' tests. Most of these should be fixed with this. What remains
open are cases where targets needlessly us as_fatal where as_bad would
suffice (making testing for the error output impossible).

Built and tested natively on i686-pc-linux-gnu and as cross tools for a
large number of targets (hosted on x86_64-unknown-linux-gnu).

Jan

gas/testsuite/
2005-04-26  Jan Beulich  <jbeulich@novell.com>

	* gas/macros/dot.s: Don't use pseudo-ops in first column.
	* gas/macros/dot.l: Match broader range of possible outputs.
	* gas/macros/purge.l: Likewise.
	* gas/macros/purge.s: Start generated macro names with an underscore.

--- /home/jbeulich/src/binutils/mainline/2005-04-26/gas/testsuite/gas/macros/dot.l	2005-03-29 16:26:54.000000000 +0200
+++ 2005-04-26/gas/testsuite/gas/macros/dot.l	2005-04-15 15:34:06.000000000 +0200
@@ -2,7 +2,6 @@
 .*:[1-9][0-9]*: Warning: attempt to redefine pseudo-op .\.macro. ignored
 .*:27: Error: unknown pseudo-op: .\.xyz.
 .*:28: Error: .*
-(.* )?GAS .*
 #...
 [ 	]*[1-9][0-9]*[ 	]+m 4, 2
 [ 	]*[1-9][0-9]*[ 	]+> \.data
@@ -19,4 +18,5 @@
 [ 	]*[1-9][0-9]*[ 	]+
 [ 	]*[1-9][0-9]*[ 	]+\.purgem \.xyz, x\.y\.z
 [ 	]*[1-9][0-9]*[ 	]+\.xyz 0
-[ 	]*[1-9][0-9]*[ 	]+x\.y\.z 0
+[ 	]*[1-9][0-9]*[ 	]+(\?+[0 	]+)?x\.y\.z 0
+#pass
--- /home/jbeulich/src/binutils/mainline/2005-04-26/gas/testsuite/gas/macros/dot.s	2005-02-08 09:57:12.000000000 +0100
+++ 2005-04-26/gas/testsuite/gas/macros/dot.s	2005-04-26 15:45:54.000000000 +0200
@@ -1,17 +1,17 @@
-.altmacro
+ .altmacro
 
-.macro x.y.z val
- .align 4
- .byte val, val
-.endm
-
-.macro .xyz val
- .align 8
- .byte val, val
-.endm
+ .macro x.y.z val
+  .align 4
+  .byte val, val
+ .endm
+
+ .macro .xyz val
+  .align 8
+  .byte val, val
+ .endm
 
-.macro .macro
-.endm
+ .macro .macro
+ .endm
 
 label1:label2 : label3 :label4: m: .macro arg.1, arg.2
  .data
@@ -23,6 +23,6 @@ label9:label8 : label7 :label6: .endm
 
 m 4, 2
 
-.purgem .xyz, x.y.z
-.xyz 0
+ .purgem .xyz, x.y.z
+ .xyz 0
 x.y.z 0
--- /home/jbeulich/src/binutils/mainline/2005-04-26/gas/testsuite/gas/macros/purge.l	2005-04-14 12:02:07.000000000 +0200
+++ 2005-04-26/gas/testsuite/gas/macros/purge.l	2005-04-18 12:50:59.000000000 +0200
@@ -1,7 +1,11 @@
 .*: Assembler messages:
 .*:11: Error: .*
+#...
 .*:12: Error: .*
+#...
 .*:13: Error: .*
+#...
 .*:14: Error: .*
+#...
 .*:15: Warning: .*
 .*:16: Warning: .*
--- /home/jbeulich/src/binutils/mainline/2005-04-26/gas/testsuite/gas/macros/purge.s	2005-04-15 09:16:42.000000000 +0200
+++ 2005-04-26/gas/testsuite/gas/macros/purge.s	2005-04-18 11:22:19.000000000 +0200
@@ -29,12 +29,12 @@
   .irpc b,ABCDEFGHIJKLMNOPQRSTUVWXYZ
    .irpc c,ABCDEFGHIJKLMNOPQRSTUVWXYZ
     .irpc d,ABCDEFGHIJKLMNOPQRSTUVWXYZ
-     .macro \a\b\c\d arg1=0, arg2=0
+     .macro _\a\b\c\d arg1=0, arg2=0
       .if \arg1 + \arg2
-       .purgem \a\b\c\d
+       .purgem _\a\b\c\d
       .endif
      .endm
-	\a\b\c\d 1, 2
+	_\a\b\c\d 1, 2
     .endr
    .endr
   .endr

Attachment: binutils-mainline-macro-tests.patch
Description: Text document