Merge GDB 7.5.1

gdb/m32r-rom.c

 /* Remote debugging interface to m32r and mon2000 ROM monitors for GDB, 
    the GNU debugger.
 
    Copyright (C) 1996-2001, 2004-2005, 2007-2012 Free Software
    Foundation, Inc.
 
    Adapted by Michael Snyder of Cygnus Support.
 
    This file is part of GDB.
 
@@ skipping 104 matching lines @@
 }
 
 /* 
  * Function: m32r_load (an alternate way to load) 
  */
 
 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)
     filename = get_exec_file (1);
 
   abfd = bfd_openr (filename, 0);
   if (!abfd)
     error (_("Unable to open file %s."), filename);
   if (bfd_check_format (abfd, bfd_object) == 0)
     error (_("File is not an object file."));
@@ skipping 94 matching lines @@
       monitor_supply_register (regcache, ACCH_REGNUM, val);
       val = strchr (val, ':');  /* Skip past ':' to get 2nd word.  */
       if (val != NULL)
         monitor_supply_register (regcache, ACCL_REGNUM, val + 1);
     }
   else
     {
       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 */
           monitor_supply_register (regcache, SM_REGNUM,
                                    (psw & 0x80) ? one : zero);
 #endif
 #ifdef BSM_REGNUM
           /* Backup stack mode bit */
           monitor_supply_register (regcache, BSM_REGNUM,
                                    (psw & 0x8000) ? one : zero);
@@ skipping 273 matching lines @@
     {           /* Download is done -- print section statistics.  */
       if (bfd_check_format (abfd, bfd_object) == 0)
         {
           printf_filtered ("File is not an object file\n");
         }
       for (s = abfd->sections; s; s = s->next)
         if (s->flags & SEC_LOAD)
           {
             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;
 
             printf_filtered ("Loading section %s, size 0x%lx lma ",
                              bfd_section_name (abfd, s),
                              (unsigned long) section_size);
             fputs_filtered (paddress (target_gdbarch, section_base),
                             gdb_stdout);
             printf_filtered ("\n");
             gdb_flush (gdb_stdout);
@@ skipping 76 matching lines @@
                           NULL, /* FIXME: i18n: IP address for
                                    download server (GDB's host
                                    computer) is %s.  */
                           &setlist, &showlist);
 
   add_com ("upload", class_obscure, m32r_upload_command, _("\
 Upload the srec file via the monitor's Ethernet upload capability."));
 
   add_com ("tload", class_obscure, m32r_load, _("test upload command."));
 }