4675c7d441
Remove upstream patches [1][2]. Switch to libcap-ng for virtio support [3]. Remove bluez option [4]. Disable container build [5] since we don't want to use containers for cross-building. Disable io_uring [6] since there is no such package in Buildroot (yet). The ARM Cortex-m7 cpu is now supported [7] a defconfig can be added in follup patch. [1] https://git.qemu.org/?p=qemu.git;a=commit;h=00b5032eaddb7193f03f0a28b10286244d2e2a7b [2] https://git.qemu.org/?p=qemu.git;a=commit;h=21bf9b06cb6d07c6cc437dfd47b47b28c2bb79db [3] https://git.qemu.org/?p=qemu.git;a=commit;h=7e46261368d129c5ee8be927f5bcadc7ecd800d7 [4] https://git.qemu.org/?p=qemu.git;a=commit;h=1d4ffe8dc77cbc9aafe8bcf514ca0e43f85aaae3 [5] https://git.qemu.org/?p=qemu.git;a=commit;h=afc3a8f9f1df09c091f9903eaef82b35c152cacf [6] https://git.qemu.org/?p=qemu.git;a=commit;h=c10dd8565defdb14695580c9369b20f4544e65a2 [7] https://git.qemu.org/?p=qemu.git;a=commit;h=cf7beda5072e106ddce875c1996446540c5fe239 See: https://wiki.qemu.org/ChangeLog/5.0 https://www.qemu.org/2020/04/29/qemu-5-0-0/ Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Adam Duskett <aduskett@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Fri, 5 May 2017 09:07:15 +0200
|
|
Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc
|
|
|
|
user-exec.c has some conditional code to decide how to use the
|
|
mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but
|
|
with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path
|
|
gets used, which doesn't apply to uClibc.
|
|
|
|
Fix this by excluding __UCLIBC__, which ensures we fall back to the
|
|
general case of using uc_mcontext.arm_pc, which works fine with
|
|
uClibc.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
accel/tcg/user-exec.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
|
|
index 4be78eb9b3..0a690bec55 100644
|
|
--- a/accel/tcg/user-exec.c
|
|
+++ b/accel/tcg/user-exec.c
|
|
@@ -508,7 +508,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
|
|
|
|
#if defined(__NetBSD__)
|
|
pc = uc->uc_mcontext.__gregs[_REG_R15];
|
|
-#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
|
|
+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
|
|
pc = uc->uc_mcontext.gregs[R15];
|
|
#else
|
|
pc = uc->uc_mcontext.arm_pc;
|
|
--
|
|
2.25.3
|
|
|