diff options
| author | Rich Felker <dalias@aerifal.cx> | 2015-11-02 16:16:00 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-11-02 16:16:00 -0500 |
| commit | 36e8b6a28be5d4ffad966386b1e1c0d0dc6ca11a (patch) | |
| tree | f77a1af51bc1fba6dba820d46126be942fb526b7 /src/thread/microblaze | |
| parent | cb1bf2f321b45a06447133b3db00621b7300c456 (diff) | |
| download | musl-36e8b6a28be5d4ffad966386b1e1c0d0dc6ca11a.tar.gz | |
use explicit __cp_cancel label in cancellable syscall asm for all archs
previously, only archs that needed to do stack cleanup defined a
__cp_cancel label for acting on cancellation in their syscall asm, and
a default definition was provided by a weak alias to __cancel, the C
function. this resulted in wrong codegen for arm on gcc versions
affected by pr 68178 and possibly similar issues (like pr 66609) on
other archs, and also created an inconsistency where the __cp_begin
and __cp_end labels were treated as const data but __cp_cancel was
treated as a function. this in turn caused incorrect code generation
on archs where function pointers point to function descriptors rather
than code (for now, only sh/fdpic).
Diffstat (limited to 'src/thread/microblaze')
| -rw-r--r-- | src/thread/microblaze/syscall_cp.s | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/thread/microblaze/syscall_cp.s b/src/thread/microblaze/syscall_cp.s index 51599c91..b0df61c5 100644 --- a/src/thread/microblaze/syscall_cp.s +++ b/src/thread/microblaze/syscall_cp.s @@ -11,7 +11,7 @@ __syscall_cp_asm: __cp_begin: lwi r5, r5, 0 - bnei r5, __cancel + bnei r5, __cp_cancel addi r12, r6, 0 add r5, r7, r0 add r6, r8, r0 @@ -23,3 +23,5 @@ __cp_begin: __cp_end: rtsd r15, 8 nop +__cp_cancel: + bri __cancel |