From patchwork Wed Nov 30 13:52:37 2022 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: 629480 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp872511pvb; Wed, 30 Nov 2022 05:53:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf63/UvJST8o6JFoVI5WPcBYbGFmOpdnLYJFqDNr8fnPTMbIbW8dfcbdYF5yrU5pCXPlhS2G X-Received: by 2002:a05:620a:2728:b0:6fa:1d3b:fa74 with SMTP id b40-20020a05620a272800b006fa1d3bfa74mr54637331qkp.123.1669816430803; Wed, 30 Nov 2022 05:53:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669816430; cv=none; d=google.com; s=arc-20160816; b=B9Q2GnJwZ/3I5NFjx61IKJSR6lvvZ1J1hmFeH/Jp4VMvDeyMrmWKR+L9oWFRfoJ0KJ v3HvgSq0QU0FhRW4kE5sb9owo6vOVr4cAa8kk7r5vdwOvRj09gLVRRYYQ6Zjnim7PmN0 sBXsaC2ais1rEPoytfiPOW4VnKL3PJShAAKC0qAW3+GoLBn/qJe1rsb7lh/exPnoDjwP 3tyOEcl56IjhjBmoB8SNR0fYiDY0QRPlSpuym+tvuvs7GYX8xnH5uNsj3PFzgLgB3iZO EzTfRugBD4KM94TTBgTSz1jDNMvSBhKJHmQCxyk2UoFBgSyTbSn/m8O5T9BljwHMNbRk eCdA== 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=oOTQltOdTxtnQ/3wWM8lgpKU0ST3q4Ht7vQjM64PuTE=; b=j0/lj1PgrxhjuOecq/3zHUKOM3zI+76Tytnnqh5QGWrHdc0A9/k/SubRb7y6i4NM63 s07h7nG7+ve3/cbMIvyFuC8NUE8iL1nE1Rzesg3320IPv2y350K19Rc87BLoof+3H1DB /gdrOj4YH47VdC8jplwm8oY/AHFVa0LeWToXX1TtXL9fgW6Cb5XPTxfpPs3NbLeQm53r Aj6g/UxEjn1+U0t+FFe4UwAUbezQQNcP/k0XGL+jWcTAs2+Kiw/R80HZjWn9Ri+oUs7X 5YIhoWpG+dAkp+NlEWI53SCxevQI094td/yG02QdxsDwMyHtFyKDhNJHySGAhlwpHSy4 przg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xKB9jpvI; 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 u14-20020a05620a0c4e00b006fc25c4b1e6si880337qki.348.2022.11.30.05.53.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Nov 2022 05:53:50 -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=xKB9jpvI; 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 1p0NWt-0004pM-QI; Wed, 30 Nov 2022 08:53:39 -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 1p0NWp-0004lx-MZ for qemu-devel@nongnu.org; Wed, 30 Nov 2022 08:53:35 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p0NWi-0003bY-Vi for qemu-devel@nongnu.org; Wed, 30 Nov 2022 08:53:35 -0500 Received: by mail-wr1-x42d.google.com with SMTP id z4so27227120wrr.3 for ; Wed, 30 Nov 2022 05:52:50 -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=oOTQltOdTxtnQ/3wWM8lgpKU0ST3q4Ht7vQjM64PuTE=; b=xKB9jpvIH26ooj6X1ObxsqHtEJAdFPHxaUalDlqUf7ikQXQVmAwoaJZOf3PJSnWADm vi3aP0hlaUbiTooJ3P+8RHIGr9/ffPE9rDQQk3Lu9RXP3YuEQw+PpLulC+sJQtqRukK0 37/9D6T0CGm/1Jy9cmHR69MmJV8R6xTIhFqqHyW6KNzMnCMX3B6f5VUmhERSUARYvidr KtzMvNLxXrj8zjczUw6yNmSbI1lxeEt3jdAKnC3By8uYDF5kQCAxLTdYSF2Xe5TeYWnu 7QgqVsprSi+D/K3VfjGAsX52uCllDGHBaNLgxL7OYxRnMyE9pTZyAxT+LWyqpoydn9lB nHoQ== 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=oOTQltOdTxtnQ/3wWM8lgpKU0ST3q4Ht7vQjM64PuTE=; b=o+uW8zaKiXNKnIjPaXSTfuosm6khl7eOz6vewKHNoSneMF26GpeRloSx8mdpAC3PaU 9YqDQdN1pdAXsyiM7gMYCj6mNC65PJWX03M8kdA+S5GHMgxfl/r3aC7zfZubWXkl8KaV DZaUJpF4/MPTlda+cPs6dTdGD5CLxUSIfZC2sh2Ei4HRMT9y2SAOIzGdEhbWKhAxIkpK mr9Wel09z9fDnGvqo45ljTiZXoShAyaB8Y+F2RRvI4Q7AadvQ8FWv5Mp20NknHeIvlI2 tjEzaC6lIAG8GIeaTzC92+NoVjZxxiC0rWrv0b3v1wurlIOzUP027amH0gN3vevEQVWk mWZA== X-Gm-Message-State: ANoB5pn/9ekqQ2kLnHcNTZStXTHFN4GKGyXGa0u0Tt2mrpVD+lmfAdau 98aj+dPpD2GrZO8f0zHROmEiDA8MI2U3AR3I X-Received: by 2002:adf:eb8a:0:b0:22e:31b2:ecb9 with SMTP id t10-20020adfeb8a000000b0022e31b2ecb9mr38594604wrn.693.1669816369110; Wed, 30 Nov 2022 05:52:49 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id n29-20020a05600c3b9d00b003c21ba7d7d6sm2402263wms.44.2022.11.30.05.52.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Nov 2022 05:52:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , Paolo Bonzini , Yanan Wang , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Marcel Apfelbaum , Thomas Huth Subject: [PATCH-for-8.0 1/5] cpu: Remove capstone meson dependency Date: Wed, 30 Nov 2022 14:52:37 +0100 Message-Id: <20221130135241.85060-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221130135241.85060-1-philmd@linaro.org> References: <20221130135241.85060-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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, T_SPF_TEMPERROR=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 Only disas.c requires capstone CFLAGS, not cpu.c. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5c6b5a1c75..92d449f854 100644 --- a/meson.build +++ b/meson.build @@ -3097,11 +3097,12 @@ if have_block endif common_ss.add(files('cpus-common.c')) +specific_ss.add(files('cpu.c')) subdir('softmmu') common_ss.add(capstone) -specific_ss.add(files('cpu.c', 'disas.c'), capstone) +specific_ss.add(files('disas.c'), capstone) # Work around a gcc bug/misfeature wherein constant propagation looks # through an alias: