* gdb.asm/asmsrc1.s: Add ``gdbasm_'' prefix to all macros.

* gdb.asm/asmsrc2.s, gdb.asm/d10v.inc: Update.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e692856317f181e40c3a519d58d119ce6d89f99a..8e9d151a5d84579dc68832687646faedf06870ad 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-10  Andrew Cagney  <ac131313@redhat.com>
+
+       * gdb.asm/asmsrc1.s: Add ``gdbasm_'' prefix to all macros.
+       * gdb.asm/asmsrc2.s, gdb.asm/d10v.inc: Update.
+
 2001-11-09  Andrew Cagney  <ac131313@redhat.com>
 
        * gdb.base/restore.exp: Include $expected value in restored test

diff --git a/gdb/testsuite/gdb.asm/asmsrc1.s b/gdb/testsuite/gdb.asm/asmsrc1.s
index 0e133d22df4b806a3092a5c9d75a6a27bf48018d..8bd41ad31edbe04ce8e7a85d4c6b3b9fdbc3b4dd 100644 (file)
--- a/gdb/testsuite/gdb.asm/asmsrc1.s
+++ b/gdb/testsuite/gdb.asm/asmsrc1.s
@@ -11,9 +11,9 @@ comment       "Provide very simplistic equivalent."
        
        .global _start
 _start:
-       startup
-       call main
-       exit0
+       gdbasm_startup
+       gdbasm_call main
+       gdbasm_exit0
 
 
 comment "main routine for assembly source debugging test"
@@ -22,27 +22,27 @@ comment "machine independence."
 
        .global main
 main:
-       enter
+       gdbasm_enter
 
 comment "Call a macro that consists of several lines of assembler code."
 
-       several_nops
+       gdbasm_several_nops
 
 comment "Call a subroutine in another file."
 
-       call foo2
+       gdbasm_call foo2
 
 comment "All done."
 
-       exit0
+       gdbasm_exit0
 
 comment "A routine for foo2 to call."
 
        .global foo3
 foo3:
-       enter
-       leave
+       gdbasm_enter
+       gdbasm_leave
 
        .global exit
 exit:
-       exit0
+       gdbasm_exit0

diff --git a/gdb/testsuite/gdb.asm/asmsrc2.s b/gdb/testsuite/gdb.asm/asmsrc2.s
index 3d48c6c02fbe7524aeee4d24d78216a775c15366..22c63d4f2985e882c454b4565635acc6f078c5e8 100644 (file)
--- a/gdb/testsuite/gdb.asm/asmsrc2.s
+++ b/gdb/testsuite/gdb.asm/asmsrc2.s
@@ -5,12 +5,12 @@ comment "Second file in assembly source debugging testcase."
 
        .global foo2
 foo2:
-       enter
+       gdbasm_enter
 
 comment "Call someplace else."
 
-       call foo3
+       gdbasm_call foo3
 
 comment "All done, return."
 
-       leave
+       gdbasm_leave

diff --git a/gdb/testsuite/gdb.asm/d10v.inc b/gdb/testsuite/gdb.asm/d10v.inc
index cea110407fba4a1f88b9c22a5ed5169528b04bc3..1ad3b9fe351859f0121b4e0a4bba99b799563727 100644 (file)
--- a/gdb/testsuite/gdb.asm/d10v.inc
+++ b/gdb/testsuite/gdb.asm/d10v.inc
@@ -1,19 +1,19 @@
        comment "subroutine prologue"
-       .macro enter
+       .macro gdbasm_enter
        st r13,@-sp
        .endm
 
        comment "subroutine epilogue"
-       .macro leave
+       .macro gdbasm_leave
        ld r13,@sp+
        jmp r13
        .endm
 
-       .macro call subr
+       .macro gdbasm_call subr
        bl \subr
        .endm
 
-       .macro several_nops
+       .macro gdbasm_several_nops
        nop
        nop
        nop
@@ -21,12 +21,12 @@
        .endm
 
        comment "exit (0)"
-       .macro exit0
+       .macro gdbasm_exit0
        ldi r4, 1
        ldi r0, 0
        trap 15
        .endm
 
        comment "crt0 startup"
-       .macro startup
+       .macro gdbasm_startup
        .endm