meson: Rename target_softmmu_arch -> target_system_arch
Finish the convertion started with commit de6cd7599b
("meson: Replace softmmu_ss -> system_ss"). If the
$target_type is 'system', then use the target_system_arch[]
source set :)
Mechanical change doing:
$ sed -i -e s/target_softmmu_arch/target_system_arch/g \
$(git grep -l target_softmmu_arch)
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004090629.37473-13-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
21d2140dd8
commit
01c85e60a4
@ -225,14 +225,14 @@ Target-dependent emulator sourcesets:
|
||||
The sourceset is only used for system emulators.
|
||||
|
||||
Each subdirectory in ``target/`` instead should add one sourceset to each
|
||||
of the ``target_arch`` and ``target_softmmu_arch``, which are used respectively
|
||||
of the ``target_arch`` and ``target_system_arch``, which are used respectively
|
||||
for all emulators and for system emulators only. For example::
|
||||
|
||||
arm_ss = ss.source_set()
|
||||
arm_system_ss = ss.source_set()
|
||||
...
|
||||
target_arch += {'arm': arm_ss}
|
||||
target_softmmu_arch += {'arm': arm_system_ss}
|
||||
target_system_arch += {'arm': arm_system_ss}
|
||||
|
||||
Module sourcesets:
|
||||
There are two dictionaries for modules: ``modules`` is used for
|
||||
|
@ -3198,7 +3198,7 @@ modules = {}
|
||||
target_modules = {}
|
||||
hw_arch = {}
|
||||
target_arch = {}
|
||||
target_softmmu_arch = {}
|
||||
target_system_arch = {}
|
||||
target_user_arch = {}
|
||||
|
||||
###############
|
||||
@ -3718,7 +3718,7 @@ foreach target : target_dirs
|
||||
endif
|
||||
if target.endswith('-softmmu')
|
||||
target_type='system'
|
||||
t = target_softmmu_arch[target_base_arch].apply(config_target, strict: false)
|
||||
t = target_system_arch[target_base_arch].apply(config_target, strict: false)
|
||||
arch_srcs += t.sources()
|
||||
arch_deps += t.dependencies()
|
||||
|
||||
|
@ -15,4 +15,4 @@ alpha_system_ss = ss.source_set()
|
||||
alpha_system_ss.add(files('machine.c'))
|
||||
|
||||
target_arch += {'alpha': alpha_ss}
|
||||
target_softmmu_arch += {'alpha': alpha_system_ss}
|
||||
target_system_arch += {'alpha': alpha_system_ss}
|
||||
|
@ -35,4 +35,4 @@ else
|
||||
endif
|
||||
|
||||
target_arch += {'arm': arm_ss}
|
||||
target_softmmu_arch += {'arm': arm_system_ss}
|
||||
target_system_arch += {'arm': arm_system_ss}
|
||||
|
@ -17,4 +17,4 @@ avr_ss.add(files(
|
||||
avr_system_ss.add(files('machine.c'))
|
||||
|
||||
target_arch += {'avr': avr_ss}
|
||||
target_softmmu_arch += {'avr': avr_system_ss}
|
||||
target_system_arch += {'avr': avr_system_ss}
|
||||
|
@ -14,4 +14,4 @@ cris_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'cris': cris_ss}
|
||||
target_softmmu_arch += {'cris': cris_system_ss}
|
||||
target_system_arch += {'cris': cris_system_ss}
|
||||
|
@ -20,4 +20,4 @@ hppa_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'hppa': hppa_ss}
|
||||
target_softmmu_arch += {'hppa': hppa_system_ss}
|
||||
target_system_arch += {'hppa': hppa_system_ss}
|
||||
|
@ -31,5 +31,5 @@ subdir('hvf')
|
||||
subdir('tcg')
|
||||
|
||||
target_arch += {'i386': i386_ss}
|
||||
target_softmmu_arch += {'i386': i386_system_ss}
|
||||
target_system_arch += {'i386': i386_system_ss}
|
||||
target_user_arch += {'i386': i386_user_ss}
|
||||
|
@ -30,4 +30,4 @@ common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), gen])
|
||||
loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss])
|
||||
|
||||
target_arch += {'loongarch': loongarch_ss}
|
||||
target_softmmu_arch += {'loongarch': loongarch_system_ss}
|
||||
target_system_arch += {'loongarch': loongarch_system_ss}
|
||||
|
@ -16,4 +16,4 @@ m68k_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'m68k': m68k_ss}
|
||||
target_softmmu_arch += {'m68k': m68k_system_ss}
|
||||
target_system_arch += {'m68k': m68k_system_ss}
|
||||
|
@ -17,4 +17,4 @@ microblaze_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'microblaze': microblaze_ss}
|
||||
target_softmmu_arch += {'microblaze': microblaze_system_ss}
|
||||
target_system_arch += {'microblaze': microblaze_system_ss}
|
||||
|
@ -19,5 +19,5 @@ endif
|
||||
mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
|
||||
|
||||
target_arch += {'mips': mips_ss}
|
||||
target_softmmu_arch += {'mips': mips_system_ss}
|
||||
target_system_arch += {'mips': mips_system_ss}
|
||||
target_user_arch += {'mips': mips_user_ss}
|
||||
|
@ -14,4 +14,4 @@ nios2_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'nios2': nios2_ss}
|
||||
target_softmmu_arch += {'nios2': nios2_system_ss}
|
||||
target_system_arch += {'nios2': nios2_system_ss}
|
||||
|
@ -22,4 +22,4 @@ openrisc_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'openrisc': openrisc_ss}
|
||||
target_softmmu_arch += {'openrisc': openrisc_system_ss}
|
||||
target_system_arch += {'openrisc': openrisc_system_ss}
|
||||
|
@ -55,4 +55,4 @@ ppc_system_ss.add(when: 'TARGET_PPC64', if_true: files(
|
||||
))
|
||||
|
||||
target_arch += {'ppc': ppc_ss}
|
||||
target_softmmu_arch += {'ppc': ppc_system_ss}
|
||||
target_system_arch += {'ppc': ppc_system_ss}
|
||||
|
@ -39,4 +39,4 @@ riscv_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'riscv': riscv_ss}
|
||||
target_softmmu_arch += {'riscv': riscv_system_ss}
|
||||
target_system_arch += {'riscv': riscv_system_ss}
|
||||
|
@ -13,4 +13,4 @@ rx_ss.add(files(
|
||||
'disas.c'))
|
||||
|
||||
target_arch += {'rx': rx_ss}
|
||||
target_softmmu_arch += {'rx': ss.source_set()}
|
||||
target_system_arch += {'rx': ss.source_set()}
|
||||
|
@ -40,5 +40,5 @@ subdir('tcg')
|
||||
subdir('kvm')
|
||||
|
||||
target_arch += {'s390x': s390x_ss}
|
||||
target_softmmu_arch += {'s390x': s390x_system_ss}
|
||||
target_system_arch += {'s390x': s390x_system_ss}
|
||||
target_user_arch += {'s390x': s390x_user_ss}
|
||||
|
@ -11,4 +11,4 @@ sh4_system_ss = ss.source_set()
|
||||
sh4_system_ss.add(files('monitor.c'))
|
||||
|
||||
target_arch += {'sh4': sh4_ss}
|
||||
target_softmmu_arch += {'sh4': sh4_system_ss}
|
||||
target_system_arch += {'sh4': sh4_system_ss}
|
||||
|
@ -20,4 +20,4 @@ sparc_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'sparc': sparc_ss}
|
||||
target_softmmu_arch += {'sparc': sparc_system_ss}
|
||||
target_system_arch += {'sparc': sparc_system_ss}
|
||||
|
@ -12,4 +12,4 @@ tricore_ss.add(zlib)
|
||||
tricore_system_ss = ss.source_set()
|
||||
|
||||
target_arch += {'tricore': tricore_ss}
|
||||
target_softmmu_arch += {'tricore': tricore_system_ss}
|
||||
target_system_arch += {'tricore': tricore_system_ss}
|
||||
|
@ -24,4 +24,4 @@ xtensa_system_ss.add(files(
|
||||
))
|
||||
|
||||
target_arch += {'xtensa': xtensa_ss}
|
||||
target_softmmu_arch += {'xtensa': xtensa_system_ss}
|
||||
target_system_arch += {'xtensa': xtensa_system_ss}
|
||||
|
Loading…
Reference in New Issue
Block a user