about summary refs log tree commit diff
path: root/src/thread
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-06-25 22:22:00 +0000
committerRich Felker <dalias@aerifal.cx>2015-06-25 22:22:00 +0000
commit6ba5517a460c6c438f64d69464fdfc3269a4c91a (patch)
tree87dda4a304c22209e3e7eca908592e9ec1816ff8 /src/thread
parentce337daa00e42d4f2d9a4d9ae0ed51b20249d924 (diff)
downloadmusl-6ba5517a460c6c438f64d69464fdfc3269a4c91a.tar.gz
musl-6ba5517a460c6c438f64d69464fdfc3269a4c91a.tar.xz
musl-6ba5517a460c6c438f64d69464fdfc3269a4c91a.zip
fix local-dynamic model TLS on mips and powerpc
the TLS ABI spec for mips, powerpc, and some other (presently
unsupported) RISC archs has the return value of __tls_get_addr offset
by +0x8000 and the result of DTPOFF relocations offset by -0x8000. I
had previously assumed this part of the ABI was actually just an
implementation detail, since the adjustments cancel out. however, when
the local dynamic model is used for accessing TLS that's known to be
in the same DSO, either of the following may happen:

1. the -0x8000 offset may already be applied to the argument structure
passed to __tls_get_addr at ld time, without any opportunity for
runtime relocations.

2. __tls_get_addr may be used with a zero offset argument to obtain a
base address for the module's TLS, to which the caller then applies
immediate offsets for individual objects accessed using the local
dynamic model. since the immediate offsets have the -0x8000 adjustment
applied to them, the base address they use needs to include the
+0x8000 offset.

it would be possible, but more complex, to store the pointers in the
dtv[] array with the +0x8000 offset pre-applied, to avoid the runtime
cost of adding 0x8000 on each call to __tls_get_addr. this change
could be made later if measurements show that it would help.
Diffstat (limited to 'src/thread')
-rw-r--r--src/thread/__tls_get_addr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/thread/__tls_get_addr.c b/src/thread/__tls_get_addr.c
index 36333967..84a413d4 100644
--- a/src/thread/__tls_get_addr.c
+++ b/src/thread/__tls_get_addr.c
@@ -8,9 +8,9 @@ void *__tls_get_addr(size_t *v)
 	__attribute__((__visibility__("hidden")))
 	void *__tls_get_new(size_t *);
 	if (v[0]<=(size_t)self->dtv[0])
-		return (char *)self->dtv[v[0]]+v[1];
+		return (char *)self->dtv[v[0]]+v[1]+DTP_OFFSET;
 	return __tls_get_new(v);
 #else
-	return (char *)self->dtv[1]+v[1];
+	return (char *)self->dtv[1]+v[1]+DTP_OFFSET;
 #endif
 }