diff --git a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch new file mode 100644 index 0000000000..8dc2dd8823 --- /dev/null +++ b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch @@ -0,0 +1,36 @@ +From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Mon, 12 Dec 2022 09:03:17 -0600 +Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags + +The values in env->flags are a subset of tb->flags. +Restore only the bits that belong. + +Cc: qemu-stable@nongnu.org +Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN") +Signed-off-by: Guenter Roeck +Message-ID: <20221212011345.GA2235238@roeck-us.net> +[rth: Reduce to only the the superh_cpu_synchronize_from_tb change] +Signed-off-by: Richard Henderson +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + target/sh4/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c +index 951eb6b9c8..f0934b20fa 100644 +--- a/target/sh4/cpu.c ++++ b/target/sh4/cpu.c +@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, + SuperHCPU *cpu = SUPERH_CPU(cs); + + cpu->env.pc = tb_pc(tb); +- cpu->env.flags = tb->flags; ++ cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; + } + + static void superh_restore_state_to_opc(CPUState *cs, +-- +2.25.1 + diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 06d090bd1d..e671e1d184 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 qemu-7.1.0.tar.xz +sha256 5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 qemu-7.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index be84452862..8725e7c8c4 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 7.1.0 +QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -69,7 +69,7 @@ QEMU_OPTS += --enable-vhost-user endif ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) -QEMU_OPTS += --enable-slirp=system +QEMU_OPTS += --enable-slirp QEMU_DEPENDENCIES += slirp else QEMU_OPTS += --disable-slirp @@ -258,6 +258,7 @@ HOST_QEMU_DEPENDENCIES = \ host-pixman \ host-pkgconf \ host-python3 \ + host-slirp \ host-zlib # BR ARCH qemu @@ -402,6 +403,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vnc-jpeg \ --disable-png \ --disable-vnc-sasl \ + --enable-slirp \ --enable-tools \ $(HOST_QEMU_OPTS) endef