* gdb.asm/alpha.inc, gdb.asm/frv.inc, gdb.asm/i386.inc,

	gdb.asm/ia64.inc, gdb.asm/m68hc11.inc, gdb.asm/m68k.inc,
	gdb.asm/mips.inc, gdb.asm/pa.inc, gdb.asm/powerpc.inc,
	gdb.asm/s390.inc, gdb.asm/s390x.inc, gdb.asm/sh.inc,
	gdb.asm/x86_64.inc: Use .purgem before redefining macros.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3742eb48ad29cb00100d716da7989f70e4da6d96..46e880b908d424057749ab850b0abbb205510700 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-07  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gdb.asm/alpha.inc, gdb.asm/frv.inc, gdb.asm/i386.inc,
+       gdb.asm/ia64.inc, gdb.asm/m68hc11.inc, gdb.asm/m68k.inc,
+       gdb.asm/mips.inc, gdb.asm/pa.inc, gdb.asm/powerpc.inc,
+       gdb.asm/s390.inc, gdb.asm/s390x.inc, gdb.asm/sh.inc,
+       gdb.asm/x86_64.inc: Use .purgem before redefining macros.
+
 2005-03-05  Mark Kettenis  <kettenis@gnu.org>
 
        * gdb.cp/ovldbreak.exp: Adjust regular expression for recent

diff --git a/gdb/testsuite/gdb.asm/alpha.inc b/gdb/testsuite/gdb.asm/alpha.inc
index f9741c479e59d0a467aa31589dc4b62b5bb7e638..1569d794404066617aae800ccb0a0b09ab380586 100644 (file)
--- a/gdb/testsuite/gdb.asm/alpha.inc
+++ b/gdb/testsuite/gdb.asm/alpha.inc
@@ -1,4 +1,5 @@
        comment "subroutine declare"
+       .purgem gdbasm_declare
        .macro gdbasm_declare name
        .ent    \name
 \name:
@@ -22,6 +23,7 @@
        .endm
 
        comment "subroutine end"
+       .purgem gdbasm_end
        .macro gdbasm_end name
        .end    \name
        .endm
@@ -55,6 +57,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/frv.inc b/gdb/testsuite/gdb.asm/frv.inc
index e8f3b8ff1f3ede23b20520abc44553b4f8b5a2fe..0479ff5ba9f5f36b56a153c26ce13e38d02e9c20 100644 (file)
--- a/gdb/testsuite/gdb.asm/frv.inc
+++ b/gdb/testsuite/gdb.asm/frv.inc
@@ -47,6 +47,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/i386.inc b/gdb/testsuite/gdb.asm/i386.inc
index 9746646ba629f7444266bc1994c98b1a5daf8ac9..0964f77fbd4c337bf48f6e6aef5aeb31b892f154 100644 (file)
--- a/gdb/testsuite/gdb.asm/i386.inc
+++ b/gdb/testsuite/gdb.asm/i386.inc
@@ -32,6 +32,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/ia64.inc b/gdb/testsuite/gdb.asm/ia64.inc
index 31f37c1a65a89264e8cc8b5d40f4b41c3f1ac329..c42e398a40bba282d8d4b517fae68ec5e0c48814 100644 (file)
--- a/gdb/testsuite/gdb.asm/ia64.inc
+++ b/gdb/testsuite/gdb.asm/ia64.inc
@@ -43,6 +43,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/m68hc11.inc b/gdb/testsuite/gdb.asm/m68hc11.inc
index 90795e3b50e4b8c8287b7fab58e32a1ea0c13aa5..820908b277ae1979ecc918a68e0a22b9c465fc9a 100644 (file)
--- a/gdb/testsuite/gdb.asm/m68hc11.inc
+++ b/gdb/testsuite/gdb.asm/m68hc11.inc
@@ -42,6 +42,7 @@ _.frame: .word 0
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/m68k.inc b/gdb/testsuite/gdb.asm/m68k.inc
index fadf54be544a97c5f71c215b4e5f004f5867671e..f2ff959c9817b20d7fdc48b2e011a7a6e355b7bb 100644 (file)
--- a/gdb/testsuite/gdb.asm/m68k.inc
+++ b/gdb/testsuite/gdb.asm/m68k.inc
@@ -31,6 +31,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/mips.inc b/gdb/testsuite/gdb.asm/mips.inc
index a0992bb530f5057f2968f4b1c90ef90af634e168..cb0ba1fcdb762f99b83865793df6a441a0b8e8c5 100644 (file)
--- a/gdb/testsuite/gdb.asm/mips.inc
+++ b/gdb/testsuite/gdb.asm/mips.inc
@@ -1,4 +1,5 @@
        comment "subroutine declare"
