diff options
| -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 b07cbd980f..34933e5a19 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 a2a1fc9c6f..a2a1fc9c6f 100644 --- a/stubs/semihost-all.c +++ b/semihosting/stubs-all.c diff --git a/stubs/semihost.c b/semihosting/stubs-system.c index f26cbb7c25..f26cbb7c25 100644 --- a/stubs/semihost.c +++ b/semihosting/stubs-system.c diff --git a/stubs/meson.build b/stubs/meson.build index 60e32d363f..84ecaa4daa 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')) |