From patchwork Mon Jun 5 20:15:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 689264 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp2288463wru; Mon, 5 Jun 2023 13:26:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4dW0CW+FwAsn5tDCESXwcNpPWVbjBObOCGcMRs/AB2lBGMtzcvfbJNH/gP9QkBRg3S5/OM X-Received: by 2002:a05:620a:19a1:b0:75d:517a:5b72 with SMTP id bm33-20020a05620a19a100b0075d517a5b72mr994748qkb.28.1685996800235; Mon, 05 Jun 2023 13:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685996800; cv=none; d=google.com; s=arc-20160816; b=SHnLn8Zb3wTXtAzqKOFxvOTpQp/RKwUsL7gwYvgXPB7JuQM28On7Lnw3FgfxjifeVI pF9uV38NGFuzkir8cwKpQIcsRnKJjD+Agvjz3Fa8oqhKFcCTdNLnrIHZ05ObQYyzxmjV GyJ+dE1v8igkeVT70L/abmO9s+QsCF+7Le99D7C+ql+dEatEzw7Q1CPbQkGf+l/u3ua9 14g3Dcw3S/n4Sf8S5Kq/FWd6/Nhm0Lb0LSAM+tHso10/ZIqVlHKLC78m2oGPFw59yece 2owjKd8hWe6FhBfFopDFiWvpcDDXzA3eJpZdjBdByNOrgOjnwQyzPPOvr4LRMcucFmeQ 0Lxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=cVUkf4/bpXGdLPrfKhU6xJtb3KDITtWli9I9WGefa/0=; b=uu77xauF8J37fzX+QGDKeEqtJfhlzpBTkPwk98dDYdmw0CPp96O7o8sgU2OkBz+iua zNQct0VWAkJoTTs1Ph1Zz348BXeKALIB8ZHwQcek8wN9PAiH8+7ncliHs/KpLY+VRUF/ hdMwiFDraSGxQvOwFT5Pi2sfurzbn4omV3KeaGhhvvGUXm77scaNFPxqjTG8CVcIRQ0c 8nEa94oNrpynxC+2jZ/68nwM6iAFtNsZ923dWRxyVYW5IRunXLw4I9mJn2AGBq+CwmaX SvIb5VYhEs1Bv3euli1G9aa4RlX+zMhXgd/ijT6X6pAf8uP2vfImFQ15Qgdd5zUneVfs IIFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N9mDjfNs; 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 h19-20020a37de13000000b0075b2f6649f6si4956654qkj.741.2023.06.05.13.26.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Jun 2023 13:26:40 -0700 (PDT) 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=N9mDjfNs; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6GgK-0007QH-Qf; Mon, 05 Jun 2023 16:20:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Gg9-00071c-3k for qemu-devel@nongnu.org; Mon, 05 Jun 2023 16:19:49 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6Gfv-0005nK-GH for qemu-devel@nongnu.org; Mon, 05 Jun 2023 16:19:47 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1b04949e4e9so25177415ad.3 for ; Mon, 05 Jun 2023 13:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685996373; x=1688588373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cVUkf4/bpXGdLPrfKhU6xJtb3KDITtWli9I9WGefa/0=; b=N9mDjfNsXWSz4Boafb8M0ae/2t8lbhJzNqZtX6YI6nLAyEn1Bje9SCP0a3PPdrLIim DY6JfcQY4JB1dtXxRjLOJ2252SoXP6oy3b5uDG+SexHv14iHFOoDddTI0kYSnyzq1sOV qWOZ68NEEj2UqfTlSeIWi/dEi8tKOYax//bBSey3gqI+hpMS2OKNNOmYv4vaYTmRCK12 3VdcBVwCSx/iu5X0s3w5ZLI/qIEulKpyrm6/SLk2REMUflAbbiQA6Qoa8f/WSFETYMRX S8z0M7qo1ii0fVtKGyqMnVHNO9pAxcSQw/u079EOpu+hG2yc3abLPiVFu9jYSsr20bQs 4Vbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685996373; x=1688588373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cVUkf4/bpXGdLPrfKhU6xJtb3KDITtWli9I9WGefa/0=; b=W+BbEoYPeHDR0hunmcTlZlsaEzSNJ4NJWtaoIG1+rf23Cke0cUnDDR/lgtv2d6no35 MMbcoXKfK7YmoIVSHO0JzwI2vM0psqWjTKXpujpyQi46fm5ddbcvsVHLZL1W/Q+8Gx36 cQyBLkYCvAKdytxUAytfDNYNxmiohdmAuS2U3znrW33sFWh3e5n18opoC5R1Dtz4oZI0 c2UroJfkYBG3gIuk/z6+s4Ga1hyL6Q5I+qb+0fvMMLdwhxTqXbLB8EjIpK3IdKEtwac7 4eo2mYzwUfGTVumE/6qgiys1kDvDYqxTCMHNB4UsVeH5FYZe4w5lmrMPVbJo72EJ9g78 3BuQ== X-Gm-Message-State: AC+VfDys84I6Axrg+FDRMOso6TR4a0Fo/NoKIRwgADBWZrJcF+Yzf9ck jQlM+3tZ8r7KJzxrtKjKzwD5Bzl4U4KcS1NEQEY= X-Received: by 2002:a17:903:2602:b0:1af:b049:b32e with SMTP id jd2-20020a170903260200b001afb049b32emr3550862plb.56.1685996373090; Mon, 05 Jun 2023 13:19:33 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:3f85:a600:6a3e:e465]) by smtp.gmail.com with ESMTPSA id w20-20020a170902c79400b001a980a23802sm7018184pla.111.2023.06.05.13.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 13:19:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 50/52] tcg: Build once for system and once for user-only Date: Mon, 5 Jun 2023 13:15:46 -0700 Message-Id: <20230605201548.1596865-51-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230605201548.1596865-1-richard.henderson@linaro.org> References: <20230605201548.1596865-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Create two static libraries for use by each execution mode. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/meson.build | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/tcg/meson.build b/tcg/meson.build index bdc185a485..565c60bc96 100644 --- a/tcg/meson.build +++ b/tcg/meson.build @@ -1,3 +1,7 @@ +if not get_option('tcg').allowed() + subdir_done() +endif + tcg_ss = ss.source_set() tcg_ss.add(files( @@ -14,8 +18,28 @@ tcg_ss.add(files( if get_option('tcg_interpreter') libffi = dependency('libffi', version: '>=3.0', required: true, method: 'pkg-config') - specific_ss.add(libffi) - specific_ss.add(files('tci.c')) + tcg_ss.add(libffi) + tcg_ss.add(files('tci.c')) endif -specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) +tcg_ss = tcg_ss.apply(config_host, strict: false) + +libtcg_user = static_library('tcg_user', + tcg_ss.sources() + genh, + name_suffix: 'fa', + c_args: '-DCONFIG_USER_ONLY', + build_by_default: have_user) + +tcg_user = declare_dependency(link_with: libtcg_user, + dependencies: tcg_ss.dependencies()) +user_ss.add(tcg_user) + +libtcg_softmmu = static_library('tcg_softmmu', + tcg_ss.sources() + genh, + name_suffix: 'fa', + c_args: '-DCONFIG_SOFTMMU', + build_by_default: have_system) + +tcg_softmmu = declare_dependency(link_with: libtcg_softmmu, + dependencies: tcg_ss.dependencies()) +softmmu_ss.add(tcg_softmmu)