--- glibc-2.7/sysdeps/unix/sysv/linux/i386/sigcontextinfo.h.ark	2008-01-01 21:04:40.000000000 +0000
+++ glibc-2.7/sysdeps/unix/sysv/linux/i386/sigcontextinfo.h	2008-01-01 21:06:33.000000000 +0000
@@ -17,11 +17,12 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <asm/sigcontext.h>
 #define SIGCONTEXT struct sigcontext
 #define SIGCONTEXT_EXTRA_ARGS
-#define GET_PC(ctx)	((void *) ctx.eip)
-#define GET_FRAME(ctx)	((void *) ctx.ebp)
-#define GET_STACK(ctx)	((void *) ctx.esp_at_signal)
+#define GET_PC(ctx)	((void *) ctx.ip)
+#define GET_FRAME(ctx)	((void *) ctx.bp)
+#define GET_STACK(ctx)	((void *) ctx.sp_at_signal)
 #define CALL_SIGHANDLER(handler, signo, ctx) \
 do {									      \
   int __tmp1, __tmp2, __tmp3, __tmp4;					      \
--- glibc-2.7/sysdeps/unix/sysv/linux/i386/register-dump.h.ark	2008-01-01 21:44:35.000000000 +0000
+++ glibc-2.7/sysdeps/unix/sysv/linux/i386/register-dump.h	2008-01-01 21:44:45.000000000 +0000
@@ -69,16 +69,16 @@
   ++nr
 
   /* Generate strings of register contents.  */
-  hexvalue (ctx->eax, regs[0], 8);
-  hexvalue (ctx->ebx, regs[1], 8);
-  hexvalue (ctx->ecx, regs[2], 8);
-  hexvalue (ctx->edx, regs[3], 8);
-  hexvalue (ctx->esi, regs[4], 8);
-  hexvalue (ctx->edi, regs[5], 8);
-  hexvalue (ctx->ebp, regs[6], 8);
-  hexvalue (ctx->esp, regs[7], 8);
-  hexvalue (ctx->eip, regs[8], 8);
-  hexvalue (ctx->eflags, regs[9], 8);
+  hexvalue (ctx->ax, regs[0], 8);
+  hexvalue (ctx->bx, regs[1], 8);
+  hexvalue (ctx->cx, regs[2], 8);
+  hexvalue (ctx->dx, regs[3], 8);
+  hexvalue (ctx->si, regs[4], 8);
+  hexvalue (ctx->di, regs[5], 8);
+  hexvalue (ctx->bp, regs[6], 8);
+  hexvalue (ctx->sp, regs[7], 8);
+  hexvalue (ctx->ip, regs[8], 8);
+  hexvalue (ctx->flags, regs[9], 8);
   hexvalue (ctx->cs, regs[10], 4);
   hexvalue (ctx->ds, regs[11], 4);
   hexvalue (ctx->es, regs[12], 4);
@@ -88,7 +88,7 @@
   hexvalue (ctx->trapno, regs[16], 8);
   hexvalue (ctx->err, regs[17], 8);
   hexvalue (ctx->oldmask, regs[18], 8);
-  hexvalue (ctx->esp_at_signal, regs[19], 8);
+  hexvalue (ctx->sp_at_signal, regs[19], 8);
   hexvalue (ctx->cr2, regs[20], 8);
 
   /* Generate the output.  */