From patchwork Thu May 23 02:42:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164930 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1623237ili; Wed, 22 May 2019 19:54:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqyTusu+vb5yyOE8qw6nUZL0/oJqM0rgRs1ecVSkabA//QAQJNyHaoUNA8M4nRsnSBXyDWvf X-Received: by 2002:a17:906:f84c:: with SMTP id ks12mr62098272ejb.270.1558580064231; Wed, 22 May 2019 19:54:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558580064; cv=none; d=google.com; s=arc-20160816; b=BJ6AXDosaUhVmLOX59ybIvSrA86+iOFIkcYq4t5nT3ZvnoBM5bGf2qf4YXb6+qQygy B5DJUt/1KXld6OYlds+5F83uqbzlXgXupaZRcFTN7p8pdcv7P5owL/UOdkTmgiRsH6jL zhF5UqStjH0KCwYXONT+bwAaTl6Orky20Mvk2qoITQmNT9hP2nX7DLsojImaO5qZE9o7 NqbPc+iL7vskf35M6XHJKVv4NCb8khTO+yU+qobGrXNj+HgqL4bOvu24pgGyruMeF9Kk i3vCeypinXdNx0Q0QVWEdUPPSJoeqkOfETtEQoZzC0RsF+hVvjbNEHip0fcWzyslhC8h Bdjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=hJlj0a8T7befv3zY0YqLNtddqSz+Zz6qoIsCXjt90zc=; b=nZDFIrAt1cBz9EmPFpF1jvYy0bCkGUtt3irzDV4nzQSHSTvliXtrRMHIHThMKGgym9 EzZQiH07S1CqtvrDHFKsQajnUKca96Ic9zfsPPDMRrH8X9x+YG84LY1yYoLJBRsdYXzn xsa07TIdP2d17h83UN6JwLrSxiJ+Ip1SqPb1LpZkGhJCm8zgfj1V7as90XjQOVZvciK2 F4YOgO/eprc6VqvIX/ubxJgx7CWnFShjkdbqCWJzRoeVx5ghK400reOBbTatCw8SIXRO O6zg9mBMqLeSAktXl/LmzMMPjLEbJ8VzvpWuZSVUpqIeK/YTvDgcYfYOfEV7xDne7EhF sBcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KUeoFYkO; 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=fail (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 s42si922781edb.341.2019.05.22.19.54.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 22 May 2019 19:54:24 -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=fail header.i=@linaro.org header.s=google header.b=KUeoFYkO; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:56579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTds7-0008IF-8X for patch@linaro.org; Wed, 22 May 2019 22:54:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTdoZ-0005Qx-32 for qemu-devel@nongnu.org; Wed, 22 May 2019 22:50:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTdgf-0001rV-Rt for qemu-devel@nongnu.org; Wed, 22 May 2019 22:42:34 -0400 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]:45837) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTdgf-0001r9-OB for qemu-devel@nongnu.org; Wed, 22 May 2019 22:42:33 -0400 Received: by mail-yw1-xc41.google.com with SMTP id w18so1672540ywa.12 for ; Wed, 22 May 2019 19:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hJlj0a8T7befv3zY0YqLNtddqSz+Zz6qoIsCXjt90zc=; b=KUeoFYkONNWEXXoOoL4p8rNYvG+crmpzm9fBPDSuRXJ31OPkA9RS7Ru875ij2ZtR0J HTVdmIgqEoTPBRKcVdSnv11wa6eytshy2ybGP6Dlz8QmhHEhCvOxpB/6oV0NDqIWVUGd LIqCSOOx8xYOspeVb14tsRFWmeyP1lI51w7uwXHKiioX6Qrc8CbkihMXKl0GRWQRkFTU MR9wQXxtBEgJBbpbhTj078QlpKWlrYt2ETDh2vwSqc11FaMrDAI1PdaEknsYLydtRUpk ehoejxfS2Bw8KYH050jXXO7XQYROco0MJ/nJP14P7Jwrxtzt6u1hgIbsdYVyhkebt8oM GydA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hJlj0a8T7befv3zY0YqLNtddqSz+Zz6qoIsCXjt90zc=; b=RvlI+xDVPGhmtzPNrUCRbsX8hPkESQueYtGzCyyECc7pzd0smS15paHaTGzfYepRbz 8pCp18yxfTpTn47uyHDZmikCN1u6rGAwsxwOUbIhan5BzGLLlEF7BHgUkHxcIZfu61zu p2qsg0M07N6bBvkPn6hvR67rrS3c/f4m/XVil8++EesKl5EN/g2S7tA9Fd2376Fczz8Q XKhkLFttCpiTVIco5eukfDxbuu42YHq6XD1S9ATqgBUErID7+QxtpKb0u0cBW/Y7o79t 0VCLK7/CKCPh2YsMe7O8iJT5gWrZsIsjF1af9gzZKbj2/7w8X0WbKBo3s+veU3N05z+9 lFcg== X-Gm-Message-State: APjAAAW3VjhKHLTEvd7HA6myAUWr06oxybszKM85MpHNTDc6UuZUhe9l rrdkT3y2RTzPd4DDtm8RNktOVzDvfO4= X-Received: by 2002:a81:4d42:: with SMTP id a63mr27652804ywb.346.1558579352684; Wed, 22 May 2019 19:42:32 -0700 (PDT) Received: from localhost.localdomain ([71.46.56.17]) by smtp.gmail.com with ESMTPSA id n12sm7559320ywn.81.2019.05.22.19.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 19:42:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 22:42:27 -0400 Message-Id: <20190523024229.1158-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523024229.1158-1-richard.henderson@linaro.org> References: <20190523024229.1158-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c41 Subject: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Since v4.0, capstone.h has moved to . Signed-off-by: Richard Henderson --- include/disas/capstone.h | 4 ++++ configure | 6 ++++++ 2 files changed, 10 insertions(+) -- 2.17.1 Reviewed-by: Alex Bennée Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/include/disas/capstone.h b/include/disas/capstone.h index e29068dd97..90631d84a9 100644 --- a/include/disas/capstone.h +++ b/include/disas/capstone.h @@ -3,7 +3,11 @@ #ifdef CONFIG_CAPSTONE +#ifdef CONFIG_CAPSTONE_CAPSTONE_H +#include +#else #include +#endif #else diff --git a/configure b/configure index d2fc346302..eec7f061c3 100755 --- a/configure +++ b/configure @@ -5021,6 +5021,9 @@ case "$capstone" in system) QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)" LIBS="$($pkg_config --libs capstone) $LIBS" + if check_include capstone/capstone.h; then + capstone_capstone_h=yes + fi ;; no) @@ -7197,6 +7200,9 @@ if test "$ivshmem" = "yes" ; then fi if test "$capstone" != "no" ; then echo "CONFIG_CAPSTONE=y" >> $config_host_mak + if test "$capstone_capstone_h" != "no" ; then + echo "CONFIG_CAPSTONE_CAPSTONE_H=y" >> $config_host_mak + fi fi if test "$debug_mutex" = "yes" ; then echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak