* solib-osf.c (open_map): Compute the list of shared libraries

        loaded by the inferior, rather than the list of libraries loaded
        by GDB itself.  Otherwise, GDB ends up reading the symbols from
        the wrong shared libraries...

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 07bfffd475a2b93ca1cfb735ee5ece477c199b1f..cc07fd9ac7bfd9252682a387943367e90c2d3747 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-02  Joel Brobecker  <brobecker@gnat.com>
+
+       * solib-osf.c (open_map): Compute the list of shared libraries
+       loaded by the inferior, rather than the list of libraries loaded
+       by GDB itself.  Otherwise, GDB ends up reading the symbols from
+       the wrong shared libraries...
+
 2002-07-02  Mark Kettenis  <kettenis@gnu.org>
 
        * i386-linux-tdep.c (i386_linux_sigcontext_addr): Make static.

diff --git a/gdb/solib-osf.c b/gdb/solib-osf.c
index a00e488ee041926a8db0317346b03f9aa6a4827f..6f43a8f0e49532b793b1d840f87334fa85c27222 100644 (file)
--- a/gdb/solib-osf.c
+++ b/gdb/solib-osf.c
@@ -359,7 +359,14 @@ static int
 open_map (struct read_map_ctxt *ctxt)
 {
 #ifdef USE_LDR_ROUTINES
-  ctxt->proc = ldr_my_process ();
+  /* Note: As originally written, ldr_my_process() was used to obtain
+     the value for ctxt->proc.  This is incorrect, however, since
+     ldr_my_process() retrieves the "unique identifier" associated
+     with the current process (i.e. GDB) and not the one being
+     debugged.  Presumably, the pid of the process being debugged is
+     compatible with the "unique identifier" used by the ldr_
+     routines, so we use that.  */
+  ctxt->proc = ptid_get_pid (inferior_ptid);
   if (ldr_xattach (ctxt->proc) != 0)
     return 0;
   ctxt->next = LDR_NULL_MODULE;