diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/arm/__longjmp.S | 15 | ||||
| -rw-r--r-- | sysdeps/arm/setjmp.S | 12 |
3 files changed, 25 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 3312dcb5f8..3a589d8b4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-03-11 Roland McGrath <roland@hack.frob.com> + + * sysdeps/arm/setjmp.S: Use sfi_breg on stores of mangled registers. + * sysdeps/arm/__longjmp.S: Use sfi_breg on loads of mangled registers. + Move sfi_sp use from the load-multiple (that no longer sets sp) to + the new mov targetting sp. + 2014-03-11 Adhemerval Zanella <azanella@linux.vnet.ibm.com> [BZ #16683] diff --git a/sysdeps/arm/__longjmp.S b/sysdeps/arm/__longjmp.S index 08521e5374..27d1b713de 100644 --- a/sysdeps/arm/__longjmp.S +++ b/sysdeps/arm/__longjmp.S @@ -38,22 +38,27 @@ ENTRY (__longjmp) #endif #ifdef PTR_DEMANGLE - ldr a4, [ip], #4 + sfi_breg ip, \ + ldr a4, [\B], #4 PTR_DEMANGLE (a4, a4, a3, r4) cfi_undefined (r4) - ldr r4, [ip], #4 + sfi_breg ip, \ + ldr r4, [\B], #4 PTR_DEMANGLE2 (r4, r4, a3) #else - ldr a4, [ip], #4 - ldr r4, [ip], #4 + sfi_breg ip, \ + ldr a4, [\B], #4 + sfi_breg ip, \ + ldr r4, [\B], #4 cfi_undefined (r4) #endif /* longjmp probe expects longjmp first argument (4@r0), second argument (-4@r1), and target address (4@r4), respectively. */ LIBC_PROBE (longjmp, 3, 4@r0, -4@r1, 4@r4) + sfi_sp \ mov sp, a4 mov lr, r4 - sfi_sp sfi_breg ip, \ + sfi_breg ip, \ ldmia \B!, JMP_BUF_REGLIST cfi_restore (v1) cfi_restore (v2) diff --git a/sysdeps/arm/setjmp.S b/sysdeps/arm/setjmp.S index 5e55ca5061..17a16c9b5d 100644 --- a/sysdeps/arm/setjmp.S +++ b/sysdeps/arm/setjmp.S @@ -36,12 +36,16 @@ ENTRY (__sigsetjmp) #ifdef PTR_MANGLE mov a4, sp PTR_MANGLE2 (a4, a4, a3) - str a4, [ip], #4 + sfi_breg ip, \ + str a4, [\B], #4 PTR_MANGLE2 (a4, lr, a3) - str a4, [ip], #4 + sfi_breg ip, \ + str a4, [\B], #4 #else - str sp, [ip], #4 - str lr, [ip], #4 + sfi_breg ip, \ + str sp, [\B], #4 + sfi_breg ip, \ + str lr, [\B], #4 #endif /* Save registers */ sfi_breg ip, \ |