From 5ead9ce5c788e7dbb0bd01888c4bcb37a8bc2ff1 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 30 Jul 2009 17:31:48 -0700
Subject: Fix x86-64 ____longjmp_chk to handle signal stacks.

The simple test previously used might trigger if the longjmp jumps
from the signal stack to the normal stack.  We now explicitly test
for this case.
---
 sysdeps/x86_64/__longjmp.S | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'sysdeps/x86_64/__longjmp.S')

diff --git a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S
index 24552ece37..b045c04184 100644
--- a/sysdeps/x86_64/__longjmp.S
+++ b/sysdeps/x86_64/__longjmp.S
@@ -33,9 +33,6 @@ ENTRY(__longjmp)
 	PTR_DEMANGLE (%r8)
 	PTR_DEMANGLE (%r9)
 	PTR_DEMANGLE (%rdx)
-#endif
-#ifdef CHECK_RSP
-	CHECK_RSP (%r8)
 #endif
 	/* We add unwind information for the target here.  */
 	cfi_def_cfa(%rdi, 0)
@@ -43,7 +40,6 @@ ENTRY(__longjmp)
 	cfi_register(%rbp,%r9)
 	cfi_register(%rip,%rdx)
 	cfi_offset(%rbx,JB_RBX*8)
-	cfi_offset(%rbp,JB_RBP*8)
 	cfi_offset(%r12,JB_R12*8)
 	cfi_offset(%r13,JB_R13*8)
 	cfi_offset(%r14,JB_R14*8)
@@ -58,4 +54,4 @@ ENTRY(__longjmp)
 	movq %r8,%rsp
 	movq %r9,%rbp
 	jmpq *%rdx
-END (BP_SYM (__longjmp))
+END (__longjmp)
-- 
cgit v1.2.3