[src/trunk]: src/external/gpl3/gdb/dist/gdb make alpha compile.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/648315eaf655
branches:  trunk
changeset: 770278:648315eaf655
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Oct 10 22:18:08 2011 +0000

description:
make alpha compile.

diffstat:

 external/gpl3/gdb/dist/gdb/alphabsd-nat.c   |   1 +
 external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c |  14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (70 lines):

diff -r a6ea449e09b7 -r 648315eaf655 external/gpl3/gdb/dist/gdb/alphabsd-nat.c
--- a/external/gpl3/gdb/dist/gdb/alphabsd-nat.c Mon Oct 10 22:18:00 2011 +0000
+++ b/external/gpl3/gdb/dist/gdb/alphabsd-nat.c Mon Oct 10 22:18:08 2011 +0000
@@ -24,6 +24,7 @@
 
 #include "alpha-tdep.h"
 #include "alphabsd-tdep.h"
+#include "nbsd-nat.h"
 #include "inf-ptrace.h"
 
 #include <sys/types.h>
diff -r a6ea449e09b7 -r 648315eaf655 external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c
--- a/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c       Mon Oct 10 22:18:00 2011 +0000
+++ b/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c       Mon Oct 10 22:18:08 2011 +0000
@@ -35,6 +35,9 @@
 #include "alphabsd-tdep.h"
 #include "nbsd-tdep.h"
 #include "solib-svr4.h"
+#include "trad-frame.h"
+#include "frame-unwind.h"
+#include "tramp-frame.h"
 #include "target.h"
 
 /* Core file support.  */
@@ -193,7 +196,7 @@
    designated code sequence that is used to return from a signal handler.
    In particular, the return address of a signal handler points to the
    following code sequences: */
-static const struct tramp_frame alphanbsd_sigtramp_sc1 =
+static const struct tramp_frame alphanbsd_sigtramp_sc1 = {
   SIGTRAMP_FRAME,
   4,
   {
@@ -243,16 +246,16 @@
 
 static void
 alphanbsd_sigtramp_cache_init (const struct tramp_frame *self,
-                              struct frame_info *next_frame,
+                              struct frame_info *this_frame,
                               struct trad_frame_cache *this_cache,
                               CORE_ADDR func)
 {
-  struct gdbarch *gdbarch = get_frame_arch (next_frame);
+  struct gdbarch *gdbarch = get_frame_arch (this_frame);
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   CORE_ADDR addr, sp;
   int i;
 
-  sp = frame_unwind_register_unsigned (next_frame, SP_REGNUM);
+  sp = get_frame_register_unsigned (this_frame, ALPHA_SP_REGNUM);
 
   if (self == &alphanbsd_sigtramp_sc1) {
     addr = sp;
@@ -286,14 +289,15 @@
   /* NetBSD/alpha does not provide single step support via ptrace(2); we
      must use software single-stepping.  */
   set_gdbarch_software_single_step (gdbarch, alpha_software_single_step);
-
   /* NetBSD/alpha has SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_lp64_fetch_link_map_offsets);
 
+#ifdef notyet
   tdep->dynamic_sigtramp_offset = alphanbsd_sigtramp_offset;
   tdep->pc_in_sigtramp = alphanbsd_pc_in_sigtramp;
   tdep->sigcontext_addr = alphanbsd_sigcontext_addr;
+#endif
 
   tdep->jb_pc = 2;
   tdep->jb_elt_size = 8;