From 0f837ad708bbb47204d5ea33cc4df3b1a6fbcf69 Mon Sep 17 00:00:00 2001 From: Michael Dusan Date: Fri, 4 Oct 2024 14:28:57 -0400 Subject: [PATCH] update aarch64_be-linux-user gdb XML list --- command/patch | 3 ++- ...s__targets__aarch64_be-linux-user.mak.diff | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 patch/configs__targets__aarch64_be-linux-user.mak.diff diff --git a/command/patch b/command/patch index 5a8a093f..905e22de 100755 --- a/command/patch +++ b/command/patch @@ -5,6 +5,7 @@ set -e . $(dirname $0)/base WORKDIR "/work/src/${QEMU_SRC_BASENAME}" +RUN patch -p1 -i "${WORK_ROOT}/patch/configs__targets__aarch64_be-linux-user.mak.diff" RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__sigrt.diff" -RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__syscall.diff" RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__syscall-lfs.diff" +RUN patch -p1 -i "${WORK_ROOT}/patch/linux-user__syscall.diff" diff --git a/patch/configs__targets__aarch64_be-linux-user.mak.diff b/patch/configs__targets__aarch64_be-linux-user.mak.diff new file mode 100644 index 00000000..fb50cf21 --- /dev/null +++ b/patch/configs__targets__aarch64_be-linux-user.mak.diff @@ -0,0 +1,25 @@ +commit 3676e278dbe2111d2799a4d2dc023f20e9cd6820 +Author: Alex Bennée +Date: Tue Sep 24 20:43:56 2024 +0100 + + config/targets: update aarch64_be-linux-user gdb XML list + + Attempting to run the binary asserts when it can't find the XML entry. + We can fix it so we don't although I suspect other stuff is broken. + + Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2580 + Signed-off-by: Alex Bennée + +diff --git a/configs/targets/aarch64_be-linux-user.mak b/configs/targets/aarch64_be-linux-user.mak +index acb5620cdb..14623ac076 100644 +--- a/configs/targets/aarch64_be-linux-user.mak ++++ b/configs/targets/aarch64_be-linux-user.mak +@@ -1,7 +1,7 @@ + TARGET_ARCH=aarch64 + TARGET_BASE_ARCH=arm + TARGET_BIG_ENDIAN=y +-TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/aarch64-pauth.xml ++TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/aarch64-pauth.xml gdb-xml/aarch64-mte.xml + TARGET_HAS_BFLT=y + CONFIG_SEMIHOSTING=y + CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y