* Extend use of i386_use_watchpoints to all i386 native files

[binutils-gdb.git] / gdb / solib-irix.c

diff --git a/gdb/solib-irix.c b/gdb/solib-irix.c
index 5b612ec6c62fe7b8366dd5a7330b1dbb7f6bced5..9140dafac19f0c96565a1ce250717bea5c9def25 100644 (file)
--- a/gdb/solib-irix.c
+++ b/gdb/solib-irix.c
@@ -1,6 +1,6 @@
 /* Shared library support for IRIX.
    Copyright (C) 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2004,
-   2007, 2008 Free Software Foundation, Inc.
+   2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file was created using portions of irix5-nat.c originally
    contributed to GDB by Ian Lance Taylor.
@@ -422,6 +422,7 @@ enable_break (void)
 static void
 irix_solib_create_inferior_hook (void)
 {
+  struct inferior *inf;
   struct thread_info *tp;
 
   if (!enable_break ())
@@ -435,10 +436,14 @@ irix_solib_create_inferior_hook (void)
      can go groveling around in the dynamic linker structures to find
      out what we need to know about them. */
 
+  inf = current_inferior ();
   tp = inferior_thread ();
+
   clear_proceed_status ();
-  stop_soon = STOP_QUIETLY;
+
+  inf->stop_soon = STOP_QUIETLY;
   tp->stop_signal = TARGET_SIGNAL_0;
+
   do
     {
       target_resume (pid_to_ptid (-1), 0, tp->stop_signal);
@@ -463,7 +468,7 @@ irix_solib_create_inferior_hook (void)
      Delaying the resetting of stop_soon until after symbol loading
      suppresses the warning.  */
   solib_add ((char *) 0, 0, (struct target_ops *) 0, auto_solib_add);
-  stop_soon = NO_STOP_QUIETLY;
+  inf->stop_soon = NO_STOP_QUIETLY;
 }
 
 /* LOCAL FUNCTION