gas/testsuite/

2005-05-06  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.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c478244caf8948d5d58ad54069fb2ccc0d2930a4..31e651ee69252698c209c0d989585c09f33e8ee3 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-06  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.
+
 2005-05-05  Paul Brook  <paul@codesourcery.com>
 
        * gas/i386/i386.exp: Don't run divide test on vxworks.

diff --git a/gas/testsuite/gas/macros/dot.l b/gas/testsuite/gas/macros/dot.l
index e74e4f3cb2a1c52a75d69a3b1b311d381ad65c5e..980de4f1d1cf49bbf62d59c30dcf2e4d552b4b76 100644 (file)
--- a/gas/testsuite/gas/macros/dot.l
+++ b/gas/testsuite/gas/macros/dot.l
@@ -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

diff --git a/gas/testsuite/gas/macros/dot.s b/gas/testsuite/gas/macros/dot.s
index 10ed42fd6f7ce864e1e2a109dcf575439eeae3b1..72ce972a2fb8b7659470adebad58fd6a36964cb9 100644 (file)
--- a/gas/testsuite/gas/macros/dot.s
+++ b/gas/testsuite/gas/macros/dot.s
@@ -1,17 +1,17 @@
-.altmacro
+ .altmacro
 
-.macro x.y.z val
- .align 4
- .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 .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

diff --git a/gas/testsuite/gas/macros/purge.l b/gas/testsuite/gas/macros/purge.l
index 2b25b2cf8c794221ba7753643abe117304840ebb..5e516c73e9a275fd0579984fd5f18ba90ea9ee0a 100644 (file)
--- a/gas/testsuite/gas/macros/purge.l
+++ b/gas/testsuite/gas/macros/purge.l
@@ -1,7 +1,11 @@
 .*: Assembler messages:
 .*:11: Error: .*
+#...
 .*:12: Error: .*
+#...
 .*:13: Error: .*
+#...
 .*:14: Error: .*
+#...
 .*:15: Warning: .*
 .*:16: Warning: .*

diff --git a/gas/testsuite/gas/macros/purge.s b/gas/testsuite/gas/macros/purge.s
index e46eef885186acb303553589dda7aa139b89ef5f..336cae3658e9bd2e6e0c609585e81dd2f45d4d92 100644 (file)
--- a/gas/testsuite/gas/macros/purge.s
+++ b/gas/testsuite/gas/macros/purge.s
@@ -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