Author: sthibault
Date: 2015-09-19 16:07:17 +0000 (Sat, 19 Sep 2015)
New Revision: 6594
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-tls-threadvar.diff
Log:
debian/patches/hurd-i386/tg-tls-threadvar.diff: Update.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-09-19 12:24:44 UTC
(rev 6593)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-09-19 16:07:17 UTC
(rev 6594)
@@ -59,6 +59,7 @@
build.
* debian/patches/hurd-i386/cvs-s_scalbn.diff: New patch, fixes s_scalbn.S
build.
+ * debian/patches/hurd-i386/tg-tls-threadvar.diff: Update.
-- Adam Conrad <adcon...@0c3.net> Tue, 15 Sep 2015 17:57:41 -0600
Modified:
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-tls-threadvar.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-tls-threadvar.diff
2015-09-19 12:24:44 UTC (rev 6593)
+++
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-tls-threadvar.diff
2015-09-19 16:07:17 UTC (rev 6594)
@@ -464,12 +464,18 @@
-#endif /* bits/libc-tsd.h */
--- a/sysdeps/mach/hurd/cthreads.c
+++ b/sysdeps/mach/hurd/cthreads.c
-@@ -19,6 +19,15 @@
+@@ -19,6 +19,21 @@
#include <errno.h>
#include <stdlib.h>
+char __libc_lock_self0[0];
++#if IS_IN (rtld)
++/* We don't support static tls relocation so early, but we do not have threads
++ there either anyway. */
++static char __libc_lock_self[0];
++#else
+static __thread char __libc_lock_self[0];
++#endif
+
+void *
+__libc_get_lock_self(void)
