r5496 - in glibc-package/branches/eglibc-2.17/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2013-02-24 16:44:46 +0000 (Sun, 24 Feb 2013)
New Revision: 5496
Added:
glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/unsubmitted-subhurd.diff
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/patches/series
Log:
patches/hurd-i386/unsubmitted-subhurd.diff: New patch, fixes sub-hurd boot.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-02-24 16:36:50 UTC (rev 5495)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-02-24 16:44:46 UTC (rev 5496)
@@ -9,6 +9,8 @@
patches/hurd-i386/tg-setitimer.diff.
* patches/hurd-i386/tg-ifaddrs_v6.diff: New patch, fixes IPv6 addresses in
getifaddrs.
+ * patches/hurd-i386/unsubmitted-subhurd.diff: New patch, fixes sub-hurd
+ boot.
[ Adam Conrad ]
* debian/debhelper.in/libc.postint: Switch from 'awk gsub' to 'tr -d'
Added: glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/unsubmitted-subhurd.diff
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/unsubmitted-subhurd.diff (rev 0)
+++ glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/unsubmitted-subhurd.diff 2013-02-24 16:44:46 UTC (rev 5496)
@@ -0,0 +1,29 @@
+The fmh function could in some cases mistakenly call vm_map with a null
+size. A recent kernel fix made that invalid and return KERN_INVALID_ARGUMENT,
+which isn't an expected code here, resulting in the linker not starting.
+Avoid calling vm_map when the computed mapping size is null to fix the
+problem.
+
+* sysdeps/mach/hurd/dl-sysdep.c (fmh): Leave loop when the computed mapping
+size fmhs becomes null.
+---
+ sysdeps/mach/hurd/dl-sysdep.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
+index 67391d4..83f5bac 100644
+--- a/sysdeps/mach/hurd/dl-sysdep.c
++++ b/sysdeps/mach/hurd/dl-sysdep.c
+@@ -111,6 +111,8 @@ static void fmh(void) {
+ else
+ while (1) {
+ fmhs=max-fmha;
++ if (fmhs == 0)
++ break;
+ err = __vm_map (__mach_task_self (),
+ &fmha, fmhs, 0, 0, MACH_PORT_NULL, 0, 1,
+ VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
+--
+1.7.10.4
+
+
Modified: glibc-package/branches/eglibc-2.17/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/series 2013-02-24 16:36:50 UTC (rev 5495)
+++ glibc-package/branches/eglibc-2.17/debian/patches/series 2013-02-24 16:44:46 UTC (rev 5496)
@@ -114,6 +114,7 @@
hurd-i386/cvs-libpthread_lock.diff
hurd-i386/tg-pie-sbrk.diff
hurd-i386/tg-ifaddrs_v6.diff
+hurd-i386/unsubmitted-subhurd.diff
i386/local-biarch.diff
i386/local-cmov.diff
Reply to: