From owner-svn-ports-all@FreeBSD.ORG Thu Jun 12 19:34:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B54B188; Thu, 12 Jun 2014 19:34:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E73220DB; Thu, 12 Jun 2014 19:34:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CJY6tL018809; Thu, 12 Jun 2014 19:34:06 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5CJY6un018807; Thu, 12 Jun 2014 19:34:06 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201406121934.s5CJY6un018807@svn.freebsd.org> From: Juergen Lock Date: Thu, 12 Jun 2014 19:34:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357631 - in head/emulators/qemu-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jun 2014 19:34:07 -0000 Author: nox Date: Thu Jun 12 19:34:06 2014 New Revision: 357631 URL: http://svnweb.freebsd.org/changeset/ports/357631 QAT: https://qat.redports.org/buildarchive/r357631/ Log: - Fix bsd-user x86_64 target failing with stk mmap: Invalid argument . - Bump PORTREVISION. Reported by: sbruno Added: head/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h (contents, props changed) Modified: head/emulators/qemu-devel/Makefile Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Thu Jun 12 19:24:22 2014 (r357630) +++ head/emulators/qemu-devel/Makefile Thu Jun 12 19:34:06 2014 (r357631) @@ -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- 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 Added: head/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h Thu Jun 12 19:34:06 2014 (r357631) @@ -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) +