2004-09-02 Andrew Cagney <cagney@gnu.org>

	* gdbarch.sh: Delete check for GDB_MULTI_ARCH_PARTIAL when
	validating architecture methods.
	* gdbarch.c: Re-generate.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6728160..d064ea1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-02  Andrew Cagney  <cagney@gnu.org>
 
+       * gdbarch.sh: Delete check for GDB_MULTI_ARCH_PARTIAL when
+       validating architecture methods.
+       * gdbarch.c: Re-generate.
+       
        * gdbarch.sh: Delete check for consistency between GDB_MULTI_ARCH
        and GDB_TM_FILE.  Check for GDB_TM_FILE instead of
        GDB_MULTI_ARCH_PARTIAL.

diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 185447b..fdf7bb2 100644 (file)
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -528,8 +528,7 @@ verify_gdbarch (struct gdbarch *current_gdbarch)
   /* Skip verify of virtual_frame_pointer, invalid_p == 0 */
   /* Skip verify of pseudo_register_read, has predicate */
   /* Skip verify of pseudo_register_write, has predicate */
-  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
-      && (current_gdbarch->num_regs == -1))
+  if (current_gdbarch->num_regs == -1)
     fprintf_unfiltered (log, "\n\tnum_regs");
   /* Skip verify of num_pseudo_regs, invalid_p == 0 */
   /* Skip verify of sp_regnum, invalid_p == 0 */
@@ -567,14 +566,11 @@ verify_gdbarch (struct gdbarch *current_gdbarch)
   /* Skip verify of store_return_value, invalid_p == 0 */
   /* Skip verify of deprecated_use_struct_convention, invalid_p == 0 */
   /* Skip verify of deprecated_extract_struct_value_address, has predicate */
-  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
-      && (current_gdbarch->skip_prologue == 0))
+  if (current_gdbarch->skip_prologue == 0)
     fprintf_unfiltered (log, "\n\tskip_prologue");
-  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
-      && (current_gdbarch->inner_than == 0))
+  if (current_gdbarch->inner_than == 0)
     fprintf_unfiltered (log, "\n\tinner_than");
-  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
-      && (current_gdbarch->breakpoint_from_pc == 0))
+  if (current_gdbarch->breakpoint_from_pc == 0)
     fprintf_unfiltered (log, "\n\tbreakpoint_from_pc");
   /* Skip verify of adjust_breakpoint_address, has predicate */
   /* Skip verify of memory_insert_breakpoint, invalid_p == 0 */
@@ -595,8 +591,7 @@ verify_gdbarch (struct gdbarch *current_gdbarch)
   /* Skip verify of addr_bits_remove, invalid_p == 0 */
   /* Skip verify of smash_text_address, invalid_p == 0 */
   /* Skip verify of software_single_step, has predicate */
-  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
-      && (current_gdbarch->print_insn == 0))
+  if (current_gdbarch->print_insn == 0)
     fprintf_unfiltered (log, "\n\tprint_insn");
   /* Skip verify of skip_trampoline_code, invalid_p == 0 */
   /* Skip verify of skip_solib_resolver, invalid_p == 0 */

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 90edd83..298faf0 100755 (executable)
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1451,13 +1451,11 @@ do
            printf "    current_gdbarch->${function} = ${postdefault};\n"
        elif [ -n "${invalid_p}" ]
        then
-           printf "  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)\n"
-           printf "      && (${invalid_p}))\n"
+           printf "  if (${invalid_p})\n"
            printf "    fprintf_unfiltered (log, \"\\\\n\\\\t${function}\");\n"
        elif [ -n "${predefault}" ]
        then
-           printf "  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)\n"
-           printf "      && (current_gdbarch->${function} == ${predefault}))\n"
+           printf "  if (current_gdbarch->${function} == ${predefault})\n"
            printf "    fprintf_unfiltered (log, \"\\\\n\\\\t${function}\");\n"
        fi
     fi