diff options
| author | Roland McGrath <mcgrathr@chromium.org> | 2011-09-15 12:26:08 -0700 |
|---|---|---|
| committer | Roland McGrath <mcgrathr@chromium.org> | 2011-09-15 12:26:08 -0700 |
| commit | b402e91af4a1771cdc11bb7d88bbc631aeeddb82 (patch) | |
| tree | 8169edde0d1096f9889aaff043051b87507526e0 | |
| parent | 4d8e1f11950c7ceb6b5037c66ee104d031487d72 (diff) | |
| download | glibc-b402e91af4a1771cdc11bb7d88bbc631aeeddb82.tar.gz glibc-b402e91af4a1771cdc11bb7d88bbc631aeeddb82.tar.xz glibc-b402e91af4a1771cdc11bb7d88bbc631aeeddb82.zip | |
Use HIDDEN_JUMPTARGET rather than spelling out its effects, for ____longjmp_chk implementations.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/____longjmp_chk.S | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S | 4 |
4 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index fa117e94d7..5ddbdabdaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-09-15 Roland McGrath <roland@hack.frob.com> + + * sysdeps/unix/sysv/linux/i386/____longjmp_chk.S + (CALL_FAIL): Use HIDDEN_JUMPTARGET for __fortify_fail. + * sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S + (CALL_FAIL): Likewise. + * sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S (CHECK_RSP): Likewise. + (CALL_FAIL): Macro removed. + Patch mostly by Mike Frysinger <vapier@gentoo.org>. + 2011-09-15 Ulrich Drepper <drepper@gmail.com> * sysdeps/x86_64/fpu/bits/mathinline.h: Add fmax and fmin optimizations diff --git a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S index a07e6c8edf..cd3c66a42e 100644 --- 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 diff --git a/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S index e097c2288e..fa87f67ebc 100644 --- a/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S @@ -30,19 +30,13 @@ longjmp_msg: #define __longjmp ____longjmp_chk -#ifdef PIC -# define CALL_FAIL __GI___fortify_fail -#else -# define CALL_FAIL __fortify_fail -#endif - #define CHECK_RSP(reg) \ cmp.ltu p0, p8 = reg, r12; \ (p8) br.cond.dpnt .Lok;; \ addl r28 = @ltoffx(longjmp_msg#), r1;; \ ld8.mov r28 = [r28], longjmp_msg#;; \ ld8 out0 = [r28]; \ - br.call.sptk.many b0 = CALL_FAIL#;; \ + br.call.sptk.many b0 = HIDDEN_JUMPTARGET(__fortify_fail)#;; \ .Lok: #include "__longjmp.S" diff --git a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S index 3881082cff..d8cbe06841 100644 --- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -34,7 +34,7 @@ longjmp_msg: cfi_remember_state; \ cfi_def_cfa_offset(16); \ leaq longjmp_msg(%rip), %rdi; \ - call __GI___fortify_fail; \ + call HIDDEN_JUMPTARGET(__fortify_fail); \ nop; \ cfi_restore_state #else @@ -42,7 +42,7 @@ longjmp_msg: cfi_remember_state; \ cfi_def_cfa_offset(16); \ movq $longjmp_msg, %rdi; \ - call __fortify_fail; \ + call HIDDEN_JUMPTARGET(__fortify_fail); \ nop; \ cfi_restore_state #endif |