gas/

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

diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index f5dc7799964197b2a5961e5b851a06e79910ddf9..76e4bf12ef7a69ff945fb01cfb57186a6844f89e 100644 (file)
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -1,8 +1,8 @@
 /* Remote debugging interface to m32r and mon2000 ROM monitors for GDB, 
    the GNU debugger.
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2007, 2008,
-   2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996-2001, 2004-2005, 2007-2012 Free Software
+   Foundation, Inc.
 
    Adapted by Michael Snyder of Cygnus Support.
 
@@ -122,8 +122,7 @@ static void
 m32r_load (char *filename, int from_tty)
 {
   bfd *abfd;
-  asection *s;
-  unsigned int i, data_count = 0;
+  unsigned int data_count = 0;
   struct timeval start_time, end_time;
 
   if (filename == NULL || filename[0] == 0)
@@ -238,8 +237,12 @@ m32r_supply_register (struct regcache *regcache, char *regname,
       monitor_supply_register (regcache, regno, val);
       if (regno == PSW_REGNUM)
        {
+#if (defined SM_REGNUM || defined BSM_REGNUM || defined IE_REGNUM \
+     || defined BIE_REGNUM || defined COND_REGNUM  || defined CBR_REGNUM \
+     || defined BPC_REGNUM || defined BCARRY_REGNUM)
          unsigned long psw = strtoul (val, NULL, 16);
          char *zero = "00000000", *one = "00000001";
+#endif
 
 #ifdef SM_REGNUM
          /* Stack mode bit */
@@ -447,8 +450,8 @@ m32r_upload_command (char *args, int from_tty)
        myIPaddress++;
 
       if (!strncmp (myIPaddress, "0.0.", 4))   /* empty */
-       error ("Please use 'set board-address' to "
-              "set the M32R-EVA board's IP address.");
+       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 = xstrdup (myIPaddress);
@@ -479,8 +482,8 @@ m32r_upload_command (char *args, int from_tty)
            }
        }
       if (server_addr == 0)    /* failed?  */
-       error ("Need to know gdb host computer's "
-              "IP address (use 'set server-address')");
+       error (_("Need to know gdb host computer's "
+                "IP address (use 'set server-address')"));
     }
 
   if (args == 0 || args[0] == 0)       /* No args: upload the current
@@ -492,8 +495,8 @@ m32r_upload_command (char *args, int from_tty)
       if (current_directory)
        download_path = xstrdup (current_directory);
       else
-       error ("Need to know default download "
-              "path (use 'set download-path')");
+       error (_("Need to know default download "
+                "path (use 'set download-path')"));
     }
 
   gettimeofday (&start_time, NULL);
@@ -514,9 +517,9 @@ m32r_upload_command (char *args, int from_tty)
   resp_len = monitor_expect_prompt (buf, sizeof (buf));        /* parse result?  */
 
   if (buf[0] == 0 || strstr (buf, "complete") == 0)
-    error ("Upload file not found: %s.srec\n"
-          "Check IP addresses and download path.",
-       args);
+    error (_("Upload file not found: %s.srec\n"
+            "Check IP addresses and download path."),
+          args);
   else
     printf_filtered (" -- Ethernet load complete.\n");
 
@@ -533,7 +536,6 @@ m32r_upload_command (char *args, int from_tty)
          {
            bfd_size_type section_size = bfd_section_size (abfd, s);
            bfd_vma section_base = bfd_section_lma (abfd, s);
-           unsigned int buffer;
 
            data_count += section_size;