Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Apr 2014 23:16:43 +0000 (UTC)
From:      Juergen Lock <nox@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r350185 - in head/emulators/qemu-devel: . files
Message-ID:  <201404042316.s34NGhOP049103@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nox
Date: Fri Apr  4 23:16:43 2014
New Revision: 350185
URL: http://svnweb.freebsd.org/changeset/ports/350185
QAT: https://qat.redports.org/buildarchive/r350185/

Log:
  - Add patch to fix 32bit mips sigreturn that caused mips bsd-user
    to die with (target) SIGILL sometimes.
  - Bump PORTREVISION.
  
  Submitted by:	peter
  Obtained from:	https://github.com/seanbruno/qemu/commit/d62553b108aa27c0c020dbb771d29f8673807a3b

Added:
  head/emulators/qemu-devel/files/extra-patch-d62553b108aa27c0c020dbb771d29f8673807a3b   (contents, props changed)
Modified:
  head/emulators/qemu-devel/Makefile

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Fri Apr  4 23:07:36 2014	(r350184)
+++ head/emulators/qemu-devel/Makefile	Fri Apr  4 23:16:43 2014	(r350185)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot
@@ -70,6 +70,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-05ee8495804599b52a88eb36b13ea9c06b3207cd
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bsd-user-mips-target_arch_vmparam.h
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-inherit-interp_prefix
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-d62553b108aa27c0c020dbb771d29f8673807a3b
 .endif
 
 CONFIGURE_ARGS+=	--extra-ldflags=-L${LOCALBASE}/lib

Added: head/emulators/qemu-devel/files/extra-patch-d62553b108aa27c0c020dbb771d29f8673807a3b
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-devel/files/extra-patch-d62553b108aa27c0c020dbb771d29f8673807a3b	Fri Apr  4 23:16:43 2014	(r350185)
@@ -0,0 +1,13 @@
+diff --git a/bsd-user/mips/target_arch_sigtramp.h b/bsd-user/mips/target_arch_sigtramp.h
+index 5e3c69a..2ec591f 100644
+--- a/bsd-user/mips/target_arch_sigtramp.h
++++ b/bsd-user/mips/target_arch_sigtramp.h
+@@ -8,7 +8,7 @@ static inline abi_long setup_sigtramp(abi_ulong offset, unsigned sigf_uc,
+ {
+     int i;
+     uint32_t sigtramp_code[TARGET_SZSIGCODE/TARGET_INSN_SIZE] = {
+-    /* 1 */ 0x67A40000 + sigf_uc,       /* daddu   $a0, $sp, (sigf_uc) */
++    /* 1 */ 0x27A40000 + sigf_uc,       /* daddu   $a0, $sp, (sigf_uc) */
+     /* 2 */ 0x24020000 + sys_sigreturn, /* li      $v0, (sys_sigreturn) */
+     /* 3 */ 0x0000000C,                 /* syscall */
+     /* 4 */ 0x0000000D                  /* break */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404042316.s34NGhOP049103>