* 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.

14 files changed, 26 insertions, 0 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3742eb48ad2..46e880b908d 100644
--- 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 f9741c479e5..1569d794404 100644
--- 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 e8f3b8ff1f3..0479ff5ba9f 100644
--- 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 9746646ba62..0964f77fbd4 100644
--- 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 31f37c1a65a..c42e398a40b 100644
--- 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 90795e3b50e..820908b277a 100644
--- 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 fadf54be544..f2ff959c981 100644
--- 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 a0992bb530f..cb0ba1fcdb7 100644
--- 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 d53336e3167..1183b7e5c6b 100644
--- 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 2597ad6c395..a0797bf826b 100644
--- 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 196a9603c93..16f1a7cc4d0 100644
--- 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 4e5bf2ea65d..1fe3dec6fdf 100644
--- 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 88a24c31899..9ea1b676c04 100644
--- 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 5bcaeae25ab..b92d9725a42 100644
--- 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: