r6336 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2014-11-23 19:56:04 +0000 (Sun, 23 Nov 2014)
New Revision: 6336
Added:
glibc-package/trunk/debian/patches/hurd-i386/cvs-static-dlopen.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/hurd-i386/cvs-static-dlopen.diff: New patch to fix dlopen from static binaries, busybox notably.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-11-23 02:24:26 UTC (rev 6335)
+++ glibc-package/trunk/debian/changelog 2014-11-23 19:56:04 UTC (rev 6336)
@@ -5,6 +5,8 @@
inclusion order.
* patches/hurd-i386/tg-WRLCK-upgrade.diff: New patch to fix atomicity of
changing between rd locks and wr locks.
+ * patches/hurd-i386/cvs-static-dlopen.diff: New patch to fix dlopen from
+ static binaries, busybox notably.
[ Adam Conrad ]
* debian/rules.d/tarball.mk: Fix update-from-upstream manual/* filter rule.
Added: glibc-package/trunk/debian/patches/hurd-i386/cvs-static-dlopen.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-static-dlopen.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-static-dlopen.diff 2014-11-23 19:56:04 UTC (rev 6336)
@@ -0,0 +1,33 @@
+commit e0cfa51064489fdff85953bad1e0f3c42e093662
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Nov 23 20:50:24 2014 +0100
+
+ hurd: Fix dlopening libraries from static programs
+
+ dlopening libraries from a static program would dlopen libc.so,
+ which thus needs its own initialization, done in posixland_init,
+ which was missing initializing RPCs so far.
+
+ ChangeLog:
+
+ 2014-11-23 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/hurd/i386/init-first.c (posixland_init): Call
+ __mach_init in dlopened libc.
+
+diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
+index fc355ed..3bcffd9 100644
+--- a/sysdeps/mach/hurd/i386/init-first.c
++++ b/sysdeps/mach/hurd/i386/init-first.c
+@@ -72,6 +72,11 @@ posixland_init (int argc, char **argv, char **envp)
+ /* Set the FPU control word to the proper default value. */
+ __setfpucw (__fpu_control);
+ }
++ else
++ {
++ /* Initialize data structures so the additional libc can do RPCs. */
++ __mach_init ();
++ }
+
+ /* Save the command-line arguments. */
+ __libc_argc = argc;
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2014-11-23 02:24:26 UTC (rev 6335)
+++ glibc-package/trunk/debian/patches/series 2014-11-23 19:56:04 UTC (rev 6336)
@@ -155,6 +155,7 @@
hurd-i386/cvs-fork_ss_hang.diff
hurd-i386/local-libpthread-stacksize.diff
hurd-i386/tg-WRLCK-upgrade.diff
+hurd-i386/cvs-static-dlopen.diff
i386/local-biarch.diff
i386/local-cmov.diff
Reply to: