Re: [PATCH v21 06/17] meson: add target_user_arch

["Philippe Mathieu-Daudé" <f4bug@amsat.org>]

On 2/22/21 2:36 PM, Claudio Fontana wrote:
> the lack of target_user_arch makes it hard to fully leverage the
> build system in order to separate user code from softmmu code.
> 
> Provide it, so that we can avoid the proliferation of #ifdef
> in target code.
> 
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

---

> 
> [claudio: added changes for new target hexagon]
> ---


>  meson.build                   | 5 +++++
>  target/alpha/meson.build      | 3 +++
>  target/arm/meson.build        | 2 ++
>  target/cris/meson.build       | 3 +++
>  target/hexagon/meson.build    | 3 +++
>  target/hppa/meson.build       | 3 +++
>  target/i386/meson.build       | 2 ++
>  target/m68k/meson.build       | 3 +++
>  target/microblaze/meson.build | 3 +++
>  target/mips/meson.build       | 3 +++
>  target/nios2/meson.build      | 3 +++
>  target/openrisc/meson.build   | 3 +++
>  target/ppc/meson.build        | 3 +++
>  target/riscv/meson.build      | 3 +++
>  target/s390x/meson.build      | 3 +++
>  target/sh4/meson.build        | 3 +++
>  target/sparc/meson.build      | 3 +++
>  target/tilegx/meson.build     | 3 +++
>  target/tricore/meson.build    | 3 +++
>  target/xtensa/meson.build     | 3 +++
>  20 files changed, 60 insertions(+)
> 
> diff --git a/meson.build b/meson.build
> index 05a67c20d9..5be4e5f38c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1735,6 +1735,7 @@ modules = {}
>  hw_arch = {}
>  target_arch = {}
>  target_softmmu_arch = {}
> +target_user_arch = {}
>  
>  ###############
>  # Trace files #
> @@ -2132,6 +2133,10 @@ foreach target : target_dirs
>      abi = config_target['TARGET_ABI_DIR']
>      target_type='user'
>      qemu_target_name = 'qemu-' + target_name
> +    t = target_user_arch[arch].apply(config_target, strict: false)
> +    arch_srcs += t.sources()
> +    arch_deps += t.dependencies()
> +
>      if 'CONFIG_LINUX_USER' in config_target
>        base_dir = 'linux-user'
>        target_inc += include_directories('linux-user/host/' / config_host['ARCH'])

I agree with Richard about a later
s/target_softmmu_arch/target_system_arch/ cleanup.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>