mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 06:32:13 +02:00
qemu: Upgrade to 2.8.1.1
Removed patch target-ppc-fix-user-mode.patch [1] already on upstream. [1] http://git.qemu.org/?p=qemu.git;a=history;f=linux-user/main.c; h=65a769cf797254a86a7cf589d69e67595a9e1adb;hb=refs/heads/stable-2.8 (From OE-Core rev: 13f34c172dae842427365be3a891248a76104c28) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b8836853a0
commit
989bbb9803
@@ -1,48 +0,0 @@
|
||||
[Qemu-ppc] [PATCH 1/1] target-ppc, tcg: fix usermode segfault with pthread
|
||||
|
||||
From: Sam Bobroff
|
||||
Subject: [Qemu-ppc] [PATCH 1/1] target-ppc, tcg: fix usermode segfault with pthread_create()
|
||||
Date: Mon, 30 Jan 2017 16:08:07 +1100
|
||||
Programs run under qemu-ppc64 on an x86_64 host currently segfault
|
||||
if they use pthread_create() due to the adjustment made to the NIP in
|
||||
commit bd6fefe71cec5a0c7d2be4ac96307f25db56abf9.
|
||||
|
||||
This patch changes cpu_loop() to set the NIP back to the
|
||||
pre-incremented value before calling do_syscall(), which causes the
|
||||
correct address to be used for the new thread and corrects the fault.
|
||||
|
||||
Signed-off-by: Sam Bobroff <address@hidden>
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
---
|
||||
|
||||
linux-user/main.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/linux-user/main.c b/linux-user/main.c
|
||||
index 30049581ef..b5dee01541 100644
|
||||
--- a/linux-user/main.c
|
||||
+++ b/linux-user/main.c
|
||||
@@ -1712,18 +1712,20 @@ void cpu_loop(CPUPPCState *env)
|
||||
* in syscalls.
|
||||
*/
|
||||
env->crf[0] &= ~0x1;
|
||||
+ env->nip += 4;
|
||||
ret = do_syscall(env, env->gpr[0], env->gpr[3], env->gpr[4],
|
||||
env->gpr[5], env->gpr[6], env->gpr[7],
|
||||
env->gpr[8], 0, 0);
|
||||
if (ret == -TARGET_ERESTARTSYS) {
|
||||
+ env->nip -= 4;
|
||||
break;
|
||||
}
|
||||
if (ret == (target_ulong)(-TARGET_QEMU_ESIGRETURN)) {
|
||||
+ env->nip -= 4;
|
||||
/* Returning from a successful sigreturn syscall.
|
||||
Avoid corrupting register state. */
|
||||
break;
|
||||
}
|
||||
- env->nip += 4;
|
||||
if (ret > (target_ulong)(-515)) {
|
||||
env->crf[0] |= 0x1;
|
||||
ret = -ret;
|
||||
@@ -19,7 +19,6 @@ SRC_URI += " \
|
||||
file://no-valgrind.patch \
|
||||
file://pathlimit.patch \
|
||||
file://qemu-2.5.0-cflags.patch \
|
||||
file://target-ppc-fix-user-mode.patch \
|
||||
file://glibc-2.25.patch \
|
||||
"
|
||||
|
||||
@@ -39,8 +38,8 @@ SRC_URI_append_class-native = " \
|
||||
|
||||
SRC_URI =+ "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
|
||||
|
||||
SRC_URI[md5sum] = "17940dce063b6ce450a12e719a6c9c43"
|
||||
SRC_URI[sha256sum] = "dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62"
|
||||
SRC_URI[md5sum] = "a6a23a0c59fd0f8ec564b0fb89a79954"
|
||||
SRC_URI[sha256sum] = "f62ab18a1fb9ff5b4c81ed44becc945b11581eff777618141bdb787da55d3638"
|
||||
|
||||
COMPATIBLE_HOST_mipsarchn32 = "null"
|
||||
COMPATIBLE_HOST_mipsarchn64 = "null"
|
||||
Reference in New Issue
Block a user