[patch] Updated patch with @PLT and the ia64 part removed.

glibc-hidden-jumptarget-fortify_fail.patch (text/plain), 1.22 KB, created by Magnus Granberg on 2009-11-29 16:15:54 UTC

2009-11-29	Mike Frysinger <[e-mail]>, Magnus Granberg	<[e-mail]>

		#293637
		* sysdeps/unix/sysv/linux/i386/____longjmp_chk.S	ifdef PIC: use
		HIDDEN_JUMPTARGET (__fortify_fail) instead
		* sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S	ifdef PIC: use
		HIDDEN_JUMPTARGET (__fortify_fail) instead

--- a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+++ b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
@@ -33,10 +33,10 @@ longjmp_msg:
 			cfi_register(%ebx,%ecx);			      \
 			LOAD_PIC_REG (bx);				      \
 			leal	longjmp_msg@GOTOFF(%ebx), %eax;		      \
-			call	__GI___fortify_fail@PLT
+			call	HIDDEN_JUMPTARGET (__fortify_fail)
 #else
 # define CALL_FAIL	movl	$longjmp_msg, %eax;			      \
-			call	__fortify_fail
+			call	HIDDEN_JUMPTARGET (__fortify_fail)
 #endif
 
 
--- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
@@ -31,10 +31,10 @@ longjmp_msg:
 
 #ifdef PIC
 # define CALL_FAIL	leaq	longjmp_msg(%rip), %rdi;		      \
-			call	__GI___fortify_fail
+			call	HIDDEN_JUMPTARGET (__fortify_fail)
 #else
 # define CALL_FAIL	movq	$longjmp_msg, %rdi;			      \
-			call	__fortify_fail
+			call	HIDDEN_JUMPTARGET (__fortify_fail)
 #endif
 
 #define CHECK_RSP(reg) \