From patchwork Wed Nov 17 16:04:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 519229 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp1181103imj; Wed, 17 Nov 2021 08:17:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkV0wMok1j1mSKpqeoO2W8YGbyZQ4T5nP33VmRsCZK3+1jF6k4YDN3XLAjZt6ekoDGuzNs X-Received: by 2002:a67:d216:: with SMTP id y22mr68969669vsi.6.1637165868424; Wed, 17 Nov 2021 08:17:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637165868; cv=none; d=google.com; s=arc-20160816; b=BOTOMGQfq8VEaZQg7Q5gkug8UjIJmHFAIcON/n6haqE/ESTwPeJoqzStE8KvPi84mh 3seriYrkBVToZbfxYYZAx+RlJ85fZEny1Jxdlm98ctPL9KsIP/+OkrdWtekLSHHoESg9 UbV+0UdPAxobORW3f3ajEBIdipMFZbjZYC3a+NqKrwRYLn3d+lJ601BwS4wQYVeFJO+W tiBaikSNJQKh2/kdtypI5+AjvNpu2qF3xSX1PGv3fdngMUftUY1+bHOBs+//6Sb7NBY0 Yk+qhadRm5TyX06BnhVZFvLq5JbcjWLXAl2sPX6k4Ziq/Zc7u9NedQtbHdyE6xR/EqnV Feig== 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=u/A8dNepwkmZQUjVDq9nLnqwpFSL4s0WWo1frLw06AU=; b=pp7efPlAEqZedYPAlGW2havhxIJ6O8uOxlCAslsypBg9Hz2BeVuyuunPxP/ayIw/LK ON+DHzwBkwbaY4c6xB8I9OYpyKRJnAg2yg7t4xy62pgFBWeAMF/5yrr0cbnX1XMxvmvZ uWQNLTlp47B3kCos6TdYobO/yKQVNTWuynKsggiWmTidLElLCt1GZkwW8CAXAJTJFPW7 86+VHdbnVm+qR9tkcE+meGqzK+93Xd9qaTlIx/hRcTAOm1rBBVPhE5ZP6/OWuR7S1HXO rtdJQnM1S8cBcOZwJteJFQ4gFXfRcnVP/Fvuwh8fHiZhZvLQ8TmSjLBYkGiV69vKRknO GNEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qAzw3ecy; 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=fail (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 h9si411145vsp.95.2021.11.17.08.17.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Nov 2021 08:17:48 -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=fail header.i=@linaro.org header.s=google header.b=qAzw3ecy; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnNd5-0006qH-Sl for patch@linaro.org; Wed, 17 Nov 2021 11:17:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnNQS-0000kJ-1F for qemu-devel@nongnu.org; Wed, 17 Nov 2021 11:04:44 -0500 Received: from [2a00:1450:4864:20::434] (port=36481 helo=mail-wr1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnNQQ-00035H-JF for qemu-devel@nongnu.org; Wed, 17 Nov 2021 11:04:43 -0500 Received: by mail-wr1-x434.google.com with SMTP id s13so5688590wrb.3 for ; Wed, 17 Nov 2021 08:04:42 -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=u/A8dNepwkmZQUjVDq9nLnqwpFSL4s0WWo1frLw06AU=; b=qAzw3ecy+t2yzm5NexeiUorhWCkC7lXo96CEMAs4YRRKaod0/A1T3gDtJZ24ru/tcu Qthrcq6NKXP2gdvj6lCIWewby+sDP23yRQHKoQWp2THK208ddUygkvXUAveXab4Y1gWU 0+LISYQZJss3Db24DBypYW9/NOMsxgqp2d/RESB68SDTLeR70k5pzeTgjgg+RCtpSO+n cHLBYRK10lgY5BlkabMdPDBX+w3xPEQ3W9WHTjXs7Op+y9CFhOhDsR+XLBWxhhZP/GRo L0cORfS4cmRz5ZuHlPm3Teq6+RGM9DeJtlG6Eg4PO4Bmf8D5303Qvr8C/Kevgf+I/0pj o8bg== 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=u/A8dNepwkmZQUjVDq9nLnqwpFSL4s0WWo1frLw06AU=; b=8DJhNnecoy8Gk2D1IPl9CPWlgbSCa82x9p5Y8F+TZRz0fSlukVgWPJMnsihV4SVlUT qZkCSFrAVMifYXEwsqaKW6yuR4tMHceScUFxDOxwicruqexuzAD0KB+IhPo+cYD/1aVP DxBDuSLApohfpECRHEr5DVWgIj5tuUwA6rgYKwYJD25T7YroRwtw3ZFDn7wV4T8z5WRM Tp0BbrlvMTVcGFT3ViZQ05hoHuWBmc8/btT5xmz1GyH0Vdc4f/xmifRlDENaL4fe/ILz yPDlnknrT5RTGnCCiFNE2yz9hAT6n0n5j1/R2BtDcGRgy1FVlasY/tkFA69KCmZHBA+M mpsQ== X-Gm-Message-State: AOAM533qMC8gBFozMPYu+2FouTXy1v+PCBOldVVTkUQ/MxAoJLp4fJWK pgVW5HJM5nGcgLaRc1FEXlW/sJZZ01NZVytpZLQ= X-Received: by 2002:adf:a2de:: with SMTP id t30mr21353133wra.58.1637165081296; Wed, 17 Nov 2021 08:04:41 -0800 (PST) Received: from localhost.localdomain (101.red-176-80-44.dynamicip.rima-tde.net. [176.80.44.101]) by smtp.gmail.com with ESMTPSA id m2sm5826742wml.15.2021.11.17.08.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Nov 2021 08:04:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 16/17] meson: Move linux_user_ss to linux-user/ Date: Wed, 17 Nov 2021 17:04:11 +0100 Message-Id: <20211117160412.71563-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211117160412.71563-1-richard.henderson@linaro.org> References: <20211117160412.71563-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::434 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x434.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, PDS_HP_HELO_NORDNS=0.001, 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: laurent@vivier.eu, imp@bsdimp.com 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. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Warner Losh --- 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 @@ 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)