From patchwork Tue Dec 14 00:26:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 523668 Delivered-To: patch@linaro.org Received: by 2002:a05:6e04:2287:0:0:0:0 with SMTP id bl7csp6833530imb; Mon, 13 Dec 2021 16:47:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHZLhRprW704Lz3a9dEEvNW0mjjq4cFDDkdA3bJm+NwTV4O3AfifD0F7vmAnYCpHTMFMwJ X-Received: by 2002:ac8:7f09:: with SMTP id f9mr2276626qtk.163.1639442827186; Mon, 13 Dec 2021 16:47:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639442827; cv=none; d=google.com; s=arc-20160816; b=g6DUUKkFYQg2TdudViANyFTlYoN+htVUMxJ+K1SuhhvzRqhIqd0m4YRhE+BBuZsm16 R7sMmVU+hpZCWTVLl5gCo6ddg6WeIoSt6OuJO354V0yPpVmIRP5HYwYeMe725looruQg DtDsyQe3jcoarOOQFVvbuhL81XMNWQWAfQHsUB88LgXg5wyeRdNarg89dn6lpTDAutT/ ML8ZNODq/GpwqNisMSYRj/kRY91v3Ps8n8jAdEh9QN4agaqdqFICsMr9js506MDzt9FF UsliubL518AK1keHHz/0OTlb28FpO45QPnkgL0KniaJt66kdXtsW57zY1UWPoJ3dcfIN bENQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BZTFEWkCcq7QoVstw7Mtl+bBngHaigSh+UQzae6el5A=; b=qJARFGG6X693KZ7+dgn6WzFFjDKSNH7OJkQ5L/biVREfHVmrWikFOTwEpA9gnbxXXA x2WtNttqUyJaQ32RPzXrFRq4yaw1gobcwyH/XqE8v4WnI6pUiRSXtG1yh3Trc4PxOcVA 4vW/1cAHCclkQ/1HuSGhIK7PmLhDHrYXd7P0dTZ728ZTj0WkStk8sr8iRjouuMhLaZEv ztSsptpCwyhdxiuvhZ9J58S926qEXVjeNoE5XSYMEFn83euHKZri/Mbs23wssGxnUtTO xFFcAHpCPN617DAPbnbP4kAa+mz+6nbb3MdBX2JWB1njrhg2foZHu/UmDbdvwonctjky dF8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EVkZTRp6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ke7si12879079qvb.113.2021.12.13.16.47.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Dec 2021 16:47:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EVkZTRp6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwvyE-0000HA-N4 for patch@linaro.org; Mon, 13 Dec 2021 19:47:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwveD-0008Nc-Bl for qemu-devel@nongnu.org; Mon, 13 Dec 2021 19:26:25 -0500 Received: from [2607:f8b0:4864:20::102d] (port=41695 helo=mail-pj1-x102d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwve9-0005Tg-KJ for qemu-devel@nongnu.org; Mon, 13 Dec 2021 19:26:25 -0500 Received: by mail-pj1-x102d.google.com with SMTP id gx15-20020a17090b124f00b001a695f3734aso14761111pjb.0 for ; Mon, 13 Dec 2021 16:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BZTFEWkCcq7QoVstw7Mtl+bBngHaigSh+UQzae6el5A=; b=EVkZTRp6QchOFwzbG5utVxrpA3Z4rkRIW0deCBoQwjiozSoAByEaHvfsrzWKNj2gYC z/R2+6AbYqxyCK58I2YTzrAkz7jloEZnls7Zjq/Xs/0ZEj9vtHzduIgKCYpgZAAe5gvC V9U5M5Dz96yPraRBH0uySBUKYPDnrVQBw396EHHXPvmmemD57GbmpiayAC4m+MRbNS2v mtjYeS/1f2Z5kWZqAlLABzsKyZIiRiKu8DSsNK5NYEPRF6MH+4Jphe2JNMB5fUeLmZJE RA32b+FG0qdNmvxFGwPpBiljFe4DKHbF9kweas7cxOCZYEJscBA6Z5ofa0z17gwIb5f1 Sy6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BZTFEWkCcq7QoVstw7Mtl+bBngHaigSh+UQzae6el5A=; b=xDBNlbtKY0V90/Vjef5n9v8OEAA72F55RnX0Lp0JH+b35YXLKzNm3Fe9deXcSjBjaj P6T9+xOcweL/QP0/sucLrmG4BCUiOSyeIIdec1f31YBLpP94Gs8u69G6M0XbabBiOy5P fAEbnVv12ziN7/3uxO45rydS1c+2LfrvB5DLuDU09jdB47p3fRYGXnnGLfUJnI3n9iSs iFZW3iOeA7CiYD/8uJ9c5q2XCbmN1mrl2B9x0i2ywFz4R05XS6S1r8D150OvPQ6+1u+D zSpkr/U4Fq0cKfBV/d/qAs79zqFVYAtiaJAeuXiDbKBIibHIEyTrQGQrN8LElux4UF0v +jxg== X-Gm-Message-State: AOAM533z3IkauFSWzP0Wi/Z+oY7W+85te/lvSDE30C46+YhsPkVhiQbQ nDck/PPfhccdGKeOfvxAAscoXQ0TZyGGzA== X-Received: by 2002:a17:903:22cc:b0:142:d31:bd9 with SMTP id y12-20020a17090322cc00b001420d310bd9mr1665495plg.64.1639441579331; Mon, 13 Dec 2021 16:26:19 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id w7sm11320253pgo.56.2021.12.13.16.26.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 16:26:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 14/15] meson: Move linux_user_ss to linux-user/ Date: Mon, 13 Dec 2021 16:26:03 -0800 Message-Id: <20211214002604.161983-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214002604.161983-1-richard.henderson@linaro.org> References: <20211214002604.161983-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: git@xen0n.name, laurent@vivier.eu, Warner Losh Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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)