about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/__longjmp.S3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aea2a1cb8a..27e2ad4868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/x86_64/__longjmp.S: No need to make sure return value is
+	!= 0, the caller did that.
+
 2005-12-27  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/x86_64/__longjmp.S: Don't confuse unwinder by loading
diff --git a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S
index 31857e44ba..6e21092451 100644
--- a/sysdeps/x86_64/__longjmp.S
+++ b/sysdeps/x86_64/__longjmp.S
@@ -52,9 +52,6 @@ ENTRY(__longjmp)
 	movq (JB_R14*8)(%rdi),%r14
 	movq (JB_R15*8)(%rdi),%r15
 	/* Set return value for setjmp.  */
-	test %esi,%esi
-	mov $01,%eax
-	cmove %eax,%esi
 	mov %esi, %eax
 	movq %r8,%rsp
 	movq %r9,%rbp