* i386-tdep.c (i386_gdbarch_init): Eliminate incorrect use

        of ``current_gdbarch''.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6aad9b4..a82dc9b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-19  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
+
+       * i386-tdep.c (i386_gdbarch_init): Eliminate incorrect use
+        of ``current_gdbarch''.
+
 2002-02-19  Richard Earnshaw  <rearnsha@arm.com>
 
        * armnbsd-nat.c : ANSIfy all function declarations.

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 946838b..b2ddd28 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -1305,9 +1305,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
        arches != NULL;
        arches = gdbarch_list_lookup_by_info (arches->next, &info))
     {
-      if (gdbarch_tdep (current_gdbarch)->os_ident != os_ident)
-        continue;
-      return arches->gdbarch;
+      tdep = gdbarch_tdep (arches->gdbarch);
+      if (tdep && tdep->os_ident == os_ident)
+        return arches->gdbarch;
     }
 
   /* Allocate space for the new architecture.  */