From owner-svn-ports-all@FreeBSD.ORG Sun Mar 23 20:29:26 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 2BFB3582; Sun, 23 Mar 2014 20:29:26 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F2F9F1B3; Sun, 23 Mar 2014 20:29:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NKTPFL081340; Sun, 23 Mar 2014 20:29:25 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2NKTP9K081338; Sun, 23 Mar 2014 20:29:25 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201403232029.s2NKTP9K081338@svn.freebsd.org> From: Juergen Lock Date: Sun, 23 Mar 2014 20:29:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348887 - 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.17 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: Sun, 23 Mar 2014 20:29:26 -0000 Author: nox Date: Sun Mar 23 20:29:25 2014 New Revision: 348887 URL: http://svnweb.freebsd.org/changeset/ports/348887 QAT: https://qat.redports.org/buildarchive/r348887/ Log: - Add patch to fix bigendian lseek for bsd-user mips. - Bump PORTREVISION. Submitted by: sbruno Obtained from: https://github.com/seanbruno/qemu/commit/05ee8495804599b52a88eb36b13ea9c06b3207cd Added: head/emulators/qemu-devel/files/extra-patch-05ee8495804599b52a88eb36b13ea9c06b3207cd (contents, props changed) Modified: head/emulators/qemu-devel/Makefile Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Sun Mar 23 19:58:33 2014 (r348886) +++ head/emulators/qemu-devel/Makefile Sun Mar 23 20:29:25 2014 (r348887) @@ -3,7 +3,7 @@ PORTNAME= qemu PORTVERSION= 1.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -67,6 +67,7 @@ PATCHFILES= \ 0018-bsd-user-add-arm-mips-and-mips64-options-to-configur.patch PATCH_DIST_STRIP= -p1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-freebsd-os-proc.c +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-05ee8495804599b52a88eb36b13ea9c06b3207cd .endif CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib Added: head/emulators/qemu-devel/files/extra-patch-05ee8495804599b52a88eb36b13ea9c06b3207cd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu-devel/files/extra-patch-05ee8495804599b52a88eb36b13ea9c06b3207cd Sun Mar 23 20:29:25 2014 (r348887) @@ -0,0 +1,21 @@ +diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h +index fc279a8..5d8a347 100644 +--- a/bsd-user/bsd-file.h ++++ b/bsd-user/bsd-file.h +@@ -996,9 +996,15 @@ static abi_long do_bsd_lseek(void *cpu_env, abi_long arg1, abi_long arg2, + } + if (res == -1) { + ret = get_errno(res); ++ set_second_rval(cpu_env, 0xFFFFFFFF); + } else { +- ret = res & 0xFFFFFFFF; ++#ifdef TARGET_WORDS_BIGENDIAN ++ ret = ((res >> 32) & 0xFFFFFFFF); ++ set_second_rval(cpu_env, res & 0xFFFFFFFF); ++#else ++ ret = res & 0xFFFFFFFF; + set_second_rval(cpu_env, (res >> 32) & 0xFFFFFFFF); ++#endif + } + #else + ret = get_errno(lseek(arg1, arg2, arg3));