Author: aurel32
Date: 2014-02-19 13:48:33 +0000 (Wed, 19 Feb 2014)
New Revision: 5939
Added:
glibc-package/branches/eglibc-2.18/debian/patches/alpha/cvs-tls-macros.diff
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/series
Log:
patches/alpha/cvs-tls-macros.diff: New patch from upstream to fix
FTBFS on alpha. Closes: #735774.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2014-02-19 13:48:08 UTC
(rev 5938)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2014-02-19 13:48:33 UTC
(rev 5939)
@@ -12,6 +12,8 @@
[ Aurelien Jarno ]
* debian/testsuite-checking/expected-results-mips*: Update following
the prlimit64 fix deployment on the build daemons.
+ * patches/alpha/cvs-tls-macros.diff: New patch from upstream to fix
+ FTBFS on alpha. Closes: #735774.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-libpthread.diff: New snapshot, brings thread
Added:
glibc-package/branches/eglibc-2.18/debian/patches/alpha/cvs-tls-macros.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/alpha/cvs-tls-macros.diff
(rev 0)
+++ glibc-package/branches/eglibc-2.18/debian/patches/alpha/cvs-tls-macros.diff
2014-02-19 13:48:33 UTC (rev 5939)
@@ -0,0 +1,42 @@
+2014-01-24 Richard Henderson <[email protected]>
+
+ * sysdeps/alpha/tls-macros.h (TLS_GD): Add dependency on $gp.
+ (TLS_LD, TLS_IE): Likewise.
+
+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) \
Modified: glibc-package/branches/eglibc-2.18/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series 2014-02-19
13:48:08 UTC (rev 5938)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series 2014-02-19
13:48:33 UTC (rev 5939)
@@ -43,6 +43,7 @@
alpha/local-lowlevellock.diff
alpha/submitted-PTR_MANGLE.diff
alpha/local-string-functions.diff
+alpha/cvs-tls-macros.diff
amd64/submitted-rwlock-stack-imbalance.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
