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.

Index: config/mips/nm-irix5.h
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/nm-irix5.h,v
retrieving revision 1.8
diff -p -u -r1.8 nm-irix5.h
--- config/mips/nm-irix5.h	4 Sep 2003 18:04:25 -0000	1.8
+++ config/mips/nm-irix5.h	29 Jul 2004 21:35:55 -0000
@@ -45,3 +45,10 @@ extern int procfs_stopped_by_watchpoint 
 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 */
Index: config/mips/xm-irix5.h
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/xm-irix5.h,v
retrieving revision 1.4
diff -p -u -r1.4 xm-irix5.h
--- config/mips/xm-irix5.h	5 Jun 2002 19:18:25 -0000	1.4
+++ config/mips/xm-irix5.h	29 Jul 2004 21:35:55 -0000
@@ -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