2004-07-29 Andrew Cagney <cagney@gnu.org>

	* config/mips/xm-irix5.h (REGISTER_U_ADDR): Move from here ...
	* config/mips/nm-irix5.h (REGISTER_U_ADDR): ... to here.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1abfb67151755bb71724e59296093a193afa1d87..1fab72266918bea12b921065bf3e953b51424f1e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-29  Andrew Cagney  <cagney@gnu.org>
 
+       * config/mips/xm-irix5.h (REGISTER_U_ADDR): Move from here ...
+       * config/mips/nm-irix5.h (REGISTER_U_ADDR): ... to here.
+
        * config/xm-nbsd.h: Delete file.
        * config/arm/xm-nbsd.h: Delete file.
        * config/i386/xm-nbsd.h: Delete file.

diff --git a/gdb/config/mips/nm-irix5.h b/gdb/config/mips/nm-irix5.h
index 6bdab300b19483555643c402463a6fb48193a824..33a8a8ce9248f0aee730c62bdb8b6920f970f12d 100644 (file)
--- a/gdb/config/mips/nm-irix5.h
+++ b/gdb/config/mips/nm-irix5.h
@@ -45,3 +45,10 @@ extern int procfs_stopped_by_watchpoint (ptid_t);
 extern int procfs_set_watchpoint (ptid_t, CORE_ADDR, int, int, int);
 
 #define TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT(SIZE) 1
+
+/* Override register locations in upage for SGI machines */
+#define REGISTER_U_ADDR(addr, blockend, regno)                 \
+  if (regno < PC_REGNUM)                               \
+      addr = regno;                                    \
+  else                                                 \
+      addr = regno + NSIG_HNDLRS;      /* Skip over signal handlers */

diff --git a/gdb/config/mips/xm-irix5.h b/gdb/config/mips/xm-irix5.h
index 7d61ff059cc6754fa7084e8b026e3618c6d49334..e6ccb38749e8e6f0f724e16b09ff978d12625055 100644 (file)
--- a/gdb/config/mips/xm-irix5.h
+++ b/gdb/config/mips/xm-irix5.h
@@ -21,14 +21,6 @@
 
 #include "config/xm-sysv4.h"
 
-/* Override register locations in upage for SGI machines */
-#undef REGISTER_U_ADDR
-#define REGISTER_U_ADDR(addr, blockend, regno)                 \
-  if (regno < PC_REGNUM)                               \
-      addr = regno;                                    \
-  else                                                 \
-      addr = regno + NSIG_HNDLRS;      /* Skip over signal handlers */
-
 /* This enables reliable signals (and the associated setjmp/longjmp), and gives
    bsdish prototypes for getpgrp/setpgrg/setgroups and initgroups.  */
 #define _BSD_COMPAT