2003-08-24 Andrew Cagney <cagney@redhat.com>

	* arm-tdep.c (_initialize_arm_tdep): Simplify by assuming
	GDB_MULTI_ARCH is always non-zero.
	* osabi.c (_initialize_gdb_osabi): Ditto.
	(gdbarch_init_osabi): Ditto.
	* sparc-tdep.c: Ditto for #if code.

4 files changed, 17 insertions, 60 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dc207c6cf97..0c2afd24c71 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-24  Andrew Cagney  <cagney@redhat.com>
+
+	* arm-tdep.c (_initialize_arm_tdep): Simplify by assuming
+	GDB_MULTI_ARCH is always non-zero.
+	* osabi.c (_initialize_gdb_osabi): Ditto.
+	(gdbarch_init_osabi): Ditto.
+	* sparc-tdep.c: Ditto for #if code.
+
 2003-08-23  Mark Kettenis  <kettenis@gnu.org>
 
 	* x86-64-tdep.c (x86_64_supply_fxsave): Add `regnum' argument.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 3f2f13c3bb6..e6951f89932 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -3024,8 +3024,7 @@ _initialize_arm_tdep (void)
   int numregs, i, j;
   static char *helptext;
 
-  if (GDB_MULTI_ARCH)
-    gdbarch_register (bfd_arch_arm, arm_gdbarch_init, arm_dump_tdep);
+  gdbarch_register (bfd_arch_arm, arm_gdbarch_init, arm_dump_tdep);
 
   /* Register an ELF OS ABI sniffer for ARM binaries.  */
   gdbarch_register_osabi_sniffer (bfd_arch_arm,
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 252129ba7f2..dbba578429d 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -319,17 +319,13 @@ gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch)
 	}
     }
 
-  /* We assume that if GDB_MULTI_ARCH is less than GDB_MULTI_ARCH_TM
-     that an ABI variant can be supported by overriding definitions in
-     the tm-file.  */
-  if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
-    fprintf_filtered
-      (gdb_stderr,
-       "A handler for the OS ABI \"%s\" is not built into this "
-       "configuration of GDB.  "
-       "Attempting to continue with the default %s settings",
-       gdbarch_osabi_name (info.osabi),
-       bfd_printable_arch_mach (arch_info->arch, arch_info->mach));
+  fprintf_filtered
+    (gdb_stderr,
+     "A handler for the OS ABI \"%s\" is not built into this "
+     "configuration of GDB.  "
+     "Attempting to continue with the default %s settings",
+     gdbarch_osabi_name (info.osabi),
+     bfd_printable_arch_mach (arch_info->arch, arch_info->mach));
 }
 
 
@@ -571,8 +567,7 @@ _initialize_gdb_osabi (void)
 				  bfd_target_elf_flavour,
 				  generic_elf_osabi_sniffer);
 
-  if (!GDB_MULTI_ARCH)
-    return;
+  return;
 
   /* Register the "set osabi" command.  */
   c = add_set_enum_cmd ("osabi", class_support, gdb_osabi_available_names,
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index ef6368f69f6..13d006f5738 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -51,8 +51,6 @@
  * Some local macros that have multi-arch and non-multi-arch versions:
  */
 
-#if (GDB_MULTI_ARCH > 0)
-
 #if 0
 // OBSOLETE /* Does the target have Floating Point registers?  */
 // OBSOLETE #define SPARC_HAS_FPU     (gdbarch_tdep (current_gdbarch)->has_fpu)
@@ -67,49 +65,6 @@
 /* Offset within the call dummy stack of the saved registers.  */
 #define DUMMY_REG_SAVE_OFFSET (gdbarch_tdep (current_gdbarch)->reg_save_offset)
 
-#else /* non-multi-arch */
-
-
-/* Does the target have Floating Point registers?  */
-#if 0
-// OBSOLETE #if defined(TARGET_SPARCLET) || defined(TARGET_SPARCLITE)
-// OBSOLETE #define SPARC_HAS_FPU 0
-// OBSOLETE #else
-// OBSOLETE #define SPARC_HAS_FPU 1
-// OBSOLETE #endif
-#endif
-#define SPARC_HAS_FPU 1
-
-/* Number of bytes devoted to Floating Point registers: */
-#if (GDB_TARGET_IS_SPARC64)
-#define FP_REGISTER_BYTES (64 * 4)
-#else
-#if (SPARC_HAS_FPU)
-#define FP_REGISTER_BYTES (32 * 4)
-#else
-#define FP_REGISTER_BYTES 0
-#endif
-#endif
-
-/* Highest numbered Floating Point register.  */
-#if (GDB_TARGET_IS_SPARC64)
-#define FP_MAX_REGNUM (FP0_REGNUM + 48)
-#else
-#define FP_MAX_REGNUM (FP0_REGNUM + 32)
-#endif
-
-/* Size of a general (integer) register: */
-#define SPARC_INTREG_SIZE (REGISTER_RAW_SIZE (G0_REGNUM))
-
-/* Offset within the call dummy stack of the saved registers.  */
-#if (GDB_TARGET_IS_SPARC64)
-#define DUMMY_REG_SAVE_OFFSET (128 + 16)
-#else
-#define DUMMY_REG_SAVE_OFFSET 0x60
-#endif
-
-#endif /* GDB_MULTI_ARCH */
-
 struct gdbarch_tdep
   {
 #if 0