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

	* acconfig.h (GDB_MULTI_ARCH): Delete undef.
	* defs.h (GDB_MULTI_ARCH_PARTIAL, GDB_MULTI_ARCH_TM)
	(GDB_MULTI_ARCH_PURE, GDB_MULTI_ARCH): Delete macros.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7914fd4..b07804b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-02  Andrew Cagney  <cagney@gnu.org>
 
+       * acconfig.h (GDB_MULTI_ARCH): Delete undef.
+       * defs.h (GDB_MULTI_ARCH_PARTIAL, GDB_MULTI_ARCH_TM) 
+       (GDB_MULTI_ARCH_PURE, GDB_MULTI_ARCH): Delete macros.
+
        * gdbarch.sh: Instead of GDB_MULTI_ARCH print GDB_NM_FILE,
        GDB_TM_FILE and GDB_XM_FILE.
        * gdbarch.c: Re-generate.       

diff --git a/gdb/acconfig.h b/gdb/acconfig.h
index 02dcb70..5d1cd9e 100644 (file)
--- a/gdb/acconfig.h
+++ b/gdb/acconfig.h
@@ -154,9 +154,6 @@
 /* Define if libunwind library is being used.  */
 #undef HAVE_LIBUNWIND
 
-/* Multi-arch enabled. */
-#undef GDB_MULTI_ARCH
-
 /* hostfile */
 #undef GDB_XM_FILE
 

diff --git a/gdb/defs.h b/gdb/defs.h
index 7474b3d..45bc805 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -66,29 +66,6 @@
 /* For BFD64 and bfd_vma.  */
 #include "bfd.h"
 
-
-/* The target is partially multi-arched.  Both "tm.h" and the
-   multi-arch vector provide definitions.  "tm.h" normally overrides
-   the multi-arch vector (but there are a few exceptions).  */
-
-#define GDB_MULTI_ARCH_PARTIAL 1
-
-/* The target is partially multi-arched. Both the multi-arch vector
-   and "tm.h" provide definitions. "tm.h" cannot override a definition
-   provided by the multi-arch vector.  It is detected as a compilation
-   error.
-
-   This setting is only useful during a multi-arch conversion. */
-
-#define GDB_MULTI_ARCH_TM 2
-
-/* The target is pure multi-arch.  The MULTI-ARCH vector provides all
-   definitions.  "tm.h" is linked to an empty file. */
-
-#define GDB_MULTI_ARCH_PURE 3
-
-
-
 /* An address in the program being debugged.  Host byte order.  Rather
    than duplicate all the logic in BFD which figures out what type
    this is (long, long long, etc.) and whether it needs to be 64
@@ -1112,15 +1089,6 @@ extern void *alloca ();
 #endif /* Not GNU C */
 #endif /* alloca not defined */
 
-/* Is GDB multi-arch?  If there's a "tm.h" file, it is not.  */
-#ifndef GDB_MULTI_ARCH
-#ifdef GDB_TM_FILE
-#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
-#else
-#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PURE
-#endif
-#endif
-
 /* Dynamic target-system-dependent parameters for GDB. */
 #include "gdbarch.h"