Approved by Andrew Cagney <ac131313@cygnus.com>

	* mips-tdep.c (MIPS_DEFAULT_MASK_ADDRESS_P): Define using either
	the current arch or use zero.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 77949b3a1864a33756efa3c72cd1b511c0c15e96..c75a0808009d53d76bdafbeb9c29611d7dbd14bd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-25  Fred Fish  <fnf@cygnus.com>
+
+       * mips-tdep.c (MIPS_DEFAULT_MASK_ADDRESS_P): Define using either
+       the current arch or use zero.
+
 2000-10-25  Fernando Nasser  <fnasser@cygnus.com>
 
        * ser-unix.c (do_unix_readchar): Coding style improvement only.

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index cf48cedee4671fb8f789829f5e7dac6258acd20e..0ca1eaf57adc0650db6929a018c44a2f25c8045d 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -224,6 +224,13 @@ mips_stack_argsize (void)
 #define GDB_TARGET_IS_MIPS64 (gdbarch_tdep (current_gdbarch)->gdb_target_is_mips64 + 0)
 #endif
 
+#if GDB_MULTI_ARCH
+#undef MIPS_DEFAULT_MASK_ADDRESS_P
+#define MIPS_DEFAULT_MASK_ADDRESS_P (gdbarch_tdep (current_gdbarch)->default_mask_address_p)
+#elif !defined (MIPS_DEFAULT_MASK_ADDRESS_P)
+#define MIPS_DEFAULT_MASK_ADDRESS_P (0)
+#endif
+
 #define VM_MIN_ADDRESS (CORE_ADDR)0x400000
 
 int gdb_print_insn_mips (bfd_vma, disassemble_info *);
@@ -468,7 +475,7 @@ mips_mask_address_p (void)
       return 0;
       break;
     case CMD_AUTO_BOOLEAN_AUTO:
-      return gdbarch_tdep (current_gdbarch)->default_mask_address_p;
+      return MIPS_DEFAULT_MASK_ADDRESS_P;
     default:
       internal_error ("mips_mask_address_p: bad switch");
       return -1;