r3894 - in glibc-package/trunk/debian: . patches/hurd-i386
Author: sthibault
Date: 2009-10-23 14:29:29 +0000 (Fri, 23 Oct 2009)
New Revision: 3894
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/local-bigmem.diff
Log:
patches/hurd-i386/local-bigmem.diff: Fix patch.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-10-23 10:06:59 UTC (rev 3893)
+++ glibc-package/trunk/debian/changelog 2009-10-23 14:29:29 UTC (rev 3894)
@@ -1,3 +1,10 @@
+eglibc (2.10.1-3) UNSTABLE; urgency=low
+
+ [ Samuel Thibault ]
+ * patches/hurd-i386/local-bigmem.diff: Fix patch.
+
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 23 Oct 2009 08:48:29 +0200
+
eglibc (2.10.1-2) unstable; urgency=low
[ Petr Salinger ]
@@ -4,7 +11,7 @@
* kfreebsd/local-sysdeps.diff: update to revision 2806 (from glibc-bsd).
* Drop kfreebsd/local-sysdeps-2.10.diff (merged in local-sysdeps.diff).
- [ Samuel Thibault]
+ [ Samuel Thibault ]
* patches/hurd-i386/local-bigmem.diff: New patch to fix dl.so crash when
running on GNU Mach with VM_MAX_ADDRESS < 0xc0000000.
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-bigmem.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-bigmem.diff 2009-10-23 10:06:59 UTC (rev 3893)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-bigmem.diff 2009-10-23 14:29:29 UTC (rev 3894)
@@ -1,6 +1,6 @@
--- a/sysdeps/mach/hurd/dl-sysdep.c 2008-07-07 20:11:39.000000000 +0200
+++ b/sysdeps/mach/hurd/dl-sysdep.c 2009-10-21 00:56:09.000000000 +0200
-@@ -102,12 +102,29 @@
+@@ -102,12 +102,29 @@ static void fmh(void) {
max=a; break;}
fmha=a+=fmhs;}
if (err) assert(err==KERN_NO_SPACE);
@@ -20,10 +20,8 @@
+ VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
+ if (!err)
+ break;
-+ if (err != KERN_INVALID_ADDRESS && err != KERN_NO_SPACE) {
-+ while(1);
++ if (err != KERN_INVALID_ADDRESS && err != KERN_NO_SPACE)
+ assert_perror(err);
-+ }
+ vm_address_t new_max = (max - 1) & 0xf0000000U;
+ if (new_max >= max) {
+ fmhs = 0;
@@ -32,7 +30,6 @@
+ }
+ max = new_max;
+ }
-+ }
}
/* XXX loser kludge for vm_map kernel bug */
#endif
Reply to: