* sysdeps/i386/setjmp.S (__sigsetjmp): Pop our

frame pointer early so that we save caller's frame pointer.
* sysdeps/i386/elf/setjmp.S: Likewise.
	* sysdeps/i386/setjmp.S (__sigsetjmp): Pop our
	frame pointer early so that we save caller's frame pointer.
	* sysdeps/i386/elf/setjmp.S: Likewise.

diff --git a/ChangeLog b/ChangeLog
index a647cab..4212357 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-08-03  Greg McGary  <greg@mcgary.org>
 
+       * sysdeps/i386/setjmp.S (__sigsetjmp): Pop our
+       frame pointer early so that we save caller's frame pointer.
+       * sysdeps/i386/elf/setjmp.S: Likewise.
+
        * sysdeps/unix/sysv/syscalls.list (time, utime): Correct signatures.
        * io/test-utime.c: Test passing NULL as utimbuf* arg.
 

diff --git a/sysdeps/i386/elf/setjmp.S b/sysdeps/i386/elf/setjmp.S
index 1d600a4..bf03e65 100644 (file)
--- a/sysdeps/i386/elf/setjmp.S
+++ b/sysdeps/i386/elf/setjmp.S
@@ -57,13 +57,13 @@ ENTRY (BP_SYM (__sigsetjmp))
        movl %ebx, (JB_BX*4)(%eax)
        movl %esi, (JB_SI*4)(%eax)
        movl %edi, (JB_DI*4)(%eax)
-       movl %ebp, (JB_BP*4)(%eax)
        leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return.  */
        movl %ecx, (JB_SP*4)(%eax)
        movl PCOFF(%esp), %ecx  /* Save PC we are returning to now.  */
        movl %ecx, (JB_PC*4)(%eax)
-
        LEAVE /* pop frame pointer to prepare for tail-call.  */
+       movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer.  */
+
        /* Make a tail call to __sigjmp_save; it takes the same args.  */
 #ifdef PIC
        /* We cannot use the PLT, because it requires that %ebx be set, but

diff --git a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S
index 25b7ac8..673b7ab 100644 (file)
--- a/sysdeps/i386/setjmp.S
+++ b/sysdeps/i386/setjmp.S
@@ -44,13 +44,13 @@ ENTRY (BP_SYM (__sigsetjmp))
        movl %ebx, (JB_BX*4)(%eax)
        movl %esi, (JB_SI*4)(%eax)
        movl %edi, (JB_DI*4)(%eax)
-       movl %ebp, (JB_BP*4)(%eax)
        leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return.  */
        movl %ecx, (JB_SP*4)(%eax)
        movl PCOFF(%esp), %ecx  /* Save PC we are returning to now.  */
        movl %ecx, (JB_PC*4)(%eax)
-
        LEAVE /* pop frame pointer to prepare for tail-call.  */
+       movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer.  */
+
        /* Make a tail call to __sigjmp_save; it takes the same args.  */
 #ifdef PIC
        /* We cannot use the PLT, because it requires that %ebx be set, but