diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ChangeLog.arm | 7 | ||||
| -rw-r--r-- | ports/sysdeps/arm/__longjmp.S | 6 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 0724dbd9a0..3f47d5e3d4 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,10 @@ +2013-10-04 Will Newton <will.newton@linaro.org> + + * sysdeps/arm/__longjmp.S (NO_THUMB): Remove define. + (__longjmp): Use Thumb supported instructions. + * sysdeps/unix/sysv/linux/arm/____longjmp_chk.S (NO_THUMB): + Remove define. + 2013-10-03 Will Newton <will.newton@linaro.org> * sysdeps/arm/__longjmp.S (__longjmp): Demangle fp, sp diff --git a/ports/sysdeps/arm/__longjmp.S b/ports/sysdeps/arm/__longjmp.S index 2b1f7f41c1..894c121c0f 100644 --- a/ports/sysdeps/arm/__longjmp.S +++ b/ports/sysdeps/arm/__longjmp.S @@ -16,8 +16,6 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -/* ??? Needs more rearrangement for the LDM to handle thumb mode. */ -#define NO_THUMB #include <sysdep.h> #include <bits/setjmp.h> #include <rtld-global-offsets.h> @@ -28,6 +26,7 @@ ENTRY (__longjmp) mov ip, r0 movs r0, r1 /* get the return value in place */ + it eq moveq r0, #1 /* can't let setjmp() return zero! */ #ifdef CHECK_SP @@ -44,7 +43,8 @@ ENTRY (__longjmp) #ifdef PTR_DEMANGLE PTR_DEMANGLE (fp, a4, a3, a2) ldr a4, [ip], #4 - PTR_DEMANGLE2 (sp, a4, a3) + PTR_DEMANGLE2 (a4, a4, a3) + mov sp, a4 ldr a4, [ip], #4 PTR_DEMANGLE2 (lr, a4, a3) #else diff --git a/ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S b/ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S index 6ee7a1aebd..6777ef646b 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S +++ b/ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S @@ -15,8 +15,6 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -/* ??? Needs more rearrangement for the LDM to handle thumb mode. */ -#define NO_THUMB #include <sysdep.h> .section .rodata.str1.1,"aMS",%progbits,1 |