* arch-utils.c (gdbarch_info_fill): Only reference GDB_OSABI_DEFAULT

	if the macro is defined.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fccad0b66f0e39977e77a329f97a7f9165b084ca..b3f386c387d4344758f5c336e7dae09b893e155a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-20  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * arch-utils.c (gdbarch_info_fill): Only reference GDB_OSABI_DEFAULT
+       if the macro is defined.
+
 2009-07-20  Pedro Alves  <pedro@codesourcery.com>
 
        * features/gdb-target.dtd (target): Accept an optional 'osabi'

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 458aa062190164c800858ecbd0e63cdc6b4d44d4..f3246eb0baa5a7c76848eb98eb240608118e37f0 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -717,8 +717,10 @@ gdbarch_info_fill (struct gdbarch_info *info)
   if (info->osabi == GDB_OSABI_UNKNOWN && info->target_desc != NULL)
     info->osabi = tdesc_osabi (info->target_desc);
   /* From the configured default.  */
+#ifdef GDB_OSABI_DEFAULT
   if (info->osabi == GDB_OSABI_UNKNOWN)
     info->osabi = GDB_OSABI_DEFAULT;
+#endif
 
   /* Must have at least filled in the architecture.  */
   gdb_assert (info->bfd_arch_info != NULL);