From ceffd13311dc6949c052bd752a5bd0f613965bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 19 Feb 2026 09:32:02 +0100 Subject: [PATCH] target/or1k: Build 'gdbstub.c' once for system single binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is a single qemu-system-or1k binary, but by moving 'gdbstub.c' in the target_common_system_arch[] source set the resulting object can be linked into a single qemu-sytem binary. Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20260219191955.83815-43-philmd@linaro.org> --- target/or1k/meson.build | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/or1k/meson.build b/target/or1k/meson.build index cc912ee6cf..7cea45287a 100644 --- a/target/or1k/meson.build +++ b/target/or1k/meson.build @@ -8,18 +8,25 @@ or1k_ss.add(files( 'exception.c', 'exception_helper.c', 'fpu_helper.c', - 'gdbstub.c', 'interrupt_helper.c', 'sys_helper.c', 'translate.c', )) +or1k_user_ss = ss.source_set() +or1k_user_ss.add(files('gdbstub.c')) + or1k_common_system_ss = ss.source_set() -or1k_common_system_ss.add(files( +or1k_common_system_ss.add(files('gdbstub.c')) + +or1k_system_ss = ss.source_set() +or1k_system_ss.add(files( 'interrupt.c', 'machine.c', 'mmu.c', )) target_arch += {'or1k': or1k_ss} +target_user_arch += {'or1k': or1k_user_ss} +target_system_arch += {'or1k': or1k_system_ss} target_common_system_arch += {'or1k': or1k_common_system_ss}