Allow for the possibility that the local labels won't be in the objdump output.

[deliverable/binutils-gdb.git] / gdb / m32r-rom.c

diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index d6b1e5cd4bd4013360265375a17915c7fdda8077..c95b16e5f123ba1c350a1aa0bca5389d7030791b 100644 (file)
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -1,6 +1,7 @@
 /* Remote debugging interface to m32r and mon2000 ROM monitors for GDB, 
    the GNU debugger.
-   Copyright 1996 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
    Adapted by Michael Snyder of Cygnus Support.
 
@@ -37,6 +38,7 @@
 #include "objfiles.h"          /* for ALL_OBJFILES etc. */
 #include "inferior.h"          /* for write_pc() */
 #include <ctype.h>
+#include "regcache.h"
 
 extern void report_transfer_performance (unsigned long, time_t, time_t);
 
@@ -62,8 +64,9 @@ static char *download_path;   /* user-settable path for SREC files     */
  */
 
 static void
-m32r_load_section (bfd *abfd, asection *s, unsigned int *data_count)
+m32r_load_section (bfd *abfd, asection *s, void *obj)
 {
+  unsigned int *data_count = obj;
   if (s->flags & SEC_LOAD)
     {
       bfd_size_type section_size = bfd_section_size (abfd, s);
@@ -479,7 +482,7 @@ m32r_upload_command (char *args, int from_tty)
        error ("Please use 'set board-address' to set the M32R-EVA board's IP address.");
       if (strchr (myIPaddress, '('))
        *(strchr (myIPaddress, '(')) = '\0';    /* delete trailing junk */
-      board_addr = strsave (myIPaddress);
+      board_addr = xstrdup (myIPaddress);
     }
   if (server_addr == 0)
     {
@@ -507,7 +510,7 @@ m32r_upload_command (char *args, int from_tty)
   if (args[0] != '/' && download_path == 0)
     {
       if (current_directory)
-       download_path = strsave (current_directory);
+       download_path = xstrdup (current_directory);
       else
        error ("Need to know default download path (use 'set download-path')");
     }