1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

- 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:	d62553b108
This commit is contained in:
Juergen Lock 2014-04-04 23:16:43 +00:00
parent 53e60f4b39
commit fed51a4bc9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=350185
2 changed files with 15 additions and 1 deletions

View File

@ -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-bsd-user-freebsd-os-proc.c
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

View File

@ -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 */