b5351d8b7f
From [1]: "The build system is now partly based on Meson. However, building is still done with configure and make as in previous versions of QEMU." Qemu requires meson >= 0.55.3, Buildroot use the latest version 0.56.0. In order to add host-meson dependency we have to remove --python option since it requires to use the meson bundled into Qemu sources [2]. Even without --python, python3 is used. See config-host.mak: PYTHON=output/host/bin/python3 -B See config-host.mak to check if meson and ninja from HOST_DIR are used: MESON=output/host/bin/meson NINJA=output/host/bin/ninja Since the switch to meson is partial and still requires using the configure script, keep using generic-package infra. Disable new options introduced in Qemu 5.2.0: --disable-virtiofsd --disable-vhost-user-blk-server Runtime tested on gitlab [3] [1] https://wiki.qemu.org/ChangeLog/5.2#Build_Information [2] https://git.qemu.org/?p=qemu.git;a=blob;f=configure;h=18c26e0389741643748c70ac7788a996ef006834;hb=553032db17440f8de011390e5a1cfddd13751b0b#l1895 [3] https://gitlab.com/kubu93/buildroot/-/pipelines/228214205 Signed-off-by: Romain Naour <romain.naour@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 4ebe25461a..0496674fbd 100644
|
|
--- a/accel/tcg/user-exec.c
|
|
+++ b/accel/tcg/user-exec.c
|
|
@@ -536,7 +536,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
|
|
|