From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Thu, 19 Feb 2026 08:32:02 +0000 (+0100)
Subject: target/or1k: Build 'gdbstub.c' once for system single binary
X-Git-Tag: v11.0.0-rc0~50^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ceffd13311dc6949c052bd752a5bd0f613965bc4;p=thirdparty%2Fqemu.git

target/or1k: Build 'gdbstub.c' once for system single binary

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 <pierrick.bouvier@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20260219191955.83815-43-philmd@linaro.org>
---

diff --git a/target/or1k/meson.build b/target/or1k/meson.build
index cc912ee6cf9..7cea45287a2 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}