From 81e18eb3cd61f7b68a8f99b3e6c728f2a4d79221 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 14 Apr 2015 23:45:08 -0400 Subject: 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). --- src/ldso/aarch64/tlsdesc.s | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/ldso/aarch64') diff --git a/src/ldso/aarch64/tlsdesc.s b/src/ldso/aarch64/tlsdesc.s index 32064bd7..05ddbab4 100644 --- a/src/ldso/aarch64/tlsdesc.s +++ b/src/ldso/aarch64/tlsdesc.s @@ -8,6 +8,8 @@ __tlsdesc_static: ldr x0,[x0,#8] ret +.hidden __tls_get_new + // long __tlsdesc_dynamic(long *a) // { // struct {size_t modidx,off;} *p = (void*)a[1]; @@ -37,7 +39,7 @@ __tlsdesc_dynamic: ldp x1,x2,[sp],#32 ret - // save all registers __tls_get_addr may clobber + // save all registers __tls_get_new may clobber // ugly because addr offset must be in [-512,509] 1: stp x29,x30,[sp,#-160]! stp x5,x6,[sp,#16] @@ -63,7 +65,7 @@ __tlsdesc_dynamic: stp q26,q27,[sp,#384] stp q28,q29,[sp,#416] stp q30,q31,[sp,#448] - bl __tls_get_addr + bl __tls_get_new mrs x1,tpidr_el0 ldp q4,q5,[sp,#32] ldp q6,q7,[sp,#64] -- cgit v1.2.1