[glibc] 02/02: hurd: fix weak references when linking in libpthread statically.
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit 19a58de176cba6f7bc4fa089557965064cd45fbd
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Oct 17 02:33:39 2016 +0200
hurd: fix weak references when linking in libpthread statically.
hurd-i386/cvs-libpthread-static-weak.diff: New patch
---
debian/changelog | 5 +++++
.../hurd-i386/cvs-libpthread-static-weak.diff | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 28 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 1996eef..a6a5d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
glibc (2.24-5) UNRELEASED; urgency=medium
+ [ Aurelien Jarno ]
*
+ [ Samuel Thibault ]
+ * hurd-i386/cvs-libpthread-static-weak.diff: New patch to fix weak
+ references when linking in libpthread statically.
+
-- Aurelien Jarno <aurel32@debian.org> Sun, 16 Oct 2016 13:08:40 +0200
glibc (2.24-4) unstable; urgency=medium
diff --git a/debian/patches/hurd-i386/cvs-libpthread-static-weak.diff b/debian/patches/hurd-i386/cvs-libpthread-static-weak.diff
new file mode 100644
index 0000000..dbd52e7
--- /dev/null
+++ b/debian/patches/hurd-i386/cvs-libpthread-static-weak.diff
@@ -0,0 +1,22 @@
+commit 2ca42af6c07afed6a5e94e8e3c889c728869fd2f
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Mon Oct 17 02:30:14 2016 +0200
+
+ Fix too weak references when linking libpthread statically
+
+ * sysdeps/pthread/libc-lockP.h [IS_IN (libpthread)]: Do not make __pthread
+ symbols weak.
+
+diff --git a/libpthread/sysdeps/pthread/libc-lockP.h b/libpthread/sysdeps/pthread/libc-lockP.h
+index 2631e0c..c04881d 100644
+--- a/libpthread/sysdeps/pthread/libc-lockP.h
++++ b/libpthread/sysdeps/pthread/libc-lockP.h
+@@ -106,7 +106,7 @@ extern int __pthread_atfork (void (*__prepare) (void),
+
+ /* Make the pthread functions weak so that we can elide them from
+ single-threaded processes. */
+-#ifndef __NO_WEAK_PTHREAD_ALIASES
++#if !defined(__NO_WEAK_PTHREAD_ALIASES) && !IS_IN (libpthread)
+ # ifdef weak_extern
+ weak_extern (__pthread_mutex_init)
+ weak_extern (__pthread_mutex_destroy)
diff --git a/debian/patches/series b/debian/patches/series
index 819834e..7486fb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -133,6 +133,7 @@ hurd-i386/cvs-adjtime-NULL.diff
hurd-i386/tg-pthread_deps.diff
hurd-i386/cvs-mallocfork.diff
hurd-i386/cvs-setcancelstate.diff
+hurd-i386/cvs-libpthread-static-weak.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: