Author: sthibault
Date: 2013-10-15 21:00:02 +0000 (Tue, 15 Oct 2013)
New Revision: 5735
Removed:
glibc-package/trunk/debian/patches/hurd-i386/local-dl-dynamic-weak.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/patches/series
Log:
* patches/hurd-i386/local-dl-dynamic-weak.diff: Remove patch, issue fixed in
libpthread.
* control: Make libc0.3 break old binaries which were depending on the
previous patch.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-10-13 21:14:21 UTC (rev
5734)
+++ glibc-package/trunk/debian/changelog 2013-10-15 21:00:02 UTC (rev
5735)
@@ -8,6 +8,10 @@
* patches/hurd-i386/libpthread_stubs.diff: Drop stub for pthread_atfork, now
implemented.
* patches/hurd-i386/tg-tls.diff: Fix getting LDT on fork.
+ * patches/hurd-i386/local-dl-dynamic-weak.diff: Remove patch, issue fixed in
+ libpthread.
+ * control: Make libc0.3 break old binaries which were depending on the
+ previous patch.
-- Adam Conrad <adcon...@0c3.net> Sun, 22 Sep 2013 23:39:33 -0600
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2013-10-13 21:14:21 UTC (rev 5734)
+++ glibc-package/trunk/debian/control 2013-10-15 21:00:02 UTC (rev 5735)
@@ -327,7 +327,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
-Breaks: nscd (<< 2.17), locales (<< 2.17), locales-all (<< 2.17), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64]
+Breaks: nscd (<< 2.17), locales (<< 2.17), locales-all (<< 2.17), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 [hurd-i386]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc6-x32 [x32],
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2013-10-13 21:14:21 UTC (rev
5734)
+++ glibc-package/trunk/debian/control.in/libc 2013-10-15 21:00:02 UTC (rev
5735)
@@ -8,7 +8,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
-Breaks: nscd (<< 2.17), locales (<< 2.17), locales-all (<< 2.17), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64]
+Breaks: nscd (<< 2.17), locales (<< 2.17), locales-all (<< 2.17), lsb-core (<=
3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386],
libpthread-stubs0 [hurd-i386]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc6-x32 [x32],
Deleted: glibc-package/trunk/debian/patches/hurd-i386/local-dl-dynamic-weak.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-dl-dynamic-weak.diff
2013-10-13 21:14:21 UTC (rev 5734)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-dl-dynamic-weak.diff
2013-10-15 21:00:02 UTC (rev 5735)
@@ -1,38 +0,0 @@
-For now, libpthread is not compiled at the same time as glibc, so that
pthread_*
-stubs call forwarding can not work.
-
----
- elf/dl-support.c | 6 ++++++
- elf/rtld.c | 5 +++++
- 2 files changed, 11 insertions(+)
-
---- a/elf/dl-support.c
-+++ b/elf/dl-support.c
-@@ -47,7 +47,13 @@
- #endif
- int _dl_lazy;
- ElfW(Addr) _dl_use_load_bias = -2;
-+#ifdef __GNU__
-+/* GNU/Hurd needs this because otherwise libpthread's pthread_mutex_lock gets
-+ * overridden by libX11's stubs. */
-+int _dl_dynamic_weak = 1;
-+#else
- int _dl_dynamic_weak;
-+#endif
-
- /* If nonzero print warnings about problematic situations. */
- int _dl_verbose;
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -154,6 +154,11 @@
- #ifdef NEED_DL_SYSINFO
- ._dl_sysinfo = DL_SYSINFO_DEFAULT,
- #endif
-+#ifdef __GNU__
-+/* GNU/Hurd needs this because otherwise libpthread's pthread_mutex_lock gets
-+ * * overridden by libX11's stubs. */
-+ ._dl_dynamic_weak = 1,
-+#endif
- ._dl_debug_fd = STDERR_FILENO,
- ._dl_use_load_bias = -2,
- ._dl_correct_cache_id = _DL_CACHE_DEFAULT_ID,
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2013-10-13 21:14:21 UTC (rev
5734)
+++ glibc-package/trunk/debian/patches/series 2013-10-15 21:00:02 UTC (rev
5735)
@@ -64,7 +64,6 @@
hppa/local-lowlevellock.diff
hppa/local-EAGAIN.diff
-hurd-i386/local-dl-dynamic-weak.diff
hurd-i386/local-enable-ldconfig.diff
hurd-i386/tg-tls-threadvar.diff
hurd-i386/tg-tls.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vwbil-0005jg...@vasks.debian.org
