* gas/macros/irp.s: Use `foo' and `bar' instead of `r' and `s'.

        * gas/macros/rept.s, gas/macros/test2.s, gas/macros/test3.s: Likewise.
        * gas/macros/{irp,rept,test2,test3}.d: Update.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f85f239..1cb320d 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+1999-06-10  Richard Henderson  <rth@cygnus.com>
+
+       * gas/macros/irp.s: Use `foo' and `bar' instead of `r' and `s'.
+       * gas/macros/rept.s, gas/macros/test2.s, gas/macros/test3.s: Likewise.
+       * gas/macros/{irp,rept,test2,test3}.d: Update.
+
 1999-06-05  Richard Henderson  <rth@cygnus.com>
 
        * gas/elf/elf.exp: New directory.

diff --git a/gas/testsuite/gas/macros/irp.d b/gas/testsuite/gas/macros/irp.d
index 6733622..e6d7bcf 100644 (file)
--- a/gas/testsuite/gas/macros/irp.d
+++ b/gas/testsuite/gas/macros/irp.d
@@ -5,9 +5,9 @@
 
 RELOCATION RECORDS FOR .*
 OFFSET[        ]+TYPE[         ]+VALUE.*
-0+00[  ]+[a-zA-Z0-9_]+[        ]+r1
-0+04[  ]+[a-zA-Z0-9_]+[        ]+r2
-0+08[  ]+[a-zA-Z0-9_]+[        ]+r3
-0+0c[  ]+[a-zA-Z0-9_]+[        ]+s1
-0+10[  ]+[a-zA-Z0-9_]+[        ]+s2
-0+14[  ]+[a-zA-Z0-9_]+[        ]+s3
+0+00[  ]+[a-zA-Z0-9_]+[        ]+foo1
+0+04[  ]+[a-zA-Z0-9_]+[        ]+foo2
+0+08[  ]+[a-zA-Z0-9_]+[        ]+foo3
+0+0c[  ]+[a-zA-Z0-9_]+[        ]+bar1
+0+10[  ]+[a-zA-Z0-9_]+[        ]+bar2
+0+14[  ]+[a-zA-Z0-9_]+[        ]+bar3

diff --git a/gas/testsuite/gas/macros/irp.s b/gas/testsuite/gas/macros/irp.s
index 2f9a621..f37dd54 100644 (file)
--- a/gas/testsuite/gas/macros/irp.s
+++ b/gas/testsuite/gas/macros/irp.s
@@ -1,8 +1,8 @@
        .irp    param,1,2,3
-       .long   r\param
+       .long   foo\param
        .endr
 
        .irpc   param,123
-       .long   s\param
+       .long   bar\param
        .endr
 

diff --git a/gas/testsuite/gas/macros/rept.d b/gas/testsuite/gas/macros/rept.d
index efb5d99..0022d5f 100644 (file)
--- a/gas/testsuite/gas/macros/rept.d
+++ b/gas/testsuite/gas/macros/rept.d
@@ -5,6 +5,6 @@
 
 RELOCATION RECORDS FOR .*
 OFFSET[        ]+TYPE[         ]+VALUE.*
-0+00[  ]+[a-zA-Z0-9_]+[        ]+r1
-0+04[  ]+[a-zA-Z0-9_]+[        ]+r1
-0+08[  ]+[a-zA-Z0-9_]+[        ]+r1
+0+00[  ]+[a-zA-Z0-9_]+[        ]+foo1
+0+04[  ]+[a-zA-Z0-9_]+[        ]+foo1
+0+08[  ]+[a-zA-Z0-9_]+[        ]+foo1

diff --git a/gas/testsuite/gas/macros/rept.s b/gas/testsuite/gas/macros/rept.s
index 243cf67..571b6f8 100644 (file)
--- a/gas/testsuite/gas/macros/rept.s
+++ b/gas/testsuite/gas/macros/rept.s
@@ -1,3 +1,3 @@
        .rept   3
-       .long   r1
+       .long   foo1
        .endr

diff --git a/gas/testsuite/gas/macros/test2.d b/gas/testsuite/gas/macros/test2.d
index 741d734..9a7d414 100644 (file)
--- a/gas/testsuite/gas/macros/test2.d
+++ b/gas/testsuite/gas/macros/test2.d
@@ -5,6 +5,6 @@
 
 RELOCATION RECORDS FOR .*
 OFFSET[        ]+TYPE[         ]+VALUE.*
-0+00[  ]+[a-zA-Z0-9_]+[        ]+r1
-0+04[  ]+[a-zA-Z0-9_]+[        ]+r2
-0+08[  ]+[a-zA-Z0-9_]+[        ]+r3
+0+00[  ]+[a-zA-Z0-9_]+[        ]+foo1
+0+04[  ]+[a-zA-Z0-9_]+[        ]+foo2
+0+08[  ]+[a-zA-Z0-9_]+[        ]+foo3

diff --git a/gas/testsuite/gas/macros/test2.s b/gas/testsuite/gas/macros/test2.s
index 838ce94..a21b011 100644 (file)
--- a/gas/testsuite/gas/macros/test2.s
+++ b/gas/testsuite/gas/macros/test2.s
@@ -6,4 +6,4 @@
        .endif
        .endm
 
-       m       r1,r2,r3
+       m       foo1,foo2,foo3

diff --git a/gas/testsuite/gas/macros/test3.d b/gas/testsuite/gas/macros/test3.d
index 2580f76..7680ad4 100644 (file)
--- a/gas/testsuite/gas/macros/test3.d
+++ b/gas/testsuite/gas/macros/test3.d
@@ -5,4 +5,4 @@
 
 RELOCATION RECORDS FOR .*
 OFFSET[        ]+TYPE[         ]+VALUE.*
-0+00[  ]+[a-zA-Z0-9_]+[        ]+r1
+0+00[  ]+[a-zA-Z0-9_]+[        ]+foo1

diff --git a/gas/testsuite/gas/macros/test3.s b/gas/testsuite/gas/macros/test3.s
index c6410ae..e80aa20 100644 (file)
--- a/gas/testsuite/gas/macros/test3.s
+++ b/gas/testsuite/gas/macros/test3.s
@@ -4,4 +4,4 @@
        \arg2
        .endm
 
-       m       ".long r1",.garbage
+       m       ".long foo1",.garbage