* linker.c (link_action): Ignore duplicate warning syms.

[deliverable/binutils-gdb.git] / gdb / s390-nat.c

diff --git a/gdb/s390-nat.c b/gdb/s390-nat.c
index 623c3d1d4acfc8c275108e969036f910ccc46164..19e89238374c89506b8ff02cbec3f90acd198de4 100644 (file)
--- a/gdb/s390-nat.c
+++ b/gdb/s390-nat.c
@@ -21,6 +21,7 @@
 
 #include "defs.h"
 #include "tm.h"
+#include "regcache.h"
 #include <asm/ptrace.h>
 #include <sys/ptrace.h>
 #include <asm/processor.h>
@@ -59,12 +60,13 @@ s390_register_u_addr (int blockend, int regnum)
   else
     {
 #ifdef GDBSERVER
-      error
+      error ("s390_register_u_addr invalid regnum %s %d regnum=%d",
+             __FILE__, (int) __LINE__, regnum);
 #else
-      internal_error
+      internal_error (__FILE__, __LINE__,
+                      "s390_register_u_addr invalid regnum regnum=%d",
+                      regnum);
 #endif
-       ("s390_register_u_addr invalid regnum %s %d regnum=%d", __FILE__,
-        (int) __LINE__, regnum);
       retval = 0;
     }
   return retval + blockend;
@@ -138,7 +140,7 @@ int
 s390_insert_watchpoint (int pid, CORE_ADDR addr, int len, int rw)
 {
   CORE_ADDR hi_addr = addr + len - 1;
-  watch_area *newarea = (watch_area *) malloc (sizeof (watch_area));
+  watch_area *newarea = (watch_area *) xmalloc (sizeof (watch_area));
 
 
   if (newarea)
@@ -205,7 +207,7 @@ s390_remove_watchpoint (int pid, CORE_ADDR addr, int len)
     }
   if (matchCurr)
     {
-      free (matchCurr);
+      xfree (matchCurr);
       watch_area_cnt--;
       if (watch_area_cnt)
        {