* gdbarch.sh: Allow a non- multi-arch target to override a

predicate.
* gdbarch.h: Regenerate.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 95567ede3203e8a668cc0616df5a92995f04a06f..72bbb5f4c914a3e590dcdfd6446ee6542707e28e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-21  Andrew Cagney  <ac131313@redhat.com>
+
+       * gdbarch.sh: Allow a non- multi-arch target to override a
+       predicate.
+       * gdbarch.h: Regenerate.
+
 2001-03-21  Andrew Cagney  <ac131313@redhat.com>
 
        * gdbarch.sh: Avoid use of ``!''.

diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 18c5b159f8a4547f2ae10e2ec8a2bd510e2d8cf1..f5b1b440055c59a00845a8a2889de2cbf17c86c6 100644 (file)
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -623,8 +623,10 @@ extern void set_gdbarch_register_sim_regno (struct gdbarch *gdbarch, gdbarch_reg
 
 #if defined (REGISTER_BYTES_OK)
 /* Legacy for systems yet to multi-arch REGISTER_BYTES_OK */
+#if !defined (REGISTER_BYTES_OK_P)
 #define REGISTER_BYTES_OK_P() (1)
 #endif
+#endif
 
 /* Default predicate for non- multi-arch targets. */
 #if (!GDB_MULTI_ARCH) && !defined (REGISTER_BYTES_OK_P)
@@ -1310,8 +1312,10 @@ extern void set_gdbarch_frame_num_args (struct gdbarch *gdbarch, gdbarch_frame_n
 
 #if defined (STACK_ALIGN)
 /* Legacy for systems yet to multi-arch STACK_ALIGN */
+#if !defined (STACK_ALIGN_P)
 #define STACK_ALIGN_P() (1)
 #endif
+#endif
 
 /* Default predicate for non- multi-arch targets. */
 #if (!GDB_MULTI_ARCH) && !defined (STACK_ALIGN_P)
@@ -1352,8 +1356,10 @@ extern void set_gdbarch_extra_stack_alignment_needed (struct gdbarch *gdbarch, i
 
 #if defined (REG_STRUCT_HAS_ADDR)
 /* Legacy for systems yet to multi-arch REG_STRUCT_HAS_ADDR */
+#if !defined (REG_STRUCT_HAS_ADDR_P)
 #define REG_STRUCT_HAS_ADDR_P() (1)
 #endif
+#endif
 
 /* Default predicate for non- multi-arch targets. */
 #if (!GDB_MULTI_ARCH) && !defined (REG_STRUCT_HAS_ADDR_P)
@@ -1381,8 +1387,10 @@ extern void set_gdbarch_reg_struct_has_addr (struct gdbarch *gdbarch, gdbarch_re
 
 #if defined (SAVE_DUMMY_FRAME_TOS)
 /* Legacy for systems yet to multi-arch SAVE_DUMMY_FRAME_TOS */
+#if !defined (SAVE_DUMMY_FRAME_TOS_P)
 #define SAVE_DUMMY_FRAME_TOS_P() (1)
 #endif
+#endif
 
 /* Default predicate for non- multi-arch targets. */
 #if (!GDB_MULTI_ARCH) && !defined (SAVE_DUMMY_FRAME_TOS_P)

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 6d89bd4bac7dfb3806f20e59d0f8e966317f6582..a4ad4cca747359dc0eb7eb234289eaafd134fa69 100755 (executable)
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -668,8 +668,10 @@ do
            printf "#if defined (${macro})\n"
            printf "/* Legacy for systems yet to multi-arch ${macro} */\n"
            #printf "#if (GDB_MULTI_ARCH <= GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n"
+           printf "#if !defined (${macro}_P)\n"
            printf "#define ${macro}_P() (1)\n"
            printf "#endif\n"
+           printf "#endif\n"
            printf "\n"
            printf "/* Default predicate for non- multi-arch targets. */\n"
            printf "#if (!GDB_MULTI_ARCH) && !defined (${macro}_P)\n"