diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-08 17:53:24 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-18 11:17:27 +0200 |
| commit | 5837db465053f57414f671448b370a4b29250bae (patch) | |
| tree | 826e371bce92e31c9717a865270422fc80124269 | |
| parent | f2604d8508a12a2060e854283fa076c9f09d1d10 (diff) | |
| download | qemu-5837db465053f57414f671448b370a4b29250bae.zip qemu-5837db465053f57414f671448b370a4b29250bae.tar.gz qemu-5837db465053f57414f671448b370a4b29250bae.tar.bz2 | |
semihosting: move stubs out of stubs/
Since the semihosting stubs are needed exactly when the Kconfig symbols
are not needed, move them to semihosting/ and conditionalize them
on CONFIG_SEMIHOSTING and/or CONFIG_SYSTEM_ONLY.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20240408155330.522792-13-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | semihosting/meson.build | 3 | ||||
| -rw-r--r-- | semihosting/stubs-all.c (renamed from stubs/semihost-all.c) | 0 | ||||
| -rw-r--r-- | semihosting/stubs-system.c (renamed from stubs/semihost.c) | 0 | ||||
| -rw-r--r-- | stubs/meson.build | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/semihosting/meson.build b/semihosting/meson.build index b07cbd9..34933e5 100644 --- a/semihosting/meson.build +++ b/semihosting/meson.build @@ -9,5 +9,8 @@ specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM_ONLY'], if_true: fil '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')) + specific_ss.add(when: ['CONFIG_ARM_COMPATIBLE_SEMIHOSTING'], if_true: files('arm-compat-semi.c')) diff --git a/stubs/semihost-all.c b/semihosting/stubs-all.c index a2a1fc9..a2a1fc9 100644 --- a/stubs/semihost-all.c +++ b/semihosting/stubs-all.c diff --git a/stubs/semihost.c b/semihosting/stubs-system.c index f26cbb7..f26cbb7 100644 --- a/stubs/semihost.c +++ b/semihosting/stubs-system.c diff --git a/stubs/meson.build b/stubs/meson.build index 60e32d3..84ecaa4 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -55,9 +55,7 @@ if have_block or have_ga endif if have_system stub_ss.add(files('fw_cfg.c')) - stub_ss.add(files('semihost.c')) stub_ss.add(files('xen-hw-stub.c')) else stub_ss.add(files('qdev.c')) endif -stub_ss.add(files('semihost-all.c')) |