gdb/gdbserver:

[deliverable/binutils-gdb.git] / gdb / sol2-tdep.c

diff --git a/gdb/sol2-tdep.c b/gdb/sol2-tdep.c
index 9e9358950f34b7c5d5af9717d343763c487c6f52..e93758d93e431940ea201331bb85e8e5e4492c49 100644 (file)
--- a/gdb/sol2-tdep.c
+++ b/gdb/sol2-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Solaris.
 
-   Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,6 +20,7 @@
 #include "defs.h"
 #include "frame.h"
 #include "symtab.h"
+#include "inferior.h"
 
 #include "sol2-tdep.h"
 
@@ -30,7 +31,19 @@ sol2_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc)
 
   msym = lookup_minimal_symbol("elf_bndr", NULL, NULL);
   if (msym && SYMBOL_VALUE_ADDRESS (msym) == pc)
-    return frame_pc_unwind (get_current_frame ());
+    return frame_unwind_caller_pc (get_current_frame ());
 
   return 0;
 }
+
+/* This is how we want PTIDs from Solaris core files to be
+   printed.  */
+
+char *
+sol2_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid)
+{
+  static char buf[80];
+
+  xsnprintf (buf, sizeof buf, "LWP %ld", ptid_get_lwp (ptid));
+  return buf;
+}