From patchwork Mon Mar 10 15:09:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 25975 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f200.google.com (mail-yk0-f200.google.com [209.85.160.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CD99C2055F for ; Mon, 10 Mar 2014 15:10:28 +0000 (UTC) Received: by mail-yk0-f200.google.com with SMTP id q9sf39430709ykb.3 for ; Mon, 10 Mar 2014 08:10:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=FO30vk5J56+Ffz48o47rRBk5Adaxfj9wTRLBygyZ+34=; b=hqNIHqxbzpsOQaQFfr/6ZbxLhyHXNR0MftGOn/m0SX5udbutpVnpQc06i1Kgk2B/Z4 Mo5BuajrV1ZOMAwAoizhvhoxfBH4B7O/4fOHFUeoqnFKy7kL9cRXMZ7fZGNUvv4dW2ts N2kUotJv2anTvZ3wIMy727zcGuF7iCPZrJLhFPg8pRO/AsVoiLHWOU7AhkO9u2wII9+E iiP7V/0nyejIfQVerV1DCSNdevypM94dhWe1C09Mjrbb/1/Kn4Ct7qMf0NNnJ+jNdTCf YSCdBsynj8u36bFiFy+2BsKYL0AS8Ws00f9Gq2ZbXrDAt+vDTKojkaN0mHFKyt/I29Nm jmcA== X-Gm-Message-State: ALoCoQkfn1DZ9tOkQ7r49lHYsrhRN9hU2HIOrvPOYcyqzQpiXAGCt8i101yQcuIu7KgQ+2BnWEC5 X-Received: by 10.236.102.8 with SMTP id c8mr13765101yhg.5.1394464228609; Mon, 10 Mar 2014 08:10:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.137 with SMTP id l9ls2074765qgf.40.gmail; Mon, 10 Mar 2014 08:10:28 -0700 (PDT) X-Received: by 10.58.248.228 with SMTP id yp4mr630287vec.35.1394464228472; Mon, 10 Mar 2014 08:10:28 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id jl10si3068916veb.15.2014.03.10.08.10.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Mar 2014 08:10:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so2149893vcb.18 for ; Mon, 10 Mar 2014 08:10:28 -0700 (PDT) X-Received: by 10.58.229.4 with SMTP id sm4mr23958950vec.10.1394464228399; Mon, 10 Mar 2014 08:10:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp125617vck; Mon, 10 Mar 2014 08:10:28 -0700 (PDT) X-Received: by 10.224.137.202 with SMTP id x10mr8376699qat.80.1394464227743; Mon, 10 Mar 2014 08:10:27 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 50si9548634qgh.177.2014.03.10.08.10.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Mar 2014 08:10:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:49283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WN1qV-0000t8-6P for patch@linaro.org; Mon, 10 Mar 2014 11:10:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WN1pY-0008Ii-38 for qemu-devel@nongnu.org; Mon, 10 Mar 2014 11:09:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WN1pX-0004Wg-8v for qemu-devel@nongnu.org; Mon, 10 Mar 2014 11:09:28 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WN1pX-0004Wa-2J for qemu-devel@nongnu.org; Mon, 10 Mar 2014 11:09:27 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WN1pQ-0002N0-9m; Mon, 10 Mar 2014 15:09:20 +0000 From: Peter Maydell To: Anthony Liguori Date: Mon, 10 Mar 2014 15:09:14 +0000 Message-Id: <1394464160-9074-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394464160-9074-1-git-send-email-peter.maydell@linaro.org> References: <1394464160-9074-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno Subject: [Qemu-devel] [PULL 3/9] target-arm: Fix intptr_t vs tcg_target_long X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Richard Henderson Fixes a build error when these are different, e.g. x32. Signed-off-by: Richard Henderson Message-id: 1394043257-4800-1-git-send-email-rth@twiddle.net Signed-off-by: Peter Maydell --- target-arm/translate-a64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 08ac659..37e05e8 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -210,7 +210,7 @@ static inline void gen_goto_tb(DisasContext *s, int n, uint64_t dest) if (use_goto_tb(s, n, dest)) { tcg_gen_goto_tb(n); gen_a64_set_pc_im(dest); - tcg_gen_exit_tb((tcg_target_long)tb + n); + tcg_gen_exit_tb((intptr_t)tb + n); s->is_jmp = DISAS_TB_JUMP; } else { gen_a64_set_pc_im(dest);