r5294 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2012-06-24 12:41:45 +0000 (Sun, 24 Jun 2012)
New Revision: 5294
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-mremap.diff
glibc-package/trunk/debian/patches/series.hurd-i386
Log:
Fix and re-enable hurd-only mremap patch
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-06-24 10:51:21 UTC (rev 5293)
+++ glibc-package/trunk/debian/changelog 2012-06-24 12:41:45 UTC (rev 5294)
@@ -14,6 +14,8 @@
usage.
* patches/hurd-i386/submitted-AF_LINK.diff: New hurd-only patch to comment
AF_LINK values, unimplemented on the Hurd (Closes: #678358).
+ * patches/hurd-i386/unsubmitted-mremap.diff: New hurd-only patch to comment
+ MREMAP flags, unimplemented on the Hurd.
-- Aurelien Jarno <aurel32@debian.org> Sun, 03 Jun 2012 22:51:53 +0200
Modified: glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-mremap.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-mremap.diff 2012-06-24 10:51:21 UTC (rev 5293)
+++ glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-mremap.diff 2012-06-24 12:41:45 UTC (rev 5294)
@@ -1,5 +1,7 @@
---- a/bits/mman.h.orig 2012-06-22 21:16:15.919833847 +0200
-+++ b/bits/mman.h 2012-06-22 21:16:23.323681644 +0200
+Index: eglibc-2.13/bits/mman.h
+===================================================================
+--- eglibc-2.13.orig/bits/mman.h 2012-06-24 08:05:08.000000000 +0000
++++ eglibc-2.13/bits/mman.h 2012-06-24 08:07:25.000000000 +0000
@@ -86,10 +86,12 @@
#define MS_INVALIDATE 2 /* Invalidate the caches. */
@@ -13,3 +15,17 @@
/* Flags for `mlockall' (can be OR'd together). */
#define MCL_CURRENT 1 /* Lock all currently mapped pages. */
+Index: eglibc-2.13/malloc/memusage.c
+===================================================================
+--- eglibc-2.13.orig/malloc/memusage.c 2009-11-11 07:41:09.000000000 +0000
++++ eglibc-2.13/malloc/memusage.c 2012-06-24 08:12:22.000000000 +0000
+@@ -674,6 +674,9 @@
+ return result;
+ }
+
++#ifndef MREMAP_FIXED
++#define MREMAP_FIXED 0
++#endif
+
+ /* `mmap' replacement. We do not have to keep track of the sizesince
+ `munmap' will get it as a parameter. */
Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386 2012-06-24 10:51:21 UTC (rev 5293)
+++ glibc-package/trunk/debian/patches/series.hurd-i386 2012-06-24 12:41:45 UTC (rev 5294)
@@ -6,4 +6,4 @@
hurd-i386/unsubmitted-pthread.diff
hurd-i386/local-clock_gettime_MONOTONIC.diff
hurd-i386/submitted-AF_LINK.diff
-#hurd-i386/unsubmitted-mremap.diff
+hurd-i386/unsubmitted-mremap.diff
Reply to: