OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

meson: Rename softmmu_mods -> system_mods

Browse Source 
See commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss")
for rationale.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004090629.37473-12-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-04 11:06:26 +02:00 committed by Paolo Bonzini
parent 5338977abd
commit 21d2140dd8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -3480,7 +3480,7 @@ modinfo_generate = find_program('scripts/modinfo-generate.py')
modinfo_files = [] modinfo_files = []
block_mods = [] block_mods = []
softmmu_mods = [] system_mods = []
foreach d, list : modules foreach d, list : modules
if not (d == 'block' ? have_block : have_system) if not (d == 'block' ? have_block : have_system)
continue continue
@ -3494,7 +3494,7 @@ foreach d, list : modules
if d == 'block' if d == 'block'
block_mods += sl block_mods += sl
else else
softmmu_mods += sl system_mods += sl
endif endif
if module_ss.sources() != [] if module_ss.sources() != []
# FIXME: Should use sl.extract_all_objects(recursive: true) as # FIXME: Should use sl.extract_all_objects(recursive: true) as
@ -3538,7 +3538,7 @@ foreach d, list : target_modules
include_directories: target_inc, include_directories: target_inc,
c_args: c_args, c_args: c_args,
pic: true) pic: true)
softmmu_mods += sl system_mods += sl
# FIXME: Should use sl.extract_all_objects(recursive: true) too. # FIXME: Should use sl.extract_all_objects(recursive: true) too.
modinfo_files += custom_target(module_name + '.modinfo', modinfo_files += custom_target(module_name + '.modinfo',
output: module_name + '.modinfo', output: module_name + '.modinfo',
@ -3581,7 +3581,7 @@ block_syms = custom_target('block.syms', output: 'block.syms',
capture: true, capture: true,
command: [undefsym, nm, '@INPUT@']) command: [undefsym, nm, '@INPUT@'])
qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', qemu_syms = custom_target('qemu.syms', output: 'qemu.syms',
input: [libqemuutil, softmmu_mods], input: [libqemuutil, system_mods],
capture: true, capture: true,
command: [undefsym, nm, '@INPUT@']) command: [undefsym, nm, '@INPUT@'])
@ -3666,7 +3666,7 @@ common_ss.add(hwcore)
########### ###########
emulator_modules = [] emulator_modules = []
foreach m : block_mods + softmmu_mods foreach m : block_mods + system_mods
emulator_modules += shared_module(m.name(), emulator_modules += shared_module(m.name(),
build_by_default: true, build_by_default: true,
name_prefix: '', name_prefix: '',