From patchwork Tue Nov 5 11:19:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 840777 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1ace:b0:37d:45d0:187 with SMTP id i14csp286011wry; Tue, 5 Nov 2024 03:22:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVWSeBxPqIwxCxkGSFYN5A9Q+7Mj7MryNQnV6xIPfA2LGjAfRbx8sGAkFZK/jGM1wt72FKWNw==@linaro.org X-Google-Smtp-Source: AGHT+IHC3eEA1N5LXbqHdFof6YLmZVo1EEOF8qpVOmDWBcbG5QEed7FGV3uC77IHZDzyQTQ3zSeZ X-Received: by 2002:a05:620a:1793:b0:79f:67b:4fdc with SMTP id af79cd13be357-7b2fb9582cemr2114842785a.2.1730805776094; Tue, 05 Nov 2024 03:22:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1730805776; cv=none; d=google.com; s=arc-20240605; b=XnNvLQJvQvT7GaTgTkacHmWly04tFB0JcRTwbcY5I0pyD/WgGUE39hPhVqmLUVTpWz OYnWNPaSxwW5DzvStVNZVDRKHAwEEBmcov+bmn2bJlftaWQJE4gvwqpMgkJ9NQ+TuuKc UMGYynKNI944oyPDw0n3jcRjdeiykzV8DQYihu1IvOxB3fOE12qS1C71KkRK1VJ4KKAL ZDAxoqwEheDJxodUdhT8Ns26QbulEZhldKo2guklsK/dmQC7B02EXM1kpMtYpdVNj3We UMq0w3LzkbSndCqoNgWBAATPw6CVin4F02602S3ENgqxSxl3WDgR2vPcC6+Fb8z+TTgj K+eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=9Pvdl2amKi4XsrvVH6yACE3VgtWiyqVuGZb0GDfDjII=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=E7zRQeNdTmk4Clx6m2jaRRfmxBQ/Cw24WlQshTn5btVKU8MfEbYRDOXTcBSxblRBP5 UA9zu8DelKOEAOQS085NLjwmKpdnStEGBgKNkB9NhzrE8pusVFNlL3zpwG22dNzfAlxQ d97uIXB5UxRb0HEkhvCukiQAXMqgEcpTwvy6yvvS2K+aTHAxZ9Q9FsUkzYYLhXu5EVTO XFrPMxG+1iw9NPMFPJQY5hqgFZHKLLckkei6r2sHplWRL0u98QnjrKHB7CaFCcyqbL3Z nwHIsuecbSMAZ6kH7NOUnV3bKNzcNMfNaDKim8O8Eb101pMj5BGw50mSTEYsrh/rWHJf fnYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C96jLdK7; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b2f8d88c6esi1198741185a.308.2024.11.05.03.22.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Nov 2024 03:22:56 -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=C96jLdK7; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8HbX-0004cz-3s; Tue, 05 Nov 2024 06:20:11 -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 1t8HbS-0004aN-TF for qemu-devel@nongnu.org; Tue, 05 Nov 2024 06:20:06 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t8HbH-00078A-NJ for qemu-devel@nongnu.org; Tue, 05 Nov 2024 06:20:06 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4315c1c7392so47101845e9.1 for ; Tue, 05 Nov 2024 03:19:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730805592; x=1731410392; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9Pvdl2amKi4XsrvVH6yACE3VgtWiyqVuGZb0GDfDjII=; b=C96jLdK7ftOa9Wf7c8DBQOYFuIvOmOcUxq3AQmXYtzETrJErI0VPm5bCzYQwirVala uWmdJDCq+YVREQ9OLQ2BG5+FabVhNiGzQ+jkEFlXsX3K1e57K8Z48kRkWf92QKLV3lqg cAF1QKPHkTbaDtxYsg47dSDX6lENMCRVDZP9c0LUSjeHAbOPz0k+Wqn2vHqCWYvefu+s zyrnM2LVOXoeCdx1o7fzqrkPbQ3DMArMgwaNN8q42OP/RCUbf8dBoPS5RsTuGpIujQUB tiW9Ag4zN7djw1MqI7nbzyDosGrOzFkVUCV98jnZgXqsMkAXYz3gtzKA0x/TxJAHy0F9 DRbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730805592; x=1731410392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Pvdl2amKi4XsrvVH6yACE3VgtWiyqVuGZb0GDfDjII=; b=rNEAPigebajnaEfs7SdpzglLzoGa78OkLI/1ZuFUvNO94JGx1AL9CVzd8TpBsSD6sT 98vRX/L7a9K8RkIKHP+X+xgUMobc4rbjIjACFcthN2hv+pyKKb9n3yxzbTaWFTXNb+Pv 3PYr10fuXzq2xzR7VT/+OiLjN17AUDWj87wJzcQiPfdZmgCfwW7xtL6RpCze4808xKd5 g1HhpA62oZS9z8u4yAC5YsIFr06ZG4F+ly2Yad4k3iOxnHtUT17DbsfJXUwBeSsMuzYt q5liWwqB51Ch6OcAKeUnVnJByh/UvCpF9raB62Z5QBWAOJ1JvWtzk7tVX3o91ZFG9n6A dOYQ== X-Gm-Message-State: AOJu0YwY5UAya/BpVzRKRn8b2cJ1TAJQ9sw6QfeiIF8ciFDgpas3Gx1j SGJiWIll+5cKWeCmheBT3Fv3tEoDzbm5Zq1oKQ0zLuQws17GYcEKOLZGr4piMEjJlOF5w1Ricy3 u X-Received: by 2002:a05:600c:a41:b0:42a:a6d2:3270 with SMTP id 5b1f17b1804b1-432832562aemr122556715e9.21.1730805591998; Tue, 05 Nov 2024 03:19:51 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432a3688813sm16354555e9.1.2024.11.05.03.19.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 03:19:51 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/31] disas: Fix build against Capstone v6 (again) Date: Tue, 5 Nov 2024 11:19:29 +0000 Message-Id: <20241105111935.2747034-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105111935.2747034-1-peter.maydell@linaro.org> References: <20241105111935.2747034-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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 From: Richard Henderson Like 9971cbac2f3, which set CAPSTONE_AARCH64_COMPAT_HEADER, also set CAPSTONE_SYSTEMZ_COMPAT_HEADER. Fixes the build against capstone v6-alpha. Signed-off-by: Richard Henderson Reviewed-by: Gustavo Romero Message-id: 20241022013047.830273-1-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/disas/capstone.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/disas/capstone.h b/include/disas/capstone.h index a11985151d3..c43033f7f60 100644 --- a/include/disas/capstone.h +++ b/include/disas/capstone.h @@ -4,6 +4,7 @@ #ifdef CONFIG_CAPSTONE #define CAPSTONE_AARCH64_COMPAT_HEADER +#define CAPSTONE_SYSTEMZ_COMPAT_HEADER #include #else