X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsol2-tdep.c;h=9016b31c3f8064157f134fb4fe2a5c12160b0cb3;hb=f5a7c406b1975cde626efed526960f2cf1bdaceb;hp=de9e018ffee5549999b49bca5ad13e79bb98722b;hpb=28439f5ef78fd28c36bfc8c4b262f44fdd1ec40f;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/sol2-tdep.c b/gdb/sol2-tdep.c
index de9e018ffe..9016b31c3f 100644
--- a/gdb/sol2-tdep.c
+++ b/gdb/sol2-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Solaris.
 
-   Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,17 +21,18 @@
 #include "frame.h"
 #include "symtab.h"
 #include "inferior.h"
+#include "objfiles.h"
 
 #include "sol2-tdep.h"
 
 CORE_ADDR
 sol2_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  struct minimal_symbol *msym;
+  struct bound_minimal_symbol msym;
 
   msym = lookup_minimal_symbol("elf_bndr", NULL, NULL);
-  if (msym && SYMBOL_VALUE_ADDRESS (msym) == pc)
-    return frame_pc_unwind (get_current_frame ());
+  if (msym.minsym && BMSYMBOL_VALUE_ADDRESS (msym) == pc)
+    return frame_unwind_caller_pc (get_current_frame ());
 
   return 0;
 }
@@ -39,11 +40,28 @@ sol2_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc)
 /* This is how we want PTIDs from Solaris core files to be
    printed.  */
 
-char *
+std::string
 sol2_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid)
 {
-  static char buf[80];
+  struct inferior *inf;
+  int pid;
 
-  xsnprintf (buf, sizeof buf, "LWP %ld", ptid_get_lwp (ptid));
-  return buf;
+  /* Check whether we're printing an LWP (gdb thread) or a
+     process.  */
+  pid = ptid.lwp ();
+  if (pid != 0)
+    {
+      /* A thread.  */
+      return string_printf ("LWP %ld", ptid.lwp ());
+    }
+
+  /* GDB didn't use to put a NT_PSTATUS note in Solaris cores.  If
+     that's missing, then we're dealing with a fake PID corelow.c made
+     up.  */
+  inf = find_inferior_ptid (ptid);
+  if (inf == NULL || inf->fake_pid_p)
+    return "<core>";
+
+  /* Not fake; print as usual.  */
+  return normal_pid_to_str (ptid);
 }