* config/mips/nm-riscos.h: machine/machparam.h is always the right

	place to look for BSD43_NBPG, not machine/vmparam.h

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 84522754a773e37265ab130ac6a93087ec7004c4..1e28508778ca21270b3d09a18017f715b79e12b0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 Wed Jul  7 14:30:00 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * config/mips/nm-riscos.h: machine/machparam.h is always the right
+       place to look for BSD43_NBPG, not machine/vmparam.h
+
        * infcmd.c (run_stack_dummy): New argument name.
        Change error message in (another) attempt to make it comprehensible.
        * valops.c (call_function_by_hand): Pass name to run_stack_dummy.

diff --git a/gdb/config/mips/nm-riscos.h b/gdb/config/mips/nm-riscos.h
index 34ee24b2799e5ab6475312e24865175726bc0166..083b786f1add5b76d902ff4aaf2e87fb0c7a1e75 100644 (file)
--- a/gdb/config/mips/nm-riscos.h
+++ b/gdb/config/mips/nm-riscos.h
@@ -16,13 +16,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define PCB_OFFSET(FIELD) ((int)&((struct user*)0)->u_pcb.FIELD)
 
-#include <bsd43/machine/vmparam.h>
-#ifndef BSD43_NBPG
 /* RISC/os 5.0 defines this in machparam.h.  */
 #include <bsd43/machine/machparam.h>
-#endif
 #define NBPG BSD43_NBPG
 #define UPAGES BSD43_UPAGES
+
+/* Where is this used?  I don't see any uses in mips-nat.c, and I don't think
+   the uses in infptrace.c are used if FETCH_INFERIOR_REGISTERS is defined.
+   Does the compiler react badly to "extern CORE_ADDR kernel_u_addr" (even
+   if never referenced)?  */
 #define KERNEL_U_ADDR BSD43_UADDR
 
 #define REGISTER_U_ADDR(addr, blockend, regno)                 \