[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 19/24] modules: target-specific module build infrastructure
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 19/24] modules: target-specific module build infrastructure |
Date: |
Fri, 18 Jun 2021 06:53:48 +0200 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
meson.build | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/meson.build b/meson.build
index 9cf50a50d39a..e822477a231a 100644
--- a/meson.build
+++ b/meson.build
@@ -1781,6 +1781,7 @@ user_ss = ss.source_set()
util_ss = ss.source_set()
modules = {}
+target_modules = {}
hw_arch = {}
target_arch = {}
target_softmmu_arch = {}
@@ -2055,6 +2056,41 @@ foreach d, list : modules
endforeach
endforeach
+foreach d, list : target_modules
+ foreach m, module_ss : list
+ if enable_modules and targetos != 'windows'
+ foreach target : target_dirs
+ if target.endswith('-softmmu')
+ config_target = config_target_mak[target]
+ config_target += config_host
+ target_inc = [include_directories('target' /
config_target['TARGET_BASE_ARCH'])]
+ c_args = ['-DNEED_CPU_H',
+ '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
+ '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
+ target_module_ss = module_ss.apply(config_target, strict: false)
+ if target_module_ss.sources() != []
+ module_name = d + '-' + m + '-' + config_target['TARGET_NAME']
+ sl = static_library(module_name,
+ [genh, target_module_ss.sources()],
+ dependencies: [modulecommon,
target_module_ss.dependencies()],
+ include_directories: target_inc,
+ c_args: c_args,
+ pic: true)
+ softmmu_mods += sl
+ modinfo_files += custom_target(module_name + '.modinfo',
+ output: module_name + '.modinfo',
+ input: target_module_ss.sources(),
+ capture: true,
+ command: [modinfo_collect,
'--target', target, '@INPUT@'])
+ endif
+ endif
+ endforeach
+ else
+ specific_ss.add_all(module_ss)
+ endif
+ endforeach
+endforeach
+
if enable_modules
modinfo_src = custom_target('modinfo.c',
output: 'modinfo.c',
--
2.31.1
- [PATCH v3 14/24] modules: use modinfo for qom load, (continued)
- [PATCH v3 14/24] modules: use modinfo for qom load, Gerd Hoffmann, 2021/06/18
- [PATCH v3 13/24] modules: use modinfo for dependencies, Gerd Hoffmann, 2021/06/18
- [PATCH v3 15/24] modules: use modinfo for qemu opts load, Gerd Hoffmann, 2021/06/18
- [PATCH v3 16/24] modules: add tracepoints, Gerd Hoffmann, 2021/06/18
- [PATCH v3 18/24] modules: check arch on qom lookup, Gerd Hoffmann, 2021/06/18
- [PATCH v3 20/24] accel: autoload modules, Gerd Hoffmann, 2021/06/18
- [PATCH v3 17/24] modules: check arch and block load on mismatch, Gerd Hoffmann, 2021/06/18
- [PATCH v3 19/24] modules: target-specific module build infrastructure,
Gerd Hoffmann <=
- [PATCH v3 21/24] accel: add qtest module annotations, Gerd Hoffmann, 2021/06/18
- [PATCH v3 23/24] accel: add tcg module annotations, Gerd Hoffmann, 2021/06/18
- [PATCH v3 22/24] accel: build qtest modular, Gerd Hoffmann, 2021/06/18
- [PATCH v3 24/24] accel: build tcg modular, Gerd Hoffmann, 2021/06/18