2007-05-31 Markus Deuling <deuling@de.ibm.com>

	* gdbarch.sh (TARGET_OSABI): Replace by gdbarch_osabi.
	* gdbarch.c, gdbarch.h: Regenerate.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e79948..978427c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2007-05-31  Markus Deuling  <deuling@de.ibm.com>
 
+       * gdbarch.sh (TARGET_OSABI): Replace by gdbarch_osabi.
+       * gdbarch.c, gdbarch.h: Regenerate.
+
+2007-05-31  Markus Deuling  <deuling@de.ibm.com>
+
        * gdbarch.sh (TARGET_CHAR_SIGNED): Replace by gdbarch_char_signed.
        * gdbtypes.c (build_gdbtypes, gdbtypes_post_init): Likewise.
        * gdbarch.c, gdbarch.h: Regenerate.

diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 79e1fe0..cc143fc 100644 (file)
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -1201,11 +1201,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
                       "gdbarch_dump: num_regs = %s\n",
                       paddr_d (current_gdbarch->num_regs));
-#ifdef TARGET_OSABI
-  fprintf_unfiltered (file,
-                      "gdbarch_dump: TARGET_OSABI # %s\n",
-                      XSTRING (TARGET_OSABI));
-#endif
   fprintf_unfiltered (file,
                       "gdbarch_dump: osabi = %s\n",
                       paddr_d (current_gdbarch->osabi));

diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index ec596a5..6642123 100644 (file)
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -72,12 +72,6 @@ extern int gdbarch_byte_order (struct gdbarch *gdbarch);
 
 extern enum gdb_osabi gdbarch_osabi (struct gdbarch *gdbarch);
 /* set_gdbarch_osabi() - not applicable - pre-initialized. */
-#if !defined (GDB_TM_FILE) && defined (TARGET_OSABI)
-#error "Non multi-arch definition of TARGET_OSABI"
-#endif
-#if !defined (TARGET_OSABI)
-#define TARGET_OSABI (gdbarch_osabi (current_gdbarch))
-#endif
 
 extern const struct target_desc * gdbarch_target_desc (struct gdbarch *gdbarch);
 /* set_gdbarch_target_desc() - not applicable - pre-initialized. */

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 0acbf2b..2905f94 100755 (executable)
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -371,7 +371,7 @@ i:TARGET_ARCHITECTURE:const struct bfd_arch_info *:bfd_arch_info:::&bfd_default_
 #
 i::int:byte_order:::BFD_ENDIAN_BIG
 #
-i:TARGET_OSABI:enum gdb_osabi:osabi:::GDB_OSABI_UNKNOWN
+i::enum gdb_osabi:osabi:::GDB_OSABI_UNKNOWN
 #
 i::const struct target_desc *:target_desc:::::::paddr_d ((long) current_gdbarch->target_desc)
 # Number of bits in a char or unsigned char for the target machine.