This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
[PATCH] alpha: Fix tls-macros.h
- From: Richard Henderson <rth at twiddle dot net>
- To: libc-ports at sourceware dot org
- Date: Fri, 24 Jan 2014 09:08:31 -0800
- Subject: [PATCH] alpha: Fix tls-macros.h
- Authentication-results: sourceware.org; auth=none
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.
---
ports/ChangeLog.alpha | 5 +++++
ports/sysdeps/alpha/tls-macros.h | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 24540e4..a23ada5 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 0385d93..00489c2 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) \
--
1.8.4.2