From patchwork Fri May 3 09:16:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 794363 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp642394wrr; Fri, 3 May 2024 02:18:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVNvfANuHggi2d+ioWxe5SMmKK0+d3WmoLm9vm9AEvOmw2q6B9+SW5Id4ka+umvI6+JcG6SAX8G9tzHzy2mAoyR X-Google-Smtp-Source: AGHT+IHVBOP1Plx7p2CMBOZJD/I1rpdj+1GgT/rX+u5An3iOk3lgrj5sGDrHFSrwpDx7akvL4A10 X-Received: by 2002:a25:a308:0:b0:de5:4ed6:d3f2 with SMTP id d8-20020a25a308000000b00de54ed6d3f2mr2224512ybi.20.1714727894642; Fri, 03 May 2024 02:18:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714727894; cv=none; d=google.com; s=arc-20160816; b=Lhp0btcFqtwqzXxqD2rquxuP2gtVihSfUZgOF67W+QnBubJx2KndKWAIiggfOPE3AE iPhCbn99ljyx7tCSQdWrVbKMddEYRiLiZr+Bqm95qY3Jn4MDr9nv8PFFMLG/a9anNoIt 4yaO7jdwSngXobhQivFyhXxcuygRrAiXOJt3dAigDPL9uCkydUfDypCDBdl994i09uRC y7AjzC9awobbH/hypeXnSWIecKSh2cZrhhcUEv0n8rusAB1Uh2+jqhTufY8RFAMBy3Vt 3qpiYtTwlch4gIG782Eaoeb3/bwfNuGyAYwi+90kN6WkX++ntqrRr4TrL4Vu/MB8t7hT bJjA== 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=PjIC0hzeanG/udtndv7wQlWjrcv140/3TttCqxYBKio=; fh=Wz5tv+q376m1WnuXLGinc1he4hBXyNhLC9q3oZt2ig0=; b=E6Ft0lQWswRNUDUEaIiXtQWCsK2OIfAn4fecrYPrwAOLlwTrG85UF3omKIRAqxgAgJ E5l1BmKUOGX5HPfd8ieBGhCmkz9dYMFrM1mIEOcFo78Gs906dM11K3aqIykm9a/WHUUk tRJcS9iETJ1tcZ9PBGfGUK7SOR6nHcsPcP6W+A1ByIEYIKKiUjjkDRgRHub9iXfWVpKQ 0ete9Z8SHiNQGd4qI2tGrMBWE//dYGrAgGXxr8cX0biDu9Ky5i1cDJp/v8M0JdCHn5SM FFQ/pKn3q+MB3bJ+5DDVvNBaCzoTACeyS+Q8QhUJTuAN9BS2QGC02WSWVHBUBXJSMHS6 y4qA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vyAsJSFd; 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 u18-20020a05622a14d200b0042aaa53f36dsi2930930qtx.573.2024.05.03.02.18.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2024 02:18:14 -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=vyAsJSFd; 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 1s2p2W-0001gK-TY; Fri, 03 May 2024 05:17:12 -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 1s2p2T-0001fo-QK for qemu-devel@nongnu.org; Fri, 03 May 2024 05:17:10 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2p2S-0003W2-1s for qemu-devel@nongnu.org; Fri, 03 May 2024 05:17:09 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41c7ac73fddso47135005e9.3 for ; Fri, 03 May 2024 02:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714727826; x=1715332626; darn=nongnu.org; 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=PjIC0hzeanG/udtndv7wQlWjrcv140/3TttCqxYBKio=; b=vyAsJSFdzRAB59KiGFBTE1CgT6NAo+7hWEYTEt+7+xJcGa/egpYRQs6ZUiK78nmC9A nHMKPgaap9PS6wNbTMtfePZ8+C/NgrSab8MseYZKVQl3TLgiW/rfLBVvLZ76fvi1rd91 B0wBHQRY5TV4mFfrRLXjhfO2qRvJgPfGQ5gHnmZTsy3dtjWmWDj7/EStihuBELz+26HQ Imei76ghl/CYBEgUPNUFjA0S1BbP7wghyc0pLcG+6A1Aw3Cx43hCGjSZDfZQabL5pNwc ueQ3xlcu6O2R6/5/UIqx6Btcdfnnr+dYtH9WHhYxMiffhh2AZD0bfDZTy6I1AG9vuoVi ydLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714727826; x=1715332626; 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=PjIC0hzeanG/udtndv7wQlWjrcv140/3TttCqxYBKio=; b=b20RYfTXBqx1rNcFE1rTW/ErHpxHqnBhlRpCq+rp1Ew1y7PM+01XiB77cwlVhOPDtS akazTXB+pZnH+C58fe/ynYJGkvF2p/v3JZcTqF/541omiJlw72Evg7FE6Y/gRiUepbID km4q9CkhX+baztTYkNx7zHz9EnwkRD3S8c2vWpOrLZIRNk7ElomO1hJQVW2wZAfGpC2M VgCi029z8xbfm9O8weA4qBzF0xeH/OOlitKpkpWQpoMypsdbyq0mlFd7g90wGeouv9Mk Qka0kbl51FuhurTyfvgFZC/7WToVUXdcBRkyT3CZGIjDv2ApAksDMzP2Pj5QlxSBReB/ BZwQ== X-Gm-Message-State: AOJu0Yy9J2VIRjZvPs0yUYvZhr4M9KhqwOrXDax4HMZnPeq1Fi4PmHh1 R/VoHq6PqylnmXUrS04EhFaCj5+nvZbX9xiQ8Ut+KfHOMCMFE3oPoYEgPqmqX01XgJ+MA4wV044 / X-Received: by 2002:a05:600c:1d0a:b0:41b:fa34:9e48 with SMTP id l10-20020a05600c1d0a00b0041bfa349e48mr2099286wms.30.1714727825926; Fri, 03 May 2024 02:17:05 -0700 (PDT) Received: from m1x-phil.lan ([176.176.179.187]) by smtp.gmail.com with ESMTPSA id p9-20020a05600c1d8900b0041563096e15sm8721875wms.5.2024.05.03.02.17.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 May 2024 02:17:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Warner Losh , Paolo Bonzini , Laurent Vivier , Riku Voipio , Kyle Evans , Ilya Leoshkevich , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 1/5] accel/tcg: Simplify meson.build using subdir_done() Date: Fri, 3 May 2024 11:16:53 +0200 Message-ID: <20240503091657.26468-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240503091657.26468-1-philmd@linaro.org> References: <20240503091657.26468-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 If CONFIG_TCG is not defined, skip this directory calling subdir_done(). Then since we know CONFIG_TCG is defined, we don't need to check for it. Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/meson.build | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index aef80de967..f40959436e 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -1,8 +1,11 @@ -common_ss.add(when: 'CONFIG_TCG', if_true: files( +if not config_all_accel.has_key('CONFIG_TCG') + subdir_done() +endif + +common_ss.add(files( 'cpu-exec-common.c', )) -tcg_specific_ss = ss.source_set() -tcg_specific_ss.add(files( +specific_ss.add(files( 'tcg-all.c', 'cpu-exec.c', 'tb-maint.c', @@ -11,24 +14,23 @@ tcg_specific_ss.add(files( 'translate-all.c', 'translator.c', )) -tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) -tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c')) +specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c')) if get_option('plugins') - tcg_specific_ss.add(files('plugin-gen.c')) + specific_ss.add(files('plugin-gen.c')) endif -specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) -specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files( 'cputlb.c', 'watchpoint.c', )) -system_ss.add(when: ['CONFIG_TCG'], if_true: files( +system_ss.add(files( 'icount-common.c', 'monitor.c', )) -tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( +tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files( 'tcg-accel-ops.c', 'tcg-accel-ops-mttcg.c', 'tcg-accel-ops-icount.c',