svn commit: r348887 - in head/emulators/qemu-devel: . files

[Juergen Lock]

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));