From patchwork Mon Feb 27 12:36:45 2023 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: 656966 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2326838wrb; Mon, 27 Feb 2023 04:41:06 -0800 (PST) X-Google-Smtp-Source: AK7set/jXzc+KBaamxeYO6qi9tmOp1nCDNR4qxVJj3cEPKYEA+W9PshaqDj2+WWn9tcjCfg7qeoy X-Received: by 2002:ac8:5807:0:b0:3bd:1a8a:800b with SMTP id g7-20020ac85807000000b003bd1a8a800bmr45263245qtg.62.1677501666737; Mon, 27 Feb 2023 04:41:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677501666; cv=none; d=google.com; s=arc-20160816; b=tvjbwAFw3RV8Pg9/4F7U97hUM49E1p/Bj3dV0j3CkohpLtWKIZZt7aXyexxjqptsbw 7lJ0LEB/IwHYT0rsIufqZveg8MpFT6sK1IBgQTbEuURzZDRZaFNeUvBg8azQK3yuBpWe 4/zTVIrZVY2kpxNQDi7Eig0Ql/TTsC9cg9zBwUsPE9CNC4wX3UsbzM3he0vDAVZHisRP sL5p9wAZKX6BEIO0MigjcWBOwL7nI4CA2SAq3GBYc3qEFoXeMBHWYYU4MYgsA5G4pfHW tF5HdaqN18AmX0Dx1xsea/BOJg+ujNwEEHi8wXZd2u66fXM+BJMqnALy+1bowaEGwKo0 jhnA== 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=iLI4il3NN0+GV7Y2sSjTCTRrXRt+7nkyb0DHkXyrIEk=; b=T/Vd+RvWeviYGqdL6Lm4p/kFF2MYHZH4G8M/mz12o6/7kJEyZMyT3uLlo0yVfpin8l /mmMm+dHVoFr2VhKZpRqhsHba5zNrBrxLPdWawTN+ULaeDTuecL8zgPTQByF/SXE2Sxb 74kdc5j2h8GkTdr87Y5DQjZwzpRhmzIwb43yTt+tsSxRk2Alv3JK2ptwtLJhHh1UskHf E2tEpWqVmhL1BnBxyoD/e3Xr6EL2Ob5s5etXUk51SgnXGx7CHTcxCMcPHcrhKatKqCS7 ZjuSjZmOEqxSn9Q+VCiyvgwQh4i+1OIfA7zdLos1BFB0CkQ8KA9bnZkiLzg0hJMVyLdX /bjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FLUa5Efv; 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 s10-20020a05620a254a00b0073b2249353asi6038652qko.673.2023.02.27.04.41.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2023 04:41:06 -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=FLUa5Efv; 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 1pWcme-0002Hq-W8; Mon, 27 Feb 2023 07:39:13 -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 1pWcmT-0002Ed-Bs for qemu-devel@nongnu.org; Mon, 27 Feb 2023 07:39:02 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWcmR-00018F-9y for qemu-devel@nongnu.org; Mon, 27 Feb 2023 07:39:00 -0500 Received: by mail-wr1-x42c.google.com with SMTP id l1so2998229wry.12 for ; Mon, 27 Feb 2023 04:38:58 -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=iLI4il3NN0+GV7Y2sSjTCTRrXRt+7nkyb0DHkXyrIEk=; b=FLUa5Efvj7qHZauBQcYNUf1hO4b3C7hLGkfPMsKTHnOFZr9joan7qvc32HfX4q7hJM 2OxKPqKvOs2KVM9NMoCBGAvkkjRyzfG6U22K+BhB9FfKFKLiNnZ2ZJVPFq/7/JKQWifI lWTAAFtMCghez/eBpDxBlx3xTi+BYwIrRGkPqFqvKuTDa9OxV9LmY3BH2/S3+Fa6Ggg/ zs76xT/Zm4GQLQha75bmo5tgJmIyuSshvXVRSSLJ1CZEeFw6Or+hexgdbEbvQ0eFBDe3 39mM8C6WJPeBvwFB8Nf/0nkUhcNBMjcrT2v/Bd0eQ8+pFzCSGgX6sJ2RLDeAYnwBbqri R3XA== 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=iLI4il3NN0+GV7Y2sSjTCTRrXRt+7nkyb0DHkXyrIEk=; b=KgLJ7vUqHuOxaCZ19OMs05Cl8nGAjf+xBKNoKd33om8yf4pwKoM1ylKEXCPn2K/orb LKg1SRjPjK5+66RVQAjmnbSnzjTLQzOiKWILBcQIlvUrZfOLwK1DJ9gqRWxWMwlbk9KE 3nOxmFLRNwMFASPuQB3y1AjjN71i1GuiFGad1b6AdlxLt9H3Em9wn/oE6QoVHbF+AOK/ IGdSz+sIJ1WPAVs0adr21C1ymiExQfDU+GHMWYPDaAlZ3E7TeFte6nMznV+Zqgumd0r4 oqNoDzQTX7aJ+1tycQpZup48fMGMbmQLUeC4Egn3MBfoax+kF9QorTsxn2cN2YFDDayS 21jg== X-Gm-Message-State: AO0yUKUZoC63SwAJqvESavusM5mXwlFesNUXRFmQL6bRqWIHPKage4N3 qv8Jp+NJuyV4ePnnJaof/lwXQCDEbM7OUoTy X-Received: by 2002:a05:6000:1046:b0:2ca:e4ac:5089 with SMTP id c6-20020a056000104600b002cae4ac5089mr3381336wrx.30.1677501537555; Mon, 27 Feb 2023 04:38:57 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id f7-20020adffcc7000000b002c7163660a9sm7178752wrs.105.2023.02.27.04.38.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Feb 2023 04:38:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Peter Maydell , John Snow , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Marc?= =?utf-8?q?-Andr=C3=A9_Lureau?= , =?utf-8?q?Dan?= =?utf-8?q?iel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PULL 001/123] cpu: Remove capstone meson dependency Date: Mon, 27 Feb 2023 13:36:45 +0100 Message-Id: <20230227123847.27110-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230227123847.27110-1-philmd@linaro.org> References: <20230227123847.27110-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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 Only disas.c requires capstone CFLAGS, not cpu.c. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau Message-Id: <20221130135241.85060-2-philmd@linaro.org> --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 6cb2b1a42f..77d2ae87e4 100644 --- a/meson.build +++ b/meson.build @@ -3140,11 +3140,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: