Index: alpha-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-linux-tdep.c,v
retrieving revision 1.4
diff -u -r1.4 alpha-linux-tdep.c
--- alpha-linux-tdep.c	26 Apr 2002 01:08:19 -0000	1.4
+++ alpha-linux-tdep.c	26 Apr 2002 06:49:44 -0000
@@ -19,6 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
+#include "frame.h"
 #include "gdbcore.h"
 #include "value.h"
 
@@ -91,6 +92,12 @@
   return (alpha_linux_sigtramp_offset (pc) >= 0);
 }
 
+static CORE_ADDR
+alpha_linux_sigcontext_addr (struct frame_info *frame)
+{
+  return (frame->frame - 0x298); /* sizeof(struct sigcontext) */
+}
+
 static void
 alpha_linux_init_abi (struct gdbarch_info info,
                       struct gdbarch *gdbarch)
@@ -100,6 +107,7 @@
   set_gdbarch_pc_in_sigtramp (gdbarch, alpha_linux_pc_in_sigtramp);
 
   tdep->dynamic_sigtramp_offset = alpha_linux_sigtramp_offset;
+  tdep->sigcontext_addr = alpha_linux_sigcontext_addr;
 
   tdep->jb_pc = 2;
   tdep->jb_elt_size = 8;
Index: alpha-osf1-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-osf1-tdep.c,v
retrieving revision 1.3
diff -u -r1.3 alpha-osf1-tdep.c
--- alpha-osf1-tdep.c	26 Apr 2002 01:08:19 -0000	1.3
+++ alpha-osf1-tdep.c	26 Apr 2002 06:49:44 -0000
@@ -20,6 +20,7 @@
 
 #include "defs.h"
 #include "frame.h"
+#include "gdbcore.h"
 #include "value.h"
 
 #include "alpha-tdep.h"
@@ -43,6 +44,13 @@
   return (func_name != NULL && STREQ ("__sigtramp", func_name));
 }
 
+static CORE_ADDR
+alpha_osf1_sigcontext_addr (struct frame_info *frame)
+{
+  return (read_memory_integer (frame->next ? frame->next->frame
+					   : frame->frame, 8));
+}
+
 static void
 alpha_osf1_init_abi (struct gdbarch_info info,
                      struct gdbarch *gdbarch)
@@ -52,6 +60,7 @@
   set_gdbarch_pc_in_sigtramp (gdbarch, alpha_osf1_pc_in_sigtramp);
 
   tdep->skip_sigtramp_frame = alpha_osf1_skip_sigtramp_frame;
+  tdep->sigcontext_addr = alpha_osf1_sigcontext_addr;
 
   tdep->jb_pc = 2;
   tdep->jb_elt_size = 8;
Index: alpha-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-tdep.c,v
retrieving revision 1.31
diff -u -r1.31 alpha-tdep.c
--- alpha-tdep.c	26 Apr 2002 01:22:41 -0000	1.31
+++ alpha-tdep.c	26 Apr 2002 06:49:46 -0000
@@ -344,6 +344,17 @@
 }
 
 
+static CORE_ADDR
+alpha_sigcontext_addr (struct frame_info *fi)
+{
+  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+
+  if (tdep->sigcontext_addr)
+    return (tdep->sigcontext_addr (fi));
+
+  return (0);
+}
+
 /* Guaranteed to set frame->saved_regs to some values (it never leaves it
    NULL).  */
 
@@ -372,7 +383,12 @@
     {
       CORE_ADDR sigcontext_addr;
 
-      sigcontext_addr = SIGCONTEXT_ADDR (frame);
+      sigcontext_addr = alpha_sigcontext_addr (frame);
+      if (sigcontext_addr == 0)
+	{
+	  /* Don't know where the sigcontext is; just bail.  */
+	  return;
+	}
       for (ireg = 0; ireg < 32; ireg++)
 	{
 	  reg_position = sigcontext_addr + SIGFRAME_REGSAVE_OFF + ireg * 8;
@@ -1997,6 +2013,7 @@
 
   tdep->dynamic_sigtramp_offset = NULL;
   tdep->skip_sigtramp_frame = NULL;
+  tdep->sigcontext_addr = NULL;
 
   tdep->jb_pc = -1;	/* longjmp support not enabled by default  */
 
Index: alpha-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/alpha-tdep.h,v
retrieving revision 1.6
diff -u -r1.6 alpha-tdep.h
--- alpha-tdep.h	26 Apr 2002 01:08:19 -0000	1.6
+++ alpha-tdep.h	26 Apr 2002 06:49:46 -0000
@@ -106,6 +106,10 @@
      frame.  */
   CORE_ADDR (*skip_sigtramp_frame) (struct frame_info *, CORE_ADDR);
 
+  /* Translate a signal handler frame into the address of the sigcontext
+     structure for that signal handler.  */
+  CORE_ADDR (*sigcontext_addr) (struct frame_info *);
+
   int jb_pc;			/* Offset to PC value in jump buffer.
 				   If htis is negative, longjmp support
 				   will be disabled.  */
Index: config/alpha/tm-alpha.h
===================================================================
RCS file: /cvs/src/src/gdb/config/alpha/tm-alpha.h,v
retrieving revision 1.25
diff -u -r1.25 tm-alpha.h
--- config/alpha/tm-alpha.h	25 Apr 2002 06:22:22 -0000	1.25
+++ config/alpha/tm-alpha.h	26 Apr 2002 06:49:47 -0000
@@ -83,10 +83,4 @@
   alpha_setup_arbitrary_frame (argc, argv)
 extern struct frame_info *alpha_setup_arbitrary_frame (int, CORE_ADDR *);
 
-/* Translate a signal handler frame into the address of the sigcontext
-   structure.  */
-
-#define SIGCONTEXT_ADDR(frame) \
-  (read_memory_integer ((frame)->next ? frame->next->frame : frame->frame, 8))
-
 #endif /* TM_ALPHA_H */
Index: config/alpha/tm-alphalinux.h
===================================================================
RCS file: /cvs/src/src/gdb/config/alpha/tm-alphalinux.h,v
retrieving revision 1.6
diff -u -r1.6 tm-alphalinux.h
--- config/alpha/tm-alphalinux.h	25 Apr 2002 05:06:08 -0000	1.6
+++ config/alpha/tm-alphalinux.h	26 Apr 2002 06:49:47 -0000
@@ -40,12 +40,6 @@
 #undef START_INFERIOR_TRAPS_EXPECTED
 #define START_INFERIOR_TRAPS_EXPECTED 2
 
-/* Translate a signal handler frame into the address of the sigcontext
-   structure.  */
-
-#undef SIGCONTEXT_ADDR
-#define SIGCONTEXT_ADDR(frame)			((frame)->frame - 0x298)
-
 #include "tm-linux.h"
 
 #endif /* TM_LINUXALPHA_H */