From 3d81fef84c6141ec33dfd53e8e19e04fbd3cfd53 Mon Sep 17 00:00:00 2001 From: Juergen Lock Date: Thu, 12 Jun 2014 19:34:06 +0000 Subject: [PATCH] - Fix bsd-user x86_64 target failing with stk mmap: Invalid argument . - Bump PORTREVISION. Reported by: sbruno --- emulators/qemu-devel/Makefile | 3 ++- ...atch-bsd-user-x86_64-target_arch_vmparam.h | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index cb46aebbfb58..c4b01e8f07e0 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= qemu PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -67,6 +67,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysctl-hw-availpages EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysctl-0oldlen EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-mmap.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysctl-hw-pagesizes +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-x86_64-target_arch_vmparam.h .endif CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib diff --git a/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h b/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h new file mode 100644 index 000000000000..f6c18b3d28d7 --- /dev/null +++ b/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h @@ -0,0 +1,19 @@ +From nox Mon Sep 17 00:00:00 2001 +From: Juergen Lock +Date: 12 Jun 2014 19:55:52 +0200 +Subject: Fix bsd-user x86_64 target failing with stk mmap: Invalid argument + +Signed-off-by: Juergen Lock + +--- a/bsd-user/x86_64/target_arch_vmparam.h ++++ b/bsd-user/x86_64/target_arch_vmparam.h +@@ -11,7 +11,8 @@ + #define TARGET_MAXSSIZ (512UL*1024*1024) /* max stack size */ + #define TARGET_SGROWSIZ (128UL*1024) /* amount to grow stack */ + +-#define TARGET_VM_MAXUSER_ADDRESS (0x0000800000000000UL) ++/* #define TARGET_VM_MAXUSER_ADDRESS (0x0000800000000000UL) */ ++#define TARGET_VM_MAXUSER_ADDRESS (0x00007fffff000000UL) + + #define TARGET_USRSTACK (TARGET_VM_MAXUSER_ADDRESS - TARGET_PAGE_SIZE) +