diff options
| author | Rich Felker <dalias@aerifal.cx> | 2019-09-11 13:21:28 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2019-09-11 13:21:28 -0400 |
| commit | b0301f47f3cf510b0237a024a3a073d55799101f (patch) | |
| tree | 7d779613e9ca83094b9acc09cbbaa2e40c25175a | |
| parent | 05870abeaac0588fb9115cfd11f96880a0af2108 (diff) | |
| download | musl-b0301f47f3cf510b0237a024a3a073d55799101f.tar.gz musl-b0301f47f3cf510b0237a024a3a073d55799101f.tar.bz2 musl-b0301f47f3cf510b0237a024a3a073d55799101f.tar.xz musl-b0301f47f3cf510b0237a024a3a073d55799101f.zip | |
fix arm __a_barrier_oldkuser when built as thumb
as noted in commit 05870abeaac0588fb9115cfd11f96880a0af2108, mov lr,pc
is not a valid method for saving the return address in code that might
be built as thumb.
this one is unlikely to matter, since any ISA level that has thumb2
should also have native implementations of atomics that don't involve
kuser_helper, and the affected code is only used on very old kernels
to begin with.
| -rw-r--r-- | src/thread/arm/atomics.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/thread/arm/atomics.s b/src/thread/arm/atomics.s index 101ad391..da50508d 100644 --- a/src/thread/arm/atomics.s +++ b/src/thread/arm/atomics.s @@ -15,10 +15,10 @@ __a_barrier_oldkuser: mov r1,r0 mov r2,sp ldr ip,=0xffff0fc0 - mov lr,pc - mov pc,ip + bl 1f pop {r0,r1,r2,r3,ip,lr} bx lr +1: bx ip .global __a_barrier_v6 .hidden __a_barrier_v6 |