From patchwork Tue Oct 15 17:51:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 176396 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp6239729ill; Tue, 15 Oct 2019 10:53:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqwPpetkO6kLN+MMT9xdK5Dp9/5Mqu47xVyJ9lzb6Vnazwu90OrJqsdgPqD/GDBoCIisP6oU X-Received: by 2002:a37:883:: with SMTP id 125mr36049768qki.478.1571162035334; Tue, 15 Oct 2019 10:53:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571162035; cv=none; d=google.com; s=arc-20160816; b=XIL/H/krt3DvPYYl3xtEks0Z87qfQKvYcc4P+0bXHqNcoLLM0cUoa4AgJ30DqmDFbe 7Ss7mSP1eTQRU9VHFYYfzopgQNEK+4xYa3c2PO6zT1W25QPnaNoi9Bz0PRyXq2v/KPsX dM+7QXLsc+2OY/PARmBuOGJ+NUb/29pXaU59Yawjic18745NTE0Kn/W2xlCUqQli670y fMlw83U6g9sH8gb4VybFmYq1l4eTiCsUUlu00mZOtyqxtIU5H2L7N9CVZ9WgXDZ0JfZT hTl8qBMtGUY+gRAT7IxIjfqgdMbZITGpXkGsQUzte7zUfjf6lVY1NEq6FT+MLr+w7WwT Lxyw== 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:to:from :dkim-signature; bh=1C7c6L0AKcXy94kRypeBSB6XHbsCm+dRfwVNJ4dwo8Q=; b=Gna6q7arwgfamPdeObfiFPNVSv0SopUtlipefYw0ZXdXxKbwv4IdSU7MHWttvmHhzN InGIaIQgyfgiwzp8Z0X3Xq1PFOBdBxG5+IkJxLKN72NCH4D6XqwCHRbMBaZu3w00cp0S /ubKNWQo1YtbiwQxSCNlM2JuR5f2RJJIL2LyZCEtVxagPuwxxdk5/td2X0DJe3TGYJjY olmnVgyqagQrvH4yONHM9daFkHOKFi/ozDkUfV4xafa5KuCRU3CNAkDDG+s9K/GlIaTf wsYpXD3kQki2hnhzybVrtx6OAv4qN5QusWI8NmuXIFXySsZNNx89Edwymn8WJ6gi++bJ ozDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Gj+Y+3dA; 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 d19si21850280qte.152.2019.10.15.10.53.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Oct 2019 10:53:55 -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=Gj+Y+3dA; 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]:55162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKR18-00072G-Na for patch@linaro.org; Tue, 15 Oct 2019 13:53:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54596) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKQyy-0004wl-JM for qemu-devel@nongnu.org; Tue, 15 Oct 2019 13:51:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKQyw-0003PV-Gj for qemu-devel@nongnu.org; Tue, 15 Oct 2019 13:51:40 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:35828) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iKQyw-0003PH-AH for qemu-devel@nongnu.org; Tue, 15 Oct 2019 13:51:38 -0400 Received: by mail-pg1-x544.google.com with SMTP id p30so12592805pgl.2 for ; Tue, 15 Oct 2019 10:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1C7c6L0AKcXy94kRypeBSB6XHbsCm+dRfwVNJ4dwo8Q=; b=Gj+Y+3dAOGc9dHpOy9mhXsLqGcNMj5MIDrIoxzeR1GgxkfrjmeMlA0X897dskiv2ee xrLxCmYtK2YwsYESQjAre+jDnLqp8k9nJ9N0t1qLZ7ak6StWqaXcGlyfGZoeNRtt7U2m 7gJqa9ScHJxsD4KNYTobWED2saHsYVwogmfgEDKZiean4+RfEK1h6Y8ulDC2o9SZfskQ FJJRHMP2lNlcH+jT1vkdCpTSE++ZQU+BCvGztqyJAR5NrtPZUunXgFEv2oTXQZDj3JP0 GlSLSFNk1pSq1vVQ/C6enhK8e2o1HzjbL0wu4KCgzAHttRhONvy1de0NhlI0JyzBrx19 pqVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1C7c6L0AKcXy94kRypeBSB6XHbsCm+dRfwVNJ4dwo8Q=; b=DFUgDkqZBcW1wPjadyMvc70ai6yHDTRMDUGIZClSmIU3yTHacTzyxefxBKtgCsJhSi fcRmfT3/04SRUXBP8Lb+fUsMXN8naVF89lNizYaNBGscINx5QCj52GbYKKfQpGtjJPXk WVJVvLI/GBgKeaOepOXhesKRCQ6fLKmCgai1xWS7d1ZPOZqgoniD0WQnA4+/E3ptMABu 3NAgatttBDEB6Q//Nv5shvRRecl7Z4caasOuunMhxAs5mEWzYhgoTkCZfhMLrlBGoZ+F CJYz+3qDPmvgdrdW11ntuvfRpS5jy1e3IzJ8TArH0Pl6+PWQ1LDiecXfguSiHqxghGuy cD/Q== X-Gm-Message-State: APjAAAWRiVixb/fRhjoawhQzrDoXUPJR2Xmirao1PIR2qFo16tvEeBGJ 1dRP1TQvxmbVIUZ7gwABhcWEpYxjChA= X-Received: by 2002:a17:90a:1b45:: with SMTP id q63mr43578475pjq.106.1571161896902; Tue, 15 Oct 2019 10:51:36 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id t68sm20867845pgt.61.2019.10.15.10.51.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 10:51:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 1/3] capstone: Update to master Date: Tue, 15 Oct 2019 10:51:31 -0700 Message-Id: <20191015175133.16598-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191015175133.16598-1-richard.henderson@linaro.org> References: <20191015175133.16598-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Update to 418d36d695e0. Choose this over the 4.0.1 tag because master now includes the s390x z13 vector opcodes. Acked-by: David Hildenbrand Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- Makefile | 1 + capstone | 2 +- configure | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 30f0abfb42..8ce48e0342 100644 --- a/Makefile +++ b/Makefile @@ -498,6 +498,7 @@ dtc/%: .git-submodule-status # Remove all the extra -Warning flags that QEMU uses that Capstone doesn't; # no need to annoy QEMU developers with such things. CAP_CFLAGS = $(patsubst -W%,,$(CFLAGS) $(QEMU_CFLAGS)) +CAP_CFLAGS += -I$(SRC_PATH)/capstone/include CAP_CFLAGS += -DCAPSTONE_USE_SYS_DYN_MEM CAP_CFLAGS += -DCAPSTONE_HAS_ARM CAP_CFLAGS += -DCAPSTONE_HAS_ARM64 diff --git a/capstone b/capstone index 22ead3e0bf..418d36d695 160000 --- a/capstone +++ b/capstone @@ -1 +1 @@ -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf +Subproject commit 418d36d695e075955674ace5a1191b495da50f84 diff --git a/configure b/configure index 08ca4bcb46..f4f1860065 100755 --- a/configure +++ b/configure @@ -5008,7 +5008,7 @@ case "$capstone" in git_submodules="${git_submodules} capstone" fi mkdir -p capstone - QEMU_CFLAGS="$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include" + QEMU_CFLAGS="$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include/capstone" if test "$mingw32" = "yes"; then LIBCAPSTONE=capstone.lib else