r3836 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2009-09-13 23:05:37 +0000 (Sun, 13 Sep 2009)
New Revision: 3836
Added:
glibc-package/trunk/debian/patches/hurd-i386/submitted-sbrk.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
debian/patches/hurd-i386/submitted-sbrk.diff: New patch to fix sbrk beyond 128MB.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-09-13 14:53:46 UTC (rev 3835)
+++ glibc-package/trunk/debian/changelog 2009-09-13 23:05:37 UTC (rev 3836)
@@ -22,8 +22,10 @@
[ Samuel Thibault ]
* debian/debhelper.in/libc.install: Install libc/*-gnu*/ instead of
libc/*-*-gnu*/, to fix FTBFS on hurd-i386 due to it now being i486-gnu/.
- * debian/ patches/hurd-i386/submitted-null-pathname.diff: New patch to fix
+ * debian/patches/hurd-i386/submitted-null-pathname.diff: New patch to fix
chdir("") and chroot("") into returning ENOENT.
+ * debian/patches/hurd-i386/submitted-sbrk.diff: New patch to fix sbrk beyond
+ 128MB.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2779 (from glibc-bsd).
Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-sbrk.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-sbrk.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-sbrk.diff 2009-09-13 23:05:37 UTC (rev 3836)
@@ -0,0 +1,25 @@
+2009-09-14 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/hurd/brk.c (_hurd_set_brk): Pass a copy of _hurd_data_end
+ instead of pagebrk to __vm_allocate.
+
+---
+ brk.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/sysdeps/mach/hurd/brk.c b/sysdeps/mach/hurd/brk.c
+index 931b260..087dbdd 100644
+--- a/sysdeps/mach/hurd/brk.c
++++ b/sysdeps/mach/hurd/brk.c
+@@ -101,8 +101,10 @@ _hurd_set_brk (vm_address_t addr)
+
+ if (pagend > _hurd_data_end)
+ {
++ vm_address_t alloc_start = _hurd_data_end;
+ /* We didn't allocate enough space! Hopefully we can get some more! */
+- err = __vm_allocate (__mach_task_self (), &pagebrk, pagend - pagebrk, 0);
++ err = __vm_allocate (__mach_task_self (), &alloc_start,
++ pagend - alloc_start, 0);
+ if (! err)
+ _hurd_data_end = pagend;
+ }
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-09-13 14:53:46 UTC (rev 3835)
+++ glibc-package/trunk/debian/patches/series 2009-09-13 23:05:37 UTC (rev 3836)
@@ -109,6 +109,7 @@
hurd-i386/cvs-strerror_l.diff
hurd-i386/cvs-rtld.diff
hurd-i386/submitted-null-pathname.diff
+hurd-i386/submitted-sbrk.diff
i386/local-biarch.diff
i386/local-clone.diff
Reply to: