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/x32/syscall_cp.s | |
| parent | cb1bf2f321b45a06447133b3db00621b7300c456 (diff) | |
| download | musl-36e8b6a28be5d4ffad966386b1e1c0d0dc6ca11a.tar.gz musl-36e8b6a28be5d4ffad966386b1e1c0d0dc6ca11a.tar.bz2 musl-36e8b6a28be5d4ffad966386b1e1c0d0dc6ca11a.tar.xz musl-36e8b6a28be5d4ffad966386b1e1c0d0dc6ca11a.zip | |
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/x32/syscall_cp.s')
| -rw-r--r-- | src/thread/x32/syscall_cp.s | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/thread/x32/syscall_cp.s b/src/thread/x32/syscall_cp.s index 79709a55..9805af0a 100644 --- a/src/thread/x32/syscall_cp.s +++ b/src/thread/x32/syscall_cp.s @@ -14,7 +14,7 @@ __syscall_cp_internal: __cp_begin: mov (%rdi),%eax test %eax,%eax - jnz __cancel + jnz __cp_cancel mov %rdi,%r11 mov %rsi,%rax mov %rdx,%rdi @@ -27,3 +27,5 @@ __cp_begin: syscall __cp_end: ret +__cp_cancel: + jmp __cancel |