qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: git@xen0n.name, laurent@vivier.eu, Warner Losh <imp@bsdimp.com>
Subject: [PATCH v7 14/15] meson: Move linux_user_ss to linux-user/
Date: Mon, 13 Dec 2021 16:26:03 -0800	[thread overview]
Message-ID: <20211214002604.161983-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20211214002604.161983-1-richard.henderson@linaro.org>

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



  parent reply	other threads:[~2021-12-14  0:47 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-14  0:25 [PATCH v7 00/15] linux-user: simplify safe signal handling Richard Henderson
2021-12-14  0:25 ` [PATCH v7 01/15] linux-user: Untabify all safe-syscall.inc.S Richard Henderson
2021-12-14 15:32   ` Philippe Mathieu-Daudé
2021-12-14  0:25 ` [PATCH v7 02/15] linux-user: Move syscall error detection into safe_syscall_base Richard Henderson
2021-12-14  0:25 ` [PATCH v7 03/15] linux-user/host/mips: Add safe-syscall.inc.S Richard Henderson
2021-12-14 15:25   ` Philippe Mathieu-Daudé
2021-12-14  0:25 ` [PATCH v7 04/15] linux-user/host/sparc64: " Richard Henderson
2021-12-14 15:30   ` Philippe Mathieu-Daudé
2021-12-14 23:05     ` Richard Henderson
2021-12-14  0:25 ` [PATCH v7 05/15] linux-user: Remove HAVE_SAFE_SYSCALL and hostdep.h Richard Henderson
2021-12-14  0:25 ` [PATCH v7 06/15] linux-user: Rename TARGET_ERESTARTSYS to QEMU_ERESTARTSYS Richard Henderson
2021-12-14  0:25 ` [PATCH v7 07/15] bsd-user: " Richard Henderson
2021-12-14  0:25 ` [PATCH v7 08/15] linux-user: Rename TARGET_QEMU_ESIGRETURN to QEMU_ESIGRETURN Richard Henderson
2021-12-14 13:09   ` Philippe Mathieu-Daudé
2021-12-14  0:25 ` [PATCH v7 09/15] linux-user: Create special-errno.h Richard Henderson
2021-12-14 13:10   ` Philippe Mathieu-Daudé
2021-12-14  0:25 ` [PATCH v7 10/15] bsd-user: " Richard Henderson
2021-12-14 13:10   ` Philippe Mathieu-Daudé
2021-12-14  0:26 ` [PATCH v7 11/15] common-user: Move safe-syscall.* from linux-user Richard Henderson
2021-12-14 13:13   ` Philippe Mathieu-Daudé
2021-12-14  0:26 ` [PATCH v7 12/15] common-user: Adjust system call return on FreeBSD Richard Henderson
2021-12-14  0:26 ` [PATCH v7 13/15] linux-user: Move thunk.c from top-level Richard Henderson
2021-12-14  0:26 ` Richard Henderson [this message]
2021-12-14 13:14   ` [PATCH v7 14/15] meson: Move linux_user_ss to linux-user/ Philippe Mathieu-Daudé
2021-12-14  0:26 ` [PATCH v7 15/15] meson: Move bsd_user_ss to bsd-user/ Richard Henderson
2021-12-14  8:05 ` [PATCH v7 00/15] linux-user: simplify safe signal handling WANG Xuerui

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211214002604.161983-15-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=git@xen0n.name \
    --cc=imp@bsdimp.com \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).