From patchwork Tue Apr 5 19:51:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 8754771 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D845A9F336 for ; Tue, 5 Apr 2016 19:52:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3372B20383 for ; Tue, 5 Apr 2016 19:52:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EDBE720381 for ; Tue, 5 Apr 2016 19:52:09 +0000 (UTC) Received: from localhost ([::1]:38995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anX1F-0000qN-DX for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Apr 2016 15:52:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anX13-0000mF-Dm for qemu-devel@nongnu.org; Tue, 05 Apr 2016 15:51:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1anX11-00068Z-73 for qemu-devel@nongnu.org; Tue, 05 Apr 2016 15:51:57 -0400 Received: from mail-qg0-x230.google.com ([2607:f8b0:400d:c04::230]:35714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anX11-00068U-34 for qemu-devel@nongnu.org; Tue, 05 Apr 2016 15:51:55 -0400 Received: by mail-qg0-x230.google.com with SMTP id y89so19411144qge.2 for ; Tue, 05 Apr 2016 12:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tog3C4WlPWhQRyqxu+DRoFbNbQL0fw0shkfBE+oS4wQ=; b=j1v+t+FDPkJUp3LLyb+EcNibpPnEieLsfsU101rtNSUTNCkcLLV6tYq6pJBBPrvwIn A2NGFSofLpkBLkNr5Fn2UMolj81smdhTjIoRMqRttKiP5d0Z65h0HTwb5XTsSYPcgRnZ 7+l0dc/WIz8vz3FWN7pDTFTp/fK8IKBoGSeKXHvsXMm5kwzfVl4rnqg4BGdBVlfSEcLO BF4N3XoyJj2KCGneKtYk3sNve6O8YaA+dXQh1gsWL/c7fwuYofwCPDpeMW4AumqrbQRK +8cLwBgh/JYbidvzRgK4Uu7MV0zjXOKeRh+rIbVKAz8mCbyDSM2X0MChAnrEbhE3VeFp 3Lww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=tog3C4WlPWhQRyqxu+DRoFbNbQL0fw0shkfBE+oS4wQ=; b=WS1BOzsRGjHggjxm7CWXpuxHFd4oyZ+zycm8BIfrJJtT3lmmQB6oqB23gVEOaALRFv MelBQecLFj/FHjgJdmVfmOuoL1+047Vl0uMGwHp1v1jY0bkrvcEYwQ6oGYubyrsL5tCh Zg1exUGhgn35J7N/twbW7WuJMmJb+sRs6qrxq/ZLTQWhWh2PNjW18hPuqZ49fXh6E+Hb vwca5niXzkAf4OjBjiH46EBcYSc3BWkjBpTTjp6T5xmgkKDqkp6fqvjM+lKL7aIHjf2q wijRsUhb196VmXfUPJ8cPqJ6qisMMTGss+jvWTpl8dTzAauFijkBu4ZRXm5flp0YBv7/ q5LA== X-Gm-Message-State: AD7BkJIOPeruYQ/9owHn+VStIMu+9JqiUjhpKFvLs7/mXdfuWwYd98LwmHZH09QC/WKQ2Q== X-Received: by 10.140.174.86 with SMTP id u83mr21993392qhu.35.1459885914653; Tue, 05 Apr 2016 12:51:54 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by smtp.gmail.com with ESMTPSA id w67sm7790419qha.14.2016.04.05.12.51.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2016 12:51:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 5 Apr 2016 12:51:20 -0700 Message-Id: <1459885880-11792-2-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1459885880-11792-1-git-send-email-rth@twiddle.net> References: <1459885880-11792-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::230 Cc: peter.maydell@linaro.org, James Hogan Subject: [Qemu-devel] [PULL for-2.6] tcg/mips: Fix type of tcg_target_reg_alloc_order[] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: James Hogan The MIPS TCG backend is the only one to have tcg_target_reg_alloc_order[] elements of type TCGReg rather than int. This resulted in commit 91478cefaaf2 ("tcg: Allocate indirect_base temporaries in a different order") breaking the build on MIPS since the type differed from indirect_reg_alloc_order[]: tcg/tcg.c:1725:44: error: pointer type mismatch in conditional expression [-Werror] order = rev ? indirect_reg_alloc_order : tcg_target_reg_alloc_order; ^ Make it an array of ints to fix the build and match other architectures. Fixes: 91478cefaaf2 ("tcg: Allocate indirect_base temporaries in a different order") Signed-off-by: James Hogan Acked-by: Aurelien Jarno Message-Id: <1459522179-6584-1-git-send-email-james.hogan@imgtec.com> Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.inc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c index 297bd00..682e198 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc.c @@ -76,7 +76,7 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { #define TCG_TMP1 TCG_REG_T9 /* check if we really need so many registers :P */ -static const TCGReg tcg_target_reg_alloc_order[] = { +static const int tcg_target_reg_alloc_order[] = { /* Call saved registers. */ TCG_REG_S0, TCG_REG_S1,