Phase 1 of the ptid_t changes.

[deliverable/binutils-gdb.git] / gdb / solib-svr4.c

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 79bbcdc55ee553a284bfd7f2af24e91168cc594f..1112e2991277c99af6620874b48536cbc799d252 100644 (file)
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -744,7 +744,7 @@ locate_base (void)
        debug_base = elf_locate_base ();
 #ifdef HANDLE_SVR4_EXEC_EMULATORS
       /* Try it the hard way for emulated executables.  */
-      else if (inferior_pid != 0 && target_has_execution)
+      else if (!ptid_equal (inferior_ptid, null_ptid) && target_has_execution)
        proc_iterate_over_mappings (look_for_base);
 #endif
     }
@@ -1571,7 +1571,7 @@ svr4_solib_create_inferior_hook (void)
   stop_signal = TARGET_SIGNAL_0;
   do
     {
-      target_resume (-1, 0, stop_signal);
+      target_resume (pid_to_ptid (-1), 0, stop_signal);
       wait_for_inferior ();
     }
   while (stop_signal != TARGET_SIGNAL_TRAP);