From patchwork Fri Dec 30 00:01:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 637823 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3179366pvb; Thu, 29 Dec 2022 16:08:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXuQLjYdbDVX94lQRD3tlWJix9bLgLL4TPFndaNbBK3XXs38+9yBAdTRlgAELp5WiVlH6w9E X-Received: by 2002:a67:f1d6:0:b0:3cb:54f1:d813 with SMTP id v22-20020a67f1d6000000b003cb54f1d813mr1843690vsm.15.1672358939546; Thu, 29 Dec 2022 16:08:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672358939; cv=none; d=google.com; s=arc-20160816; b=pvqbBGYGxcWSeeg2A8dMthGS7m4pyi3nzCNm3/n4gSforR7ibrvl9Nef0asHQN1cL3 TAzm9CPqvQqMMH2ywqRkb8F025ABFCEhnZ4VgIY8DBCGFyaGfjWqqE76ffwS+K+Pq56A Lzg4BlewcQ3jlQAr3ZJ8eSULVXY8K2iyYlsk2+HR/CwkmwgjL3Phlc26j7V/iZ2JKt+C S0T4pTlBRq3cj/7Vr/6gnD9VM94e76Jhnxue61CY2X30PUV8Mbn0ynpS0S6Hub04QlCH Qr4Bpar5QiZIXjxqVCvhlJsm+zaujhIH5laooyqa1FGdrFGRgM6YGz7Qgu3fGCcLK+ej dxpw== 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=ZuFGBK7oJk/EujTjAqZpKzYL125RUa7EsoUz7ySoMMg=; b=pmYuWN2JXqynpjH7U+rFA8wVGg7hvm28N/od8IGLQUCqgK0bqgcO3UieCqWarix1fk euhkV3rFUWqOsEc67ePOzTvRgEpJgXmeJl3kM8et87/mW9fNUTAnM/N/K+X8VjIMo1Mm 63Y4pzZipNGVQ6Ls8qSpU/cSQEoYSEt/acW2/1tmnThyeGwwkHjKL0IjgfdOI/zKX1Vw 1FF7th1MwagPdGMewNwO4AZoy6m0zVrdAMSIwE1trO7lRdz9yRUKmdirw4+JZbTxavIx pMlYTwDeQPT4y+LOuMAz1IZlUt5cuZR8i2FUKa8K9RCoYwb63cBNZP+bcKrDgb2nVHTe EhFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JUeTMVSh; 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 c63-20020a37b342000000b007049d89b10dsi8337941qkf.359.2022.12.29.16.08.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Dec 2022 16:08:59 -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=JUeTMVSh; 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 1pB2r4-0002y9-EW; Thu, 29 Dec 2022 19:02:34 -0500 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 1pB2r1-0002x9-22 for qemu-devel@nongnu.org; Thu, 29 Dec 2022 19:02:31 -0500 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pB2qz-0002f8-9X for qemu-devel@nongnu.org; Thu, 29 Dec 2022 19:02:30 -0500 Received: by mail-pj1-x102f.google.com with SMTP id v13-20020a17090a6b0d00b00219c3be9830so20259516pjj.4 for ; Thu, 29 Dec 2022 16:02:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=ZuFGBK7oJk/EujTjAqZpKzYL125RUa7EsoUz7ySoMMg=; b=JUeTMVSh89J0bs6ghmWp6xkedSFwV/PnfXJWzRnWOymowYlOg6KE9u28WzKz1XWE8b Ha6tTeUjf4dvU7IEcbQqMG2D+dBAt/JtTvQ1v643Pzh9Mg7N475KzGCNgAJ7zWn3XtWn 2E26m7jqiporFWeR9SSOKfoqAvUQDeEdhrGY7dtSDaAWmzzMlMvji4rWpoml9vwNb3K5 EmYjuj78Lo9dxkbZHSGC2yn49XLK8HxEy6xz9LY+/IJtleryVTu9m6z04q6wrVPjPW4V oRVzgLB+j9quoFCPt0chyKKsnnikcKuC4tlX6f8/l798ngWI3b4DfgeL9OghwMzgmCMQ qC/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=ZuFGBK7oJk/EujTjAqZpKzYL125RUa7EsoUz7ySoMMg=; b=B2cBGMUwbrgeFZqxgr/ovHWw7L6b61wwUeWGONrNUDZ3xXexifsfCofkQiUWTwoc6D B3Odu9V46vfGB59WrgpIcudWhDhjC5TI2ExuRaI7xpZGlaTbu+LCws2sL9QQaHiyHg9a 7xPmq/OV4DQMtf7ltO5leZjn2GHdTFFHW+7/0wlIOMYkL3GMsdRRn8xmiAJs23S0oLpf CswFO7BW543f1ZYDCLtaI3fdIJETQvlnR+zxtNU1oBhxs5moc/ssmzYpcZ2GrFMpoEZY xPWqn7GfxR1zL6fh9/ugz0Qe2q6QO0j7FyugQab7TONGB9Zqu/664BXSScbXVAORuFs0 PXzQ== X-Gm-Message-State: AFqh2kpnyF1JtmCxr67JcEQ33YoYAyyhbuWcSEYvrDais2e/Z+IOZqal jMIzI+CCcavnwvOCU540Zmlp08iAYWVAXSsn X-Received: by 2002:a17:903:186:b0:188:d2b3:26c1 with SMTP id z6-20020a170903018600b00188d2b326c1mr41051776plg.10.1672358544947; Thu, 29 Dec 2022 16:02:24 -0800 (PST) Received: from stoup.. (76-14-210-194.or.wavecable.com. [76.14.210.194]) by smtp.gmail.com with ESMTPSA id j14-20020a170903028e00b00192849e1d0asm7343953plr.116.2022.12.29.16.02.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 16:02:24 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 02/47] meson: Move CONFIG_TCG_INTERPRETER to config_host Date: Thu, 29 Dec 2022 16:01:36 -0800 Message-Id: <20221230000221.2764875-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221230000221.2764875-1-richard.henderson@linaro.org> References: <20221230000221.2764875-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 Like CONFIG_TCG, the enabled method of execution is a host property not a guest property. This exposes the define to compile-once files. Acked-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 4c6f8a674a..14e3eba227 100644 --- a/meson.build +++ b/meson.build @@ -469,6 +469,7 @@ if get_option('tcg').allowed() endif if get_option('tcg_interpreter') tcg_arch = 'tci' + config_host += { 'CONFIG_TCG_INTERPRETER': 'y' } elif host_arch == 'x86_64' tcg_arch = 'i386' elif host_arch == 'ppc64' @@ -2545,9 +2546,6 @@ foreach target : target_dirs if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, []) config_target += { sym: 'y' } config_all += { sym: 'y' } - if sym == 'CONFIG_TCG' and tcg_arch == 'tci' - config_target += { 'CONFIG_TCG_INTERPRETER': 'y' } - endif if target in modular_tcg config_target += { 'CONFIG_TCG_MODULAR': 'y' } else