[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 16/17] meson: Move linux_user_ss to linux-user/
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v5 16/17] meson: Move linux_user_ss to linux-user/ |
Date: |
Wed, 17 Nov 2021 17:56:02 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 |
+Thomas/Paolo
On 11/17/21 17:04, Richard Henderson wrote:
> We have no need to reference linux_user_ss outside of linux-user.
> Go ahead and merge it directly into specific_ss.
The patch is correct, so:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
But ...
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> meson.build | 3 ---
> linux-user/meson.build | 4 ++++
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 9f59c57909..ecc181ea13 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2363,7 +2363,6 @@ common_user_ss = ss.source_set()
> crypto_ss = ss.source_set()
> hwcore_ss = ss.source_set()
> io_ss = ss.source_set()
> -linux_user_ss = ss.source_set()
> qmp_ss = ss.source_set()
> qom_ss = ss.source_set()
> softmmu_ss = ss.source_set()
> @@ -2614,8 +2613,6 @@
... shouldn't it be cheaper for the build system to
avoid parsing linux-user machinery when we linux-user
is disabled, ...
+ if have_linux_user
subdir('linux-user')
+ endif
>
> specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
>
> -specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
> -
> common_user_ss = common_user_ss.apply(config_all, strict: false)
> common_user = static_library('common-user',
> sources: common_user_ss.sources(),
> diff --git a/linux-user/meson.build b/linux-user/meson.build
> index fcf7d40f23..b89534c49c 100644
> --- a/linux-user/meson.build
> +++ b/linux-user/meson.build
> @@ -2,6 +2,8 @@ if not have_linux_user
> subdir_done()
> endif
>
> +linux_user_ss = ss.source_set()
> +
> common_user_inc += include_directories('host/' / config_host['ARCH'])
> common_user_inc += include_directories('.')
>
> @@ -42,3 +44,5 @@ subdir('sh4')
> subdir('sparc')
> subdir('x86_64')
> subdir('xtensa')
> +
> +specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
... and add here unconditionally?
- [PATCH v5 14/17] common-user: Move safe-syscall.* from linux-user, (continued)
- [PATCH v5 14/17] common-user: Move safe-syscall.* from linux-user, Richard Henderson, 2021/11/17
- [PATCH v5 10/17] linux-user: Rename TARGET_QEMU_ESIGRETURN to QEMU_ESIGRETURN, Richard Henderson, 2021/11/17
- [PATCH v5 13/17] meson: Add build infrastructure for common-user, Richard Henderson, 2021/11/17
- [PATCH v5 15/17] linux-user: Move thunk.c from top-level, Richard Henderson, 2021/11/17
- [PATCH v5 16/17] meson: Move linux_user_ss to linux-user/, Richard Henderson, 2021/11/17
- Re: [PATCH v5 16/17] meson: Move linux_user_ss to linux-user/,
Philippe Mathieu-Daudé <=
- Re: [PATCH v5 16/17] meson: Move linux_user_ss to linux-user/, Warner Losh, 2021/11/17
- [PATCH v5 17/17] meson: Move bsd_user_ss to bsd-user/, Richard Henderson, 2021/11/17
- Re: [PATCH v5 00/17] linux-user: simplify safe signal handling, Warner Losh, 2021/11/17