From patchwork Mon Jul 15 21:39:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 812626 Delivered-To: patch@linaro.org Received: by 2002:a5d:42c4:0:b0:367:895a:4699 with SMTP id t4csp29336wrr; Mon, 15 Jul 2024 14:41:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX4/ZG40vP6VL7/ndIBm0cKWnvLVszjGqBbv2jNP2kPCghQPvJdYMKUyMedmyU308YaF6qVHJQgC0b+bb0PR29W X-Google-Smtp-Source: AGHT+IFHzJeTCxdpdUQLIUB1WPt4WU5JgFrd+h8P9cbvKkRWt6AB14U7ddzW6fDYK/73udDlzVKH X-Received: by 2002:a05:622a:2d2:b0:447:f4e0:8d11 with SMTP id d75a77b69052e-44f7ac36a0emr5834601cf.29.1721079661690; Mon, 15 Jul 2024 14:41:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721079661; cv=none; d=google.com; s=arc-20160816; b=WfvWKV9xP1yH0kCsHE7wGuTqaWp8sEPbnArA4Fe1gdqTtSH/rAvbEFLvDvvoNcv4oE /AM5jjmfomSQHI5/dm41UDbTTx4gU2DT+46g0YA08qywYqCIQNsqnqeEpCbYDVZqPqoA kP8h0EVnlH3nQ0VnoS+zTW6R6NrZaxKrbGfHY7V7nufrcl86k7RteZfjp4JRdyUEihox CNYMeIJheYx6TEzFI7Gx1ScFiJkyuFk/UdnAZlWwbc5rOAbLq3B98XsInFruPfiRaiDB nl4pTREBYyehNIVTvsyrhisF2whtRfMTfD4FHU9hoYK/sB5ptpr9D5kHLpcNf2YTF/8h OIsA== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=LKnr340UTev84mGh5T6HxSF9s3tgt/IdANDbkIjASfM=; fh=cD1v5eGsmZrd+3bscGrR93z7fDl/AlaeH55RlUBzRys=; b=H00dUcuGDupteCkhAkgw8pZsAkMSOwCnys3wfFvo+3RNFOb13lkIzG9OWTGEQD6AuF SLEGoR17U0m36xYfVFYM24xa6FnKvn4IkiKotX7Am0sen60mgkpP7DUeg38KvgCfTOvw fJ6mgcezovXAzj1uU0ekjh2IfKnWFGdE5rMTWm5o3PLo8nxaImEi2x8RBSHY63V+JmSh VuEtTCFFohkcKwwfVUshNqcpjgZmEnTTJiXAunl8oCMrDeh+vqyhlFCOyBq5KmlLGW9q ppDg9tWKwVXiahUbwvG9PvjAm78NzP8cQfGj/CZC8bddOQTB0+hzbm8uuDrE1f6djr4G Y8MQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PAAzRaVN; 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 d75a77b69052e-44f5b8068aesi62025241cf.470.2024.07.15.14.41.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jul 2024 14:41:01 -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=PAAzRaVN; 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 1sTTQN-0003Oo-BH; Mon, 15 Jul 2024 17:39:59 -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 1sTTQJ-0003Nd-Ms for qemu-devel@nongnu.org; Mon, 15 Jul 2024 17:39:56 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sTTQI-0000KP-8L for qemu-devel@nongnu.org; Mon, 15 Jul 2024 17:39:55 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2ca8dfa2cceso3114792a91.2 for ; Mon, 15 Jul 2024 14:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721079590; x=1721684390; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LKnr340UTev84mGh5T6HxSF9s3tgt/IdANDbkIjASfM=; b=PAAzRaVN5RzsurTEu1QN4XOST4dptXUKyH/H1aI3/Ycna5KyJdghiFgDmrdESjA8NZ 77qi8fV/1hRzIPgee/V8eJGLQuNQgT7+n1yhF10Gk0d89rJC4ifqeHNAGoyUyr9txlBT hD9Zj6dhcUduawyTcenlDSflcE5YcAPm3t9t/ujCz5NsRz8K7dFafJh5Brg/9vL/0p9D h5TaTXxnNGvXzPqvwMMNrPHP99pLpukSh7D8YFqW35DRV2qtdG/EEXPdStz/uv8S88r1 7Kr66dUJNC1gkSjlMadqQJ53FHdcyjj/EaHaB3Mi6VgPi06MN6UqhQyqrr0LbWp7ijjE bTSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721079590; x=1721684390; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LKnr340UTev84mGh5T6HxSF9s3tgt/IdANDbkIjASfM=; b=Lx1SHAcCQZWSti2gkbxKFjoSyZvXZykdE7F8tlb8CVIW/Pqj4l2ospDvZhivk5+GRA d1ZCugKkNsmdYu6AiDadcLmJpilMf3LDidXHNVxMjw3NcrHcbWfQgKRR+i+xPIfAOLWq PQ75p6HCdeUPCJyqYIBgMd6o6GmWKUPEQ46kDhWzjRTVJbcO+PevAQwn+iD7K1C6zdrH /Lb+RCYsD7huqidkQGbtqxwUO6aAWiAnbjO06w5cAZ9mh5Qdc32PPSYEseOHcjdC5dAd lgYV5N/4Oz7A/sW4SEe9wvzpiKmUYQJDgyeo0YJPT1AXbZi7V8SSC0mFEP66I8HXUTDc 5iYA== X-Gm-Message-State: AOJu0YwSHUKdRZQMdBK2HjS1uMLKZgBT2y9reICop4KPKGy2/mfoHx7g Jtu1LbPIsgY/DI7OiR67Jf0cx1U5RQ+vBTNAC60QPMLPitmBj377jeHBLXSu4CmScNFxBUo6P/1 s X-Received: by 2002:a17:90a:d48a:b0:2c9:98bb:b9fb with SMTP id 98e67ed59e1d1-2cb373e87ecmr129957a91.10.1721079590428; Mon, 15 Jul 2024 14:39:50 -0700 (PDT) Received: from amd.. ([2804:7f0:b402:41f1:3e7c:3fff:fe7a:e83b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2caedc92c0dsm4861138a91.41.2024.07.15.14.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 14:39:49 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: alex.bennee@linaro.org, gustavo.romero@linaro.org Subject: [PATCH] disas: Fix build against Capstone v6 Date: Mon, 15 Jul 2024 21:39:43 +0000 Message-Id: <20240715213943.1210355-1-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=gustavo.romero@linaro.org; helo=mail-pj1-x1035.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 Capstone v6 made major changes, such as renaming for AArch64, which broke programs using the old headers, like QEMU. However, Capstone v6 provides the CAPSTONE_AARCH64_COMPAT_HEADER compatibility definition allowing to build against v6 with the old definitions, so fix the QEMU build using it. We can lift that definition and switch to the new naming once our supported distros have Capstone v6 in place. Signed-off-by: Gustavo Romero Suggested-by: Peter Maydell Reviewed-by: Richard Henderson --- include/disas/capstone.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/disas/capstone.h b/include/disas/capstone.h index e29068dd97..a11985151d 100644 --- a/include/disas/capstone.h +++ b/include/disas/capstone.h @@ -3,6 +3,7 @@ #ifdef CONFIG_CAPSTONE +#define CAPSTONE_AARCH64_COMPAT_HEADER #include #else