From Kei Sakamoto <sakamoto.kei@renesas.com>:

	* gdb.asm/asm-source.exp : Add -lgloss to link-flags.
	* gdb.asm/m32r.inc : Remove an illegal nop after bl instruction.
	Replace ld24 with seth/add3.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bde28ab..e22760f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-07  Daniel Jacobowitz  <drow@mvista.com>
+
+       From Kei Sakamoto <sakamoto.kei@renesas.com>:
+       * gdb.asm/asm-source.exp : Add -lgloss to link-flags.
+       * gdb.asm/m32r.inc : Remove an illegal nop after bl instruction.
+       Replace ld24 with seth/add3.
+
 2003-08-02  Andrew Cagney  <cagney@redhat.com>
 
        * gdb.base/annota3.exp: New file.

diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index 3745e60..7bebd09 100644 (file)
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -69,6 +69,7 @@ switch -glob -- [istarget] {
     }
     "m32r*-*" {
         set asm-arch m32r
+        set link-flags "-Wl,--whole-archive -lgloss -Wl,--no-whole-archive"
     }
     "m6811-*-*" {
         set asm-arch m68hc11

diff --git a/gdb/testsuite/gdb.asm/m32r.inc b/gdb/testsuite/gdb.asm/m32r.inc
index 6110373..fa104cd 100644 (file)
--- a/gdb/testsuite/gdb.asm/m32r.inc
+++ b/gdb/testsuite/gdb.asm/m32r.inc
@@ -11,7 +11,7 @@
        .endm
 
        .macro gdbasm_call subr
-       bl      \subr -> nop
+       bl      \subr
        .endm
 
        .macro gdbasm_several_nops
@@ -30,6 +30,7 @@
 
        comment "crt0 startup"
        .macro gdbasm_startup
-       ld24 sp,_stack
+       seth sp, #shigh(_stack)
+       add3 sp, sp, #low(_stack)
        ldi fp,#0
        .endm