+       .purgem gdbasm_declare
        .macro gdbasm_declare name
        .align  2
        .ent    \name
@@ -34,6 +35,7 @@
        .endm
 
        comment "subroutine end"
+       .purgem gdbasm_end
        .macro gdbasm_end name
        .end    \name
        .endm

diff --git a/gdb/testsuite/gdb.asm/pa.inc b/gdb/testsuite/gdb.asm/pa.inc
index d53336e31672ae7225b6a437ce8c0daf95f8693e..1183b7e5c6bdfed93de185df5bc2ed8879b22509 100644 (file)
--- a/gdb/testsuite/gdb.asm/pa.inc
+++ b/gdb/testsuite/gdb.asm/pa.inc
@@ -37,6 +37,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/powerpc.inc b/gdb/testsuite/gdb.asm/powerpc.inc
index 2597ad6c395a75b3a4e103b47784052e01b3c838..a0797bf826b8fa57b95e8010d267f939cf5f55df 100644 (file)
--- a/gdb/testsuite/gdb.asm/powerpc.inc
+++ b/gdb/testsuite/gdb.asm/powerpc.inc
@@ -40,6 +40,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/s390.inc b/gdb/testsuite/gdb.asm/s390.inc
index 196a9603c9375cb0b457f9d09fd4061d7fa29417..16f1a7cc4d020516da6c36e90753376559a62e73 100644 (file)
--- a/gdb/testsuite/gdb.asm/s390.inc
+++ b/gdb/testsuite/gdb.asm/s390.inc
@@ -68,6 +68,7 @@
         .endm
 
 ### Declare an `int' variable.
+       .purgem gdbasm_datavar
         .macro gdbasm_datavar name value
         .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/s390x.inc b/gdb/testsuite/gdb.asm/s390x.inc
index 4e5bf2ea65d24f1ee16df81c3f24464714af4d02..1fe3dec6fdf3e22622755b2442262a89b7314ccc 100644 (file)
--- a/gdb/testsuite/gdb.asm/s390x.inc
+++ b/gdb/testsuite/gdb.asm/s390x.inc
@@ -61,6 +61,7 @@
         .endm
 
 ### Declare an `int' variable.
+       .purgem gdbasm_datavar
         .macro gdbasm_datavar name value
         .data
 \name:

diff --git a/gdb/testsuite/gdb.asm/sh.inc b/gdb/testsuite/gdb.asm/sh.inc
index 88a24c3189900a5ca07c8bb4fdc5297183fbaaf3..9ea1b676c049770a9e2c98c5a35df64d426f4e97 100644 (file)
--- a/gdb/testsuite/gdb.asm/sh.inc
+++ b/gdb/testsuite/gdb.asm/sh.inc
@@ -3,6 +3,7 @@
 # them when changing the code.
 
        comment "subroutine declare"
+       .purgem gdbasm_declare
        .macro gdbasm_declare name
        .align  1
        .global \name
@@ -28,6 +29,7 @@
        .endm
 
        comment "subroutine end"
+       .purgem gdbasm_end
        .macro gdbasm_end name
        .size   \name, .-_foo1
        .align  1
@@ -75,6 +77,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
        .align 2

diff --git a/gdb/testsuite/gdb.asm/x86_64.inc b/gdb/testsuite/gdb.asm/x86_64.inc
index 5bcaeae25abe5cfe4dc9c58e50ae72bce982c72b..b92d9725a424a42604291ea51b89f147f17b7620 100644 (file)
--- a/gdb/testsuite/gdb.asm/x86_64.inc
+++ b/gdb/testsuite/gdb.asm/x86_64.inc
@@ -32,6 +32,7 @@
        .endm
 
        comment "Declare a data variable"
+       .purgem gdbasm_datavar
        .macro gdbasm_datavar name value
        .data
 \name: