PR c++/11990:

[deliverable/binutils-gdb.git] / gdb / mips-linux-nat.c

diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index b63be2eb3426e09a89991fa5b5b6bfdf9f12eb7d..d323a82a24b182d1863e1c67919cb7476e12e52a 100644 (file)
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for GNU/Linux on MIPS processors.
 
-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -60,7 +60,7 @@ static void (*super_fetch_registers) (struct target_ops *,
 static void (*super_store_registers) (struct target_ops *,
                                      struct regcache *, int);
 
-static void (*super_close) (int);
+static void (*super_close) (void);
 
 /* Map gdb internal register number to ptrace ``address''.
    These ``addresses'' are normally defined in <asm/ptrace.h>. 
@@ -326,7 +326,7 @@ mips64_linux_regsets_store_registers (struct target_ops *ops,
   have_dsp = mips_regnum (gdbarch)->dspctl != -1;
   if (!have_dsp)
     is_dsp = 0;
-  if (regno >= mips_regnum (gdbarch)->dspacc
+  else if (regno >= mips_regnum (gdbarch)->dspacc
       && regno < mips_regnum (gdbarch)->dspacc + 6)
     is_dsp = 1;
   else if (regno == mips_regnum (gdbarch)->dspctl)
@@ -447,7 +447,7 @@ mips_linux_read_description (struct target_ops *ops)
          have_dsp = 0;
          break;
        default:
-         perror_with_name (_("ptrace"));
+         perror_with_name (_("Couldn't check DSP support"));
          break;
        }
     }
@@ -688,7 +688,7 @@ mips_show_dr (const char *func, CORE_ADDR addr,
   puts_unfiltered (func);
   if (addr || len)
     printf_unfiltered (" (addr=%s, len=%d, type=%s)",
-                      paddress (target_gdbarch, addr), len,
+                      paddress (target_gdbarch (), addr), len,
                       type == hw_write ? "data-write"
                       : (type == hw_read ? "data-read"
                          : (type == hw_access ? "data-read/write"
@@ -698,9 +698,9 @@ mips_show_dr (const char *func, CORE_ADDR addr,
 
   for (i = 0; i < MAX_DEBUG_REGISTER; i++)
     printf_unfiltered ("\tDR%d: lo=%s, hi=%s\n", i,
-                      paddress (target_gdbarch,
+                      paddress (target_gdbarch (),
                                 get_watchlo (&watch_mirror, i)),
-                      paddress (target_gdbarch,
+                      paddress (target_gdbarch (),
                                 get_watchhi (&watch_mirror, i)));
 }
 
@@ -1114,7 +1114,7 @@ mips_linux_remove_watchpoint (CORE_ADDR addr, int len, int type,
    super implementation.  */
 
 static void
-mips_linux_close (int quitting)
+mips_linux_close (void)
 {
   struct mips_watchpoint *w;
   struct mips_watchpoint *nw;
@@ -1130,7 +1130,7 @@ mips_linux_close (int quitting)
   current_watches = NULL;
 
   if (super_close)
-    super_close (quitting);
+    super_close ();
 }
 
 void _initialize_mips_linux_nat (void);