diff options
| author | Richard Henderson <rth@twiddle.net> | 2014-01-24 09:07:04 -0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-25 16:36:03 -0500 |
| commit | 787172fdbbdf78fc30f222748f1197d396b05f96 (patch) | |
| tree | b60c370f45df96661a5a1b023399d8721acae563 | |
| parent | f09e8aec0cf7a8ddda8ae04859f3e256c1741775 (diff) | |
| download | glibc-gentoo/2.18.tar.gz glibc-gentoo/2.18.tar.xz glibc-gentoo/2.18.zip | |
alpha: Fix tls-macros.h gentoo/2.18
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)
| -rw-r--r-- | ports/sysdeps/alpha/tls-macros.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ports/sysdeps/alpha/tls-macros.h b/ports/sysdeps/alpha/tls-macros.h index 0385d93e2a..00489c289f 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) \ |