diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-28 19:35:33 +0000 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-28 18:31:15 -0700 |
| commit | b30aff405a220495941f1673b0a5e66c4fa8b84c (patch) | |
| tree | 3bf667c009cf468c040ccaae6e81d468b4fd0254 /libc/arch-x86/x86.mk | |
| parent | 52f74322b1d72d57146107f32ee2c76c421bf4b1 (diff) | |
| download | bionic-b30aff405a220495941f1673b0a5e66c4fa8b84c.zip bionic-b30aff405a220495941f1673b0a5e66c4fa8b84c.tar.gz bionic-b30aff405a220495941f1673b0a5e66c4fa8b84c.tar.bz2 | |
Revert "Revert "Lose the hand-written futex assembler.""
The problem with the original patch was that using syscall(3) means that
errno can be set, but pthread_create(3) was abusing the TLS errno slot as
a pthread_mutex_t for the thread startup handshake.
There was also a mistake in the check for syscall failures --- it should
have checked against -1 instead of 0 (not just because that's the default
idiom, but also here because futex(2) can legitimately return values > 0).
This patch stops abusing the TLS errno slot and adds a pthread_mutex_t to
pthread_internal_t instead. (Note that for LP64 sizeof(pthread_mutex_t) >
sizeof(uintptr_t), so we could potentially clobber other TLS slots too.)
I've also rewritten the LP32 compatibility stubs to directly reuse the
code from the .h file.
This reverts commit 75c55ff84ebfa686c7ae2cc8ee431c6a33bd46b4.
Bug: 15195455
Change-Id: I6ffb13e5cf6a35d8f59f692d94192aae9ab4593d
Diffstat (limited to 'libc/arch-x86/x86.mk')
| -rw-r--r-- | libc/arch-x86/x86.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libc/arch-x86/x86.mk b/libc/arch-x86/x86.mk index 34da0ce..aa183cb 100644 --- a/libc/arch-x86/x86.mk +++ b/libc/arch-x86/x86.mk @@ -23,7 +23,6 @@ libc_bionic_src_files_x86 := \ libc_bionic_src_files_x86 += \ arch-x86/bionic/__bionic_clone.S \ arch-x86/bionic/_exit_with_stack_teardown.S \ - arch-x86/bionic/futex_x86.S \ arch-x86/bionic/__get_sp.S \ arch-x86/bionic/_setjmp.S \ arch-x86/bionic/setjmp.S \ |