From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 3 Dec 2008 00:20:00 +0000 (+0000)
Subject: fix gcc-4.2.4 when target != avr32
X-Git-Tag: v12.09~12654
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=e3e9f135ab492b0c3a70fc13f1b45ae58f252198;hp=fd91a97ab4db20f122db5e2f07ddbe24eb6429e5;p=openwrt-github%2F.git

fix gcc-4.2.4 when target != avr32


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13493 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/toolchain/gcc/patches/4.2.4/900-avr32_support.patch b/toolchain/gcc/patches/4.2.4/900-avr32_support.patch
index 6ba8b7f74a..333eb64cdb 100644
--- a/toolchain/gcc/patches/4.2.4/900-avr32_support.patch
+++ b/toolchain/gcc/patches/4.2.4/900-avr32_support.patch
@@ -22254,7 +22254,7 @@
    for (insn = BB_HEAD (bb); ; insn = NEXT_INSN (insn))
      {
        int n_ops, i, alt, predicated;
-@@ -1630,7 +1633,60 @@ copyprop_hardreg_forward_1 (basic_block 
+@@ -1630,7 +1633,62 @@ copyprop_hardreg_forward_1 (basic_block 
  	      || (predicated && recog_data.operand_type[i] == OP_OUT))
  	    recog_data.operand_type[i] = OP_INOUT;
  	}
@@ -22268,6 +22268,7 @@
 +         are modified these tests will fail.
 +      */
 +      
++#ifdef IFCVT_ALLOW_MODIFY_TEST_IN_INSN
 +      if ( IFCVT_ALLOW_MODIFY_TEST_IN_INSN
 +           && predicated )
 +        { 
@@ -22311,6 +22312,7 @@
 +        {
 +          prev_pred_insn_skipped = 0;
 +        }
++#endif /* IFCVT_ALLOW_MODIFY_TEST_IN_INSN */
 +      
        /* For each earlyclobber operand, zap the value data.  */
        for (i = 0; i < n_ops; i++)