[PATCH 07/26] meson: Introduce meson_user_arch source set for arch-specific user-mode

Philippe Mathieu-Daudé posted 26 patches 1 year, 5 months ago
There is a newer version of this series
Maintainers: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>
[PATCH 07/26] meson: Introduce meson_user_arch source set for arch-specific user-mode
Posted by Philippe Mathieu-Daudé 1 year, 5 months ago
Similarly to the 'target_softmmu_arch' source set which allows
to restrict target-specific sources to system emulation, add
the equivalent 'meson_user_arch' set for user emulation.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meson.build b/meson.build
index d8bb1ec5aa9..1ffdc9e6c4e 100644
--- a/meson.build
+++ b/meson.build
@@ -1751,6 +1751,7 @@
 hw_arch = {}
 target_arch = {}
 target_softmmu_arch = {}
+target_user_arch = {}
 
 ###############
 # Trace files #
@@ -2168,6 +2169,11 @@
     abi = config_target['TARGET_ABI_DIR']
     target_type='user'
     qemu_target_name = 'qemu-' + target_name
+    if arch in target_user_arch
+      t = target_user_arch[arch].apply(config_target, strict: false)
+      arch_srcs += t.sources()
+      arch_deps += t.dependencies()
+    endif
     if 'CONFIG_LINUX_USER' in config_target
       base_dir = 'linux-user'
       target_inc += include_directories('linux-user/host/' / config_host['ARCH'])
-- 
2.26.3

Re: [PATCH 07/26] meson: Introduce meson_user_arch source set for arch-specific user-mode
Posted by Richard Henderson 1 year, 5 months ago
On 4/18/21 9:31 AM, Philippe Mathieu-Daudé wrote:
> Similarly to the 'target_softmmu_arch' source set which allows
> to restrict target-specific sources to system emulation, add
> the equivalent 'meson_user_arch' set for user emulation.

You didn't call it meson_user_arch in the end.  Last minute change?
Otherwise,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   meson.build | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/meson.build b/meson.build
> index d8bb1ec5aa9..1ffdc9e6c4e 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1751,6 +1751,7 @@
>   hw_arch = {}
>   target_arch = {}
>   target_softmmu_arch = {}
> +target_user_arch = {}
>   
>   ###############
>   # Trace files #
> @@ -2168,6 +2169,11 @@
>       abi = config_target['TARGET_ABI_DIR']
>       target_type='user'
>       qemu_target_name = 'qemu-' + target_name
> +    if arch in target_user_arch
> +      t = target_user_arch[arch].apply(config_target, strict: false)
> +      arch_srcs += t.sources()
> +      arch_deps += t.dependencies()
> +    endif
>       if 'CONFIG_LINUX_USER' in config_target
>         base_dir = 'linux-user'
>         target_inc += include_directories('linux-user/host/' / config_host['ARCH'])
>