diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-01-16 16:02:36 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2025-01-17 10:44:03 +0000 |
| commit | bb0c5be8e907511c7f05f45e820c548ceef25b97 (patch) | |
| tree | 132565de8b91c06a3a4de661809aeaba95ca6451 | |
| parent | 57792106562417ba03a1ac0f2a5afc3eb63c5d9e (diff) | |
| download | focaccia-qemu-bb0c5be8e907511c7f05f45e820c548ceef25b97.tar.gz focaccia-qemu-bb0c5be8e907511c7f05f45e820c548ceef25b97.zip | |
semihosting/meson: Build config.o and console.o once
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> Message-Id: <20250116160306.1709518-8-alex.bennee@linaro.org>
| -rw-r--r-- | semihosting/meson.build | 9 |
1 files 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')) |