about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-22 18:21:44 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-22 18:21:44 +0000
commit077a0da7dc2ecb4343930189413d24c637f4c4fa (patch)
tree8cc92e266f4339dc7a901394765552fb5cb44237 /nptl
parentc67da0b50e3d20f89d7bb352cd67dcf66d808e50 (diff)
downloadglibc-077a0da7dc2ecb4343930189413d24c637f4c4fa.tar.gz
glibc-077a0da7dc2ecb4343930189413d24c637f4c4fa.tar.xz
glibc-077a0da7dc2ecb4343930189413d24c637f4c4fa.zip
* sysdeps/x86_64/__longjmp.S: Also protect SP and BP.
	* sysdeps/x86_64/setjmp.S: Likewise.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S4
2 files changed, 8 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 3d2d4adae7..761308de65 100644
--- 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 1605b69b69..3e908aef9c 100644
--- 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