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

	* osabi.c (gdbarch_init_osabi): Use info.bfd_arch_info instead of
	arch_info.  Use warning instead of fprintf_filtered.  Do not use
	deprecated bfd_printable_arch_mach.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c6073be7267264abda5e90d5d16304a6e896e080..25f2ae55924f2a3699480aa0f672c2d189038959 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-24  Andrew Cagney  <cagney@redhat.com>
+
+       * osabi.c (gdbarch_init_osabi): Use info.bfd_arch_info instead of
+       arch_info.  Use warning instead of fprintf_filtered.  Do not use
+       deprecated bfd_printable_arch_mach.
+
 2003-10-26  Kevin Buettner  <kevinb@redhat.com>
 
        * frv-tdep.c (frv_register_raw_size, frv_register_virtual_size):

diff --git a/gdb/osabi.c b/gdb/osabi.c
index 4ebed2501d813bf8dbceb6ce00b0f20b1511f7f4..ee13277e6dc9d32ded5cdd974d98adc5f383f021 100644 (file)
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -305,7 +305,6 @@ can_run_code_for (const struct bfd_arch_info *a, const struct bfd_arch_info *b)
 void
 gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
-  const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch);
   struct gdb_osabi_handler *handler;
 
   if (info.osabi == GDB_OSABI_UNKNOWN)
@@ -341,20 +340,18 @@ gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch)
          (or more generally "64-bit ISA can run code for the 32-bit
          ISA").  BFD doesn't normally consider 32-bit and 64-bit
          "compatible" so it doesn't succeed.  */
-      if (can_run_code_for (arch_info, handler->arch_info))
+      if (can_run_code_for (info.bfd_arch_info, handler->arch_info))
        {
          (*handler->init_osabi) (info, gdbarch);
          return;
        }
     }
 
-  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));
+  warning ("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),
+          info.bfd_arch_info->printable_name);
 }
 \f