about summary refs log tree commit diff
path: root/src/thread/i386
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-04-14 23:45:08 -0400
committerRich Felker <dalias@aerifal.cx>2015-04-14 23:45:08 -0400
commit81e18eb3cd61f7b68a8f99b3e6c728f2a4d79221 (patch)
tree2ea334c40a3b59607be4f3f9ae524cdcf5b69d21 /src/thread/i386
parent9c738dc183f44de40d263e4ff8dc540915a41aed (diff)
downloadmusl-81e18eb3cd61f7b68a8f99b3e6c728f2a4d79221.tar.gz
musl-81e18eb3cd61f7b68a8f99b3e6c728f2a4d79221.tar.xz
musl-81e18eb3cd61f7b68a8f99b3e6c728f2a4d79221.zip
use hidden __tls_get_new for tls/tlsdesc lookup fallback cases
previously, the dynamic tlsdesc lookup functions and the i386
special-ABI ___tls_get_addr (3 underscores) function called
__tls_get_addr when the slot they wanted was not already setup;
__tls_get_addr would then in turn also see that it's not setup and
call __tls_get_new.

calling __tls_get_new directly is both more efficient and avoids the
issue of calling a non-hidden (public API/ABI) function from asm.

for the special i386 function, a weak reference to __tls_get_new is
used since this function is not defined when static linking (the code
path that needs it is unreachable in static-linked programs).
Diffstat (limited to 'src/thread/i386')
-rw-r--r--src/thread/i386/tls.s4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/thread/i386/tls.s b/src/thread/i386/tls.s
index 6e01adf2..76d5d462 100644
--- a/src/thread/i386/tls.s
+++ b/src/thread/i386/tls.s
@@ -10,6 +10,8 @@ ___tls_get_addr:
 	add (%edx,%ecx,4),%eax
 	ret
 1:	push %eax
-	call __tls_get_addr
+.weak __tls_get_new
+.hidden __tls_get_new
+	call __tls_get_new
 	pop %edx
 	ret