[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/22] semihosting/meson: Build config.o and console.o once
From: |
Alex Bennée |
Subject: |
[PATCH 07/22] semihosting/meson: Build config.o and console.o once |
Date: |
Thu, 9 Jan 2025 17:06:04 +0000 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
config.c and console.c don't use any target specific
headers anymore, move them from specific_ss[] to
system_ss[] so they are built once, but will also be
linked once, removing global symbol clash in a single
QEMU binary.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250103171037.11265-6-philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
semihosting/meson.build | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/semihosting/meson.build b/semihosting/meson.build
index 34933e5a19..86f5004bed 100644
--- a/semihosting/meson.build
+++ b/semihosting/meson.build
@@ -4,13 +4,16 @@ specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
))
specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM_ONLY'], if_true:
files(
- 'config.c',
- 'console.c',
'uaccess.c',
))
common_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM_ONLY'], if_false:
files('stubs-all.c'))
-system_ss.add(when: ['CONFIG_SEMIHOSTING'], if_false: files('stubs-system.c'))
+system_ss.add(when: ['CONFIG_SEMIHOSTING'], if_true: files(
+ 'config.c',
+ 'console.c',
+), if_false: files(
+ 'stubs-system.c',
+))
specific_ss.add(when: ['CONFIG_ARM_COMPATIBLE_SEMIHOSTING'],
if_true: files('arm-compat-semi.c'))
--
2.39.5
- [PATCH 05/22] semihosting/arm-compat: Include missing 'cpu.h' header, (continued)
- [PATCH 05/22] semihosting/arm-compat: Include missing 'cpu.h' header, Alex Bennée, 2025/01/09
- [PATCH 04/22] semihosting/uaccess: Include missing 'exec/cpu-all.h' header, Alex Bennée, 2025/01/09
- [PATCH 02/22] semihosting/uaccess: Briefly document returned values, Alex Bennée, 2025/01/09
- [PATCH 01/22] semihosting: add guest_error logging for failed opens, Alex Bennée, 2025/01/09
- [PATCH 09/22] system: squash usb_parse into a single function, Alex Bennée, 2025/01/09
- [PATCH 13/22] tests/tcg/plugins/syscall: fix 32-bit build, Alex Bennée, 2025/01/09
- [PATCH 14/22] tests/tcg/plugins/mem: fix 32-bit build, Alex Bennée, 2025/01/09
- [PATCH 16/22] contrib/plugins/cache: fix 32-bit build, Alex Bennée, 2025/01/09
- [PATCH 07/22] semihosting/meson: Build config.o and console.o once,
Alex Bennée <=
- [PATCH 12/22] contrib/plugins/howvec: ensure we don't regress if this plugin is extended, Alex Bennée, 2025/01/09
- [PATCH 08/22] system/vl: more error exit into config enumeration code, Alex Bennée, 2025/01/09
- [PATCH 06/22] semihosting/console: Avoid including 'cpu.h', Alex Bennée, 2025/01/09
- [PATCH 03/22] semihosting/syscalls: Include missing 'exec/cpu-defs.h' header, Alex Bennée, 2025/01/09
- [PATCH 10/22] system: propagate Error to gdbserver_start (and other device setups), Alex Bennée, 2025/01/09