aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorgerald <gerald@FreeBSD.org>2010-09-18 12:33:45 +0800
committergerald <gerald@FreeBSD.org>2010-09-18 12:33:45 +0800
commit01c0a952d3806b04bdd3dfadcccf90eb97d90ebf (patch)
treede4b9559117d431937fb2305cfbb780d1d952aa4 /emulators
parentab263d602135454adf20f12571c6f6c6a7ab6b20 (diff)
downloadfreebsd-ports-gnome-01c0a952d3806b04bdd3dfadcccf90eb97d90ebf.tar.gz
freebsd-ports-gnome-01c0a952d3806b04bdd3dfadcccf90eb97d90ebf.tar.zst
freebsd-ports-gnome-01c0a952d3806b04bdd3dfadcccf90eb97d90ebf.zip
Replace the partial memory reservation patch by a simpler variation.
Submitted by: tijl Tested by: Alex Kozlov <spam@rm-rf.kiev.ua>
Diffstat (limited to 'emulators')
-rw-r--r--emulators/wine-devel/files/patch-partial-reservation21
-rw-r--r--emulators/wine/files/patch-partial-reservation21
2 files changed, 6 insertions, 36 deletions
diff --git a/emulators/wine-devel/files/patch-partial-reservation b/emulators/wine-devel/files/patch-partial-reservation
index af9400870483..6eca6ad32afd 100644
--- a/emulators/wine-devel/files/patch-partial-reservation
+++ b/emulators/wine-devel/files/patch-partial-reservation
@@ -1,26 +1,11 @@
-diff --git libs/wine/mmap.c libs/wine/mmap.c
-index d107fc7..a694e4f 100644
--- libs/wine/mmap.c
+++ libs/wine/mmap.c
-@@ -344,9 +344,13 @@ void mmap_init(void)
- struct reserved_area *area;
- struct list *ptr;
- #ifdef __i386__
-+ char *user_space_limit = (char *)0x7ffe0000;
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+ reserve_malloc_space( 8 * 1024 * 1024 );
-+ reserve_area( user_space_limit, (char *)0x82000000 );
-+#else
- char stack;
- char * const stack_ptr = &stack;
-- char *user_space_limit = (char *)0x7ffe0000;
-
- reserve_malloc_space( 8 * 1024 * 1024 );
-
-@@ -377,6 +381,7 @@ void mmap_init(void)
+@@ -383,6 +383,9 @@ void mmap_init(void)
reserve_area( base, end );
}
else reserve_area( user_space_limit, 0 );
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++ wine_mmap_remove_reserved_area( (char *)0x82000000, 0xffffffff - 0x82000000, 1 );
+#endif
#endif /* __i386__ */
diff --git a/emulators/wine/files/patch-partial-reservation b/emulators/wine/files/patch-partial-reservation
index af9400870483..6eca6ad32afd 100644
--- a/emulators/wine/files/patch-partial-reservation
+++ b/emulators/wine/files/patch-partial-reservation
@@ -1,26 +1,11 @@
-diff --git libs/wine/mmap.c libs/wine/mmap.c
-index d107fc7..a694e4f 100644
--- libs/wine/mmap.c
+++ libs/wine/mmap.c
-@@ -344,9 +344,13 @@ void mmap_init(void)
- struct reserved_area *area;
- struct list *ptr;
- #ifdef __i386__
-+ char *user_space_limit = (char *)0x7ffe0000;
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+ reserve_malloc_space( 8 * 1024 * 1024 );
-+ reserve_area( user_space_limit, (char *)0x82000000 );
-+#else
- char stack;
- char * const stack_ptr = &stack;
-- char *user_space_limit = (char *)0x7ffe0000;
-
- reserve_malloc_space( 8 * 1024 * 1024 );
-
-@@ -377,6 +381,7 @@ void mmap_init(void)
+@@ -383,6 +383,9 @@ void mmap_init(void)
reserve_area( base, end );
}
else reserve_area( user_space_limit, 0 );
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++ wine_mmap_remove_reserved_area( (char *)0x82000000, 0xffffffff - 0x82000000, 1 );
+#endif
#endif /* __i386__ */