r2127 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: mbanck
Date: 2007-04-25 00:43:50 +0000 (Wed, 25 Apr 2007)
New Revision: 2127
Added:
glibc-package/trunk/debian/patches/hurd-i386/local-dl-dynamic-weak.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/hurd-i386/local-dl-dynamic-weak.diff: new patch (turn
_dl_dynamic_weak on by default for hurd-i386).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-24 22:31:56 UTC (rev 2126)
+++ glibc-package/trunk/debian/changelog 2007-04-25 00:43:50 UTC (rev 2127)
@@ -1,5 +1,6 @@
glibc (2.5-5) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* Rename patches/all/submitted-iconv-E13B.diff into
patches/all/cvs-iconv-E13B.diff as the patch has been accepted
upstream.
@@ -11,6 +12,10 @@
* script.in/nohwcap.sh: use sed instead of awk. Closes: #420799.
* Update Catalan debconf translation, by Jordà Polo. Closes: #420835.
+ [ Michael Banck ]
+ * patches/hurd-i386/local-dl-dynamic-weak.diff: new patch (turn
+ _dl_dynamic_weak on by default for hurd-i386).
+
-- Aurelien Jarno <aurel32@debian.org> Wed, 25 Apr 2007 00:31:16 +0200
glibc (2.5-4) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/hurd-i386/local-dl-dynamic-weak.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-dl-dynamic-weak.diff 2007-04-24 22:31:56 UTC (rev 2126)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-dl-dynamic-weak.diff 2007-04-25 00:43:50 UTC (rev 2127)
@@ -0,0 +1,30 @@
+--- glibc-2.5/elf/dl-support.c.orig 2007-04-25 01:50:53.000000000 +0200
++++ glibc-2.5/elf/dl-support.c 2007-04-25 02:23:31.000000000 +0200
+@@ -43,7 +43,13 @@
+ int _dl_debug_mask;
+ 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;
+--- glibc-2.5/elf/rtld.c.orig 2007-04-25 01:53:54.000000000 +0200
++++ glibc-2.5/elf/rtld.c 2007-04-25 02:24:47.000000000 +0200
+@@ -145,6 +145,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 2007-04-24 22:31:56 UTC (rev 2126)
+++ glibc-package/trunk/debian/patches/series 2007-04-25 00:43:50 UTC (rev 2127)
@@ -57,6 +57,7 @@
hurd-i386/cvs-futimes.diff -p1
hurd-i386/cvs-getsid.diff -p0
+hurd-i386/local-dl-dynamic-weak.diff -p1
hurd-i386/local-enable-ldconfig.diff -p0
hurd-i386/local-mlock.diff -p1
hurd-i386/local-msg-nosignal.diff -p0
Reply to: