From: Richard Henderson <rth@twiddle.net>
Date: Fri, 24 Jan 2014 17:07:04 +0000 (-0800)
Subject: alpha: Fix tls-macros.h
X-Git-Tag: glibc-2.19~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ab6acaebd0047dc37c6493946484be9f1b4920b;p=thirdparty%2Fglibc.git

alpha: Fix tls-macros.h

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.
---

diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 24540e4dbd1..a23ada5b9f1 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2014-01-24  Richard Henderson <rth@redhat.com>
+
+	* sysdeps/alpha/tls-macros.h (TLS_GD): Add dependency on $gp.
+	(TLS_LD, TLS_IE): Likewise.
+
 2013-12-07  Richard Henderson <rth@redhat.com>
 
 	* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Use <bits/mman-linux.h>,
diff --git a/ports/sysdeps/alpha/tls-macros.h b/ports/sysdeps/alpha/tls-macros.h
index 0385d93e2a3..00489c289fa 100644
--- a/ports/sysdeps/alpha/tls-macros.h
+++ b/ports/sysdeps/alpha/tls-macros.h
@@ -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)						\