[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 15/16] meson: Move linux_user_ss to linux-user/
From: |
Richard Henderson |
Subject: |
[PATCH v6 15/16] meson: Move linux_user_ss to linux-user/ |
Date: |
Tue, 23 Nov 2021 18:37:58 +0100 |
We have no need to reference linux_user_ss outside of linux-user.
Go ahead and merge it directly into specific_ss.
Reviewed-by: Warner Losh <imp@bsdimp.com>
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 cd97b154bd..bf7af382de 100644
--- a/meson.build
+++ b/meson.build
@@ -2370,7 +2370,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()
@@ -2621,8 +2620,6 @@ subdir('linux-user')
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)
--
2.25.1
- [PATCH v6 05/16] linux-user/host/sparc64: Add safe-syscall.inc.S, (continued)
- [PATCH v6 05/16] linux-user/host/sparc64: Add safe-syscall.inc.S, Richard Henderson, 2021/11/23
- [PATCH v6 06/16] linux-user: Remove HAVE_SAFE_SYSCALL and hostdep.h, Richard Henderson, 2021/11/23
- [PATCH v6 07/16] linux-user: Rename TARGET_ERESTARTSYS to QEMU_ERESTARTSYS, Richard Henderson, 2021/11/23
- [PATCH v6 08/16] bsd-user: Rename TARGET_ERESTARTSYS to QEMU_ERESTARTSYS, Richard Henderson, 2021/11/23
- [PATCH v6 09/16] linux-user: Rename TARGET_QEMU_ESIGRETURN to QEMU_ESIGRETURN, Richard Henderson, 2021/11/23
- [PATCH v6 10/16] linux-user: Create special-errno.h, Richard Henderson, 2021/11/23
- [PATCH v6 11/16] bsd-user: Create special-errno.h, Richard Henderson, 2021/11/23
- [PATCH v6 12/16] common-user: Move safe-syscall.* from linux-user, Richard Henderson, 2021/11/23
- [PATCH v6 14/16] linux-user: Move thunk.c from top-level, Richard Henderson, 2021/11/23
- [PATCH v6 13/16] common-user: Adjust system call return on FreeBSD, Richard Henderson, 2021/11/23
- [PATCH v6 15/16] meson: Move linux_user_ss to linux-user/,
Richard Henderson <=
- [PATCH v6 16/16] meson: Move bsd_user_ss to bsd-user/, Richard Henderson, 2021/11/23