* proc-service.c (ps_pglobal_lookup): Set the current program

	space.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6fe3ae9ad2a7f41c317ad6f21663a409a29fb76d..f28fbfd6387d8f6ae6e3f533acdece3133416bd3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-06  Tom Tromey  <tromey@redhat.com>
+
+       * proc-service.c (ps_pglobal_lookup): Set the current program
+       space.
+
 2012-03-06  Pedro Alves  <palves@redhat.com>
 
        * gregset.h [HAVE_SYS_PROCFS_H]: Include <sys/procfs.h>.

diff --git a/gdb/proc-service.c b/gdb/proc-service.c
index e3174144488e218beaa9938977848dde53843f1e..a1f90a88eb3f6c5daec3ae1654c5fa0e317570e6 100644 (file)
--- a/gdb/proc-service.c
+++ b/gdb/proc-service.c
@@ -201,14 +201,24 @@ ps_pglobal_lookup (gdb_ps_prochandle_t ph, const char *obj,
                   const char *name, psaddr_t *sym_addr)
 {
   struct minimal_symbol *ms;
+  struct cleanup *old_chain = save_current_program_space ();
+  struct inferior *inf = find_inferior_pid (ptid_get_pid (ph->ptid));
+  ps_err_e result;
+
+  set_current_program_space (inf->pspace);
 
   /* FIXME: kettenis/2000-09-03: What should we do with OBJ?  */
   ms = lookup_minimal_symbol (name, NULL, NULL);
   if (ms == NULL)
-    return PS_NOSYM;
+    result = PS_NOSYM;
+  else
+    {
+      *sym_addr = core_addr_to_ps_addr (SYMBOL_VALUE_ADDRESS (ms));
+      result = PS_OK;
+    }
 
-  *sym_addr = core_addr_to_ps_addr (SYMBOL_VALUE_ADDRESS (ms));
-  return PS_OK;
+  do_cleanups (old_chain);
+  return result;
 }
 
 /* Read SIZE bytes from the target process PH at address ADDR and copy