* sysdeps/x86_64/__longjmp.S: Also protect SP and BP.

	* sysdeps/x86_64/setjmp.S: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5c03197..f45be3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-22  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/x86_64/__longjmp.S: Also protect SP and BP.
+       * sysdeps/x86_64/setjmp.S: Likewise.
+
 2005-12-21  Roland McGrath  <roland@redhat.com>
 
        * sysdeps/unix/sysv/linux/i386/ucontext_i.h: File removed.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 3d2d4ad..761308d 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-22  Ulrich Drepper  <drepper@redhat.com>
+
+       [BZ #1913]
+       * sysdeps/unix/sysv/linux/i386/i486/sem_wait.S (__new_sem_wait):
+       Fix unwind info.  Remove useless branch prediction prefix.
+
 2005-12-21  Roland McGrath  <roland@redhat.com>
 
        * libc-cancellation.c: Use <> rather than "" #includes.

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
index 1605b69..3e908ae 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
@@ -57,7 +57,7 @@ __new_sem_wait:
        cfi_offset(6, -12)              /* %esi */
 3:     movl    (%ebx), %eax
 2:     testl   %eax, %eax
-       je,pn   1f
+       je      1f
 
        leal    -1(%eax), %edx
        LOCK
@@ -73,7 +73,7 @@ __new_sem_wait:
        cfi_adjust_cfa_offset(-12)
        ret
 
-       cfi_adjust_cfa_offset(8)
+       cfi_adjust_cfa_offset(12)
        cfi_offset(3, -8)               /* %ebx */
        cfi_offset(6, -12)              /* %esi */
 1:     call    __pthread_enable_asynccancel