]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
alpha: Fix tls-macros.h gentoo/2.18
authorRichard Henderson <rth@twiddle.net>
Fri, 24 Jan 2014 17:07:04 +0000 (09:07 -0800)
committerMike Frysinger <vapier@gentoo.org>
Sat, 25 Jan 2014 21:36:03 +0000 (16:36 -0500)
Reported to the gcc bugzilla, there was a missing dependency on $gp
that let the compiler generated $gp reload be scheduled across the
macros here.

(cherry picked from commit 4ab6acaebd0047dc37c6493946484be9f1b4920b)

ports/sysdeps/alpha/tls-macros.h

index 0385d93e2a3918c5ad922a613ae29031e1016427..00489c289fa9ca1e23b882f1ea3855e397422d3f 100644 (file)
@@ -2,21 +2,21 @@
 
 extern void *__tls_get_addr (void *);
 
-# define TLS_GD(x)                                             \
-  ({ void *__result;                                           \
-     asm ("lda %0, " #x "($gp) !tlsgd" : "=r" (__result));     \
+# define TLS_GD(x)                                                     \
+  ({ register void *__gp asm ("$29"); void *__result;                  \
+     asm ("lda %0, " #x "($gp) !tlsgd" : "=r" (__result) : "r"(__gp)); \
      __tls_get_addr (__result); })
 
-# define TLS_LD(x)                                             \
-  ({ void *__result;                                           \
-     asm ("lda %0, " #x "($gp) !tlsldm" : "=r" (__result));    \
-     __result = __tls_get_addr (__result);                     \
-     asm ("lda %0, " #x "(%0) !dtprel" : "+r" (__result));     \
+# define TLS_LD(x)                                                     \
+  ({ register void *__gp asm ("$29"); void *__result;                  \
+     asm ("lda %0, " #x "($gp) !tlsldm" : "=r" (__result) : "r"(__gp));        \
+     __result = __tls_get_addr (__result);                             \
+     asm ("lda %0, " #x "(%0) !dtprel" : "+r" (__result));             \
      __result; })
 
-# define TLS_IE(x)                                             \
-  ({ long ofs;                                                 \
-     asm ("ldq %0, " #x "($gp) !gottprel" : "=r"(ofs));                \
+# define TLS_IE(x)                                                     \
+  ({ register void *__gp asm ("$29"); long ofs;                                \
+     asm ("ldq %0, " #x "($gp) !gottprel" : "=r"(ofs) : "r"(__gp));    \
      __builtin_thread_pointer () + ofs; })
 
 # define TLS_LE(x)                                             \