From patchwork Sun Jun 13 01:26:25 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Bootstrap broken on arm-linux was: ARM patch: Thumb2 reorg
Date: Sat, 12 Jun 2010 15:26:25 -0000
From: Bernd Schmidt <bernds@codesourcery.com>
X-Patchwork-Id: 55407
Message-Id: <4C1433C1.2000706@codesourcery.com>
To: Laurent GUERBY <laurent@guerby.net>
Cc: Nick Clifton <nickc@redhat.com>, GCC Patches <gcc-patches@gcc.gnu.org>,
 Richard Earnshaw <rearnsha@arm.com>

On 06/12/2010 02:45 PM, Laurent GUERBY wrote:

> This likely broke native bootstrap on ARM, see last comment of:
> 
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44458

Sorry about that.  Hopefully fixed now with the patch below.


Bernd


Index: ChangeLog
===================================================================
--- ChangeLog	(revision 160663)
+++ ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2010-06-12  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* config/arm/arm.c (thumb2_reorg): Fix errors in previous change.
+
 2010-06-12  Jan Hubicka  <jh@suse.cz>
 
 	* df-core.c (df_clear_bb_info): New function.
Index: config/arm/arm.c
===================================================================
--- config/arm/arm.c	(revision 160663)
+++ config/arm/arm.c	(working copy)
@@ -11457,13 +11457,12 @@
 		  rtx dst = XEXP (pat, 0);
 		  rtx src = XEXP (pat, 1);
 		  rtx op0 = XEXP (src, 0);
-		  rtx op1 = XEXP (src, 1);
 		  if (rtx_equal_p (dst, op0)
 		      || GET_CODE (src) == PLUS || GET_CODE (src) == MINUS)
 		    {
 		      rtx ccreg = gen_rtx_REG (CCmode, CC_REGNUM);
 		      rtx clobber = gen_rtx_CLOBBER (VOIDmode, ccreg);
-		      rtx vec = gen_rtvec (2, pat, clobber);
+		      rtvec vec = gen_rtvec (2, pat, clobber);
 		      PATTERN (insn) = gen_rtx_PARALLEL (VOIDmode, vec);
 		      INSN_CODE (insn) = -1;
 		    }