r3837 - in glibc-package/branches/eglibc-2.10/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2009-09-13 23:06:28 +0000 (Sun, 13 Sep 2009)
New Revision: 3837
Added:
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-sbrk.diff
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/series
Log:
debian/patches/hurd-i386/submitted-sbrk.diff: New patch to fix sbrk beyond 128MB.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-09-13 23:05:37 UTC (rev 3836)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-09-13 23:06:28 UTC (rev 3837)
@@ -120,8 +120,10 @@
* Fix debian/patches/hurd-i386/local-tls-support.diff to align up includes
on Linux, to fix build.
* Apply kfreebsd/local-no-SOCK_NONBLOCK.diff on hurd-i386 to fix build too.
- * 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.
[ Carlos O'Donell ]
* Add hppa/cvs-nptl-compat.diff to keep ABI compatibility between
Added: glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-sbrk.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-sbrk.diff (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-sbrk.diff 2009-09-13 23:06:28 UTC (rev 3837)
@@ -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/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-09-13 23:05:37 UTC (rev 3836)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-09-13 23:06:28 UTC (rev 3837)
@@ -100,6 +100,7 @@
hurd-i386/local-_dl_random.diff
hurd-i386/local-unwind-resume.diff
hurd-i386/submitted-null-pathname.diff
+hurd-i386/submitted-sbrk.diff
ia64/submitted-sysconf.diff
ia64/submitted-libm.diff
Reply to: