about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/mach/hurd/i386/longjmp-ts.c14
2 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 1922f6a6bc..e8d36d3d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Fri Sep  1 16:16:12 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* sysdeps/mach/hurd/i386/longjmp-ts.c: Use new array format for
+	jmp_buf.
+
 	* libc-symbols.h (link_warning): Take new first arg SYMBOL; ask
 	for a warning on references to that specific symbol, not the
 	entire containing object file.
diff --git a/sysdeps/mach/hurd/i386/longjmp-ts.c b/sysdeps/mach/hurd/i386/longjmp-ts.c
index 7da9be2a26..15f71d4d7a 100644
--- a/sysdeps/mach/hurd/i386/longjmp-ts.c
+++ b/sysdeps/mach/hurd/i386/longjmp-ts.c
@@ -1,5 +1,5 @@
 /* Perform a `longjmp' on a Mach thread_state.  i386 version.
-Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+Copyright (C) 1991, 1994, 1995 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -29,11 +29,11 @@ _hurd_longjmp_thread_state (void *state, jmp_buf env, int val)
 {
   struct i386_thread_state *ts = state;
 
-  ts->ebx = env[0].__jmpbuf[0].__bx;
-  ts->esi = env[0].__jmpbuf[0].__si;
-  ts->edi = env[0].__jmpbuf[0].__di;
-  ts->ebp = (int) env[0].__jmpbuf[0].__bp;
-  ts->uesp = (int) env[0].__jmpbuf[0].__sp;
-  ts->eip = (int) env[0].__jmpbuf[0].__pc;
+  ts->ebx = env[0].__jmpbuf[JB_BX];
+  ts->esi = env[0].__jmpbuf[JB_SI];
+  ts->edi = env[0].__jmpbuf[JB_DI];
+  ts->ebp = env[0].__jmpbuf[JB_BP];
+  ts->uesp = env[0].__jmpbuf[JB_SP];
+  ts->eip = env[0].__jmpbuf[JB_PC];
   ts->eax = val ?: 1;
 }