1 files changed, 59 insertions, 60 deletions

diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch
index 95907eeb87..0943130de6 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch
@@ -37,9 +37,11 @@
         gcc/
 
 === modified file 'gcc/config/arm/arm-modes.def'
---- old/gcc/config/arm/arm-modes.def    2009-06-18 11:24:10 +0000
-+++ new/gcc/config/arm/arm-modes.def    2010-07-29 16:58:56 +0000
-@@ -35,10 +35,16 @@
+Index: gcc-4.5.3/gcc/config/arm/arm-modes.def
+===================================================================
+--- gcc-4.5.3.orig/gcc/config/arm/arm-modes.def
++++ gcc-4.5.3/gcc/config/arm/arm-modes.def
+@@ -35,10 +35,16 @@ ADJUST_FLOAT_FORMAT (HF, ((arm_fp16_form
     CC_NOOVmode should be used with SImode integer equalities.
     CC_Zmode should be used if only the Z flag is set correctly
     CC_Nmode should be used if only the N (sign) flag is set correctly
@@ -56,11 +58,11 @@
  CC_MODE (CC_SWP);
  CC_MODE (CCFP);
  CC_MODE (CCFPE);
-
-=== modified file 'gcc/config/arm/arm-protos.h'
---- old/gcc/config/arm/arm-protos.h     2009-11-11 14:23:03 +0000
-+++ new/gcc/config/arm/arm-protos.h     2010-07-29 16:58:56 +0000
-@@ -49,8 +49,7 @@
+Index: gcc-4.5.3/gcc/config/arm/arm-protos.h
+===================================================================
+--- gcc-4.5.3.orig/gcc/config/arm/arm-protos.h
++++ gcc-4.5.3/gcc/config/arm/arm-protos.h
+@@ -49,8 +49,7 @@ extern int arm_hard_regno_mode_ok (unsig
  extern int const_ok_for_arm (HOST_WIDE_INT);
  extern int arm_split_constant (RTX_CODE, enum machine_mode, rtx,
                                HOST_WIDE_INT, rtx, rtx, int);
@@ -70,7 +72,7 @@
  extern int legitimate_pic_operand_p (rtx);
  extern rtx legitimize_pic_address (rtx, enum machine_mode, rtx);
  extern rtx legitimize_tls_address (rtx, rtx);
-@@ -116,6 +115,7 @@
+@@ -116,6 +115,7 @@ extern void arm_reload_in_hi (rtx *);
  extern void arm_reload_out_hi (rtx *);
  extern int arm_const_double_inline_cost (rtx);
  extern bool arm_const_double_by_parts (rtx);
@@ -78,11 +80,11 @@
  extern const char *fp_immediate_constant (rtx);
  extern void arm_emit_call_insn (rtx, rtx);
  extern const char *output_call (rtx *);
-
-=== modified file 'gcc/config/arm/arm.c'
---- old/gcc/config/arm/arm.c    2010-07-29 15:59:12 +0000
-+++ new/gcc/config/arm/arm.c    2010-07-29 16:58:56 +0000
-@@ -3190,13 +3190,82 @@
+Index: gcc-4.5.3/gcc/config/arm/arm.c
+===================================================================
+--- gcc-4.5.3.orig/gcc/config/arm/arm.c
++++ gcc-4.5.3/gcc/config/arm/arm.c
+@@ -3191,13 +3191,82 @@ arm_gen_constant (enum rtx_code code, en
     immediate value easier to load.  */
  
  enum rtx_code
@@ -169,7 +171,7 @@
    switch (code)
      {
      case EQ:
-@@ -9912,6 +9981,55 @@
+@@ -9913,6 +9982,55 @@ arm_select_cc_mode (enum rtx_code op, rt
        && (rtx_equal_p (XEXP (x, 0), y) || rtx_equal_p (XEXP (x, 1), y)))
      return CC_Cmode;
  
@@ -225,18 +227,17 @@
    return CCmode;
  }
  
-@@ -9921,10 +10039,39 @@
+@@ -9922,10 +10040,39 @@ arm_select_cc_mode (enum rtx_code op, rt
  rtx
  arm_gen_compare_reg (enum rtx_code code, rtx x, rtx y)
  {
 -  enum machine_mode mode = SELECT_CC_MODE (code, x, y);
 -  rtx cc_reg = gen_rtx_REG (mode, CC_REGNUM);
--
--  emit_set_insn (cc_reg, gen_rtx_COMPARE (mode, x, y));
 +  enum machine_mode mode;
 +  rtx cc_reg;
 +  int dimode_comparison = GET_MODE (x) == DImode || GET_MODE (y) == DImode;
-+
+ 
+-  emit_set_insn (cc_reg, gen_rtx_COMPARE (mode, x, y));
 +  /* We might have X as a constant, Y as a register because of the predicates
 +     used for cmpdi.  If so, force X to a register here.  */
 +  if (dimode_comparison && !REG_P (x))
@@ -269,7 +270,7 @@
  
    return cc_reg;
  }
-@@ -11253,6 +11400,34 @@
+@@ -11254,6 +11401,34 @@ arm_const_double_by_parts (rtx val)
    return false;
  }
  
@@ -304,7 +305,7 @@
  /* Scan INSN and note any of its operands that need fixing.
     If DO_PUSHES is false we do not actually push any of the fixups
     needed.  The function returns TRUE if any fixups were needed/pushed.
-@@ -15097,8 +15272,18 @@
+@@ -15150,8 +15325,18 @@ arm_print_operand (FILE *stream, rtx x,
          the value being loaded is big-wordian or little-wordian.  The
          order of the two register loads can matter however, if the address
          of the memory location is actually held in one of the registers
@@ -324,7 +325,7 @@
        if (GET_CODE (x) != REG || REGNO (x) > LAST_ARM_REGNUM)
         {
           output_operand_lossage ("invalid operand for code '%c'", code);
-@@ -15109,6 +15294,18 @@
+@@ -15162,6 +15347,18 @@ arm_print_operand (FILE *stream, rtx x,
        return;
  
      case 'R':
@@ -343,7 +344,7 @@
        if (GET_CODE (x) != REG || REGNO (x) > LAST_ARM_REGNUM)
         {
           output_operand_lossage ("invalid operand for code '%c'", code);
-@@ -15801,6 +15998,28 @@
+@@ -15854,6 +16051,28 @@ get_arm_condition_code (rtx comparison)
        default: gcc_unreachable ();
        }
  
@@ -372,11 +373,11 @@
      case CCmode:
        switch (comp_code)
         {
-
-=== modified file 'gcc/config/arm/arm.h'
---- old/gcc/config/arm/arm.h    2009-12-23 16:36:40 +0000
-+++ new/gcc/config/arm/arm.h    2010-07-29 16:58:56 +0000
-@@ -2253,19 +2253,7 @@
+Index: gcc-4.5.3/gcc/config/arm/arm.h
+===================================================================
+--- gcc-4.5.3.orig/gcc/config/arm/arm.h
++++ gcc-4.5.3/gcc/config/arm/arm.h
+@@ -2253,19 +2253,7 @@ extern int making_const_table;
     : reverse_condition (code))
  
  #define CANONICALIZE_COMPARISON(CODE, OP0, OP1)                                \
@@ -397,10 +398,10 @@
  
  /* The arm5 clz instruction returns 32.  */
  #define CLZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE)  ((VALUE) = 32, 1)
-
-=== modified file 'gcc/config/arm/arm.md'
---- old/gcc/config/arm/arm.md   2010-07-29 15:59:12 +0000
-+++ new/gcc/config/arm/arm.md   2010-07-29 16:58:56 +0000
+Index: gcc-4.5.3/gcc/config/arm/arm.md
+===================================================================
+--- gcc-4.5.3.orig/gcc/config/arm/arm.md
++++ gcc-4.5.3/gcc/config/arm/arm.md
 @@ -6718,17 +6718,45 @@
                                    operands[3])); DONE;"
  )
@@ -506,7 +507,7 @@
  ;; Cirrus SF compare instruction
  (define_insn "*cirrus_cmpsf"
    [(set (reg:CCFP CC_REGNUM)
-@@ -8183,18 +8257,45 @@
+@@ -8183,17 +8257,44 @@
                              operands[2], operands[3])); DONE;"
  )
  
@@ -519,13 +520,14 @@
 -  "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK"
 -  "emit_insn (gen_cstore_cc (operands[0], operands[1],
 -                            operands[2], operands[3])); DONE;"
+-)
 +        [(match_operand:DI 2 "cmpdi_operand" "")
 +         (match_operand:DI 3 "cmpdi_operand" "")]))]
 +  "TARGET_32BIT"
 +  "{
 +     rtx swap = NULL_RTX;
 +     enum rtx_code code = GET_CODE (operands[1]);
-+
+ 
 +     /* We should not have two constants.  */
 +     gcc_assert (GET_MODE (operands[2]) == DImode
 +                || GET_MODE (operands[3]) == DImode);
@@ -553,16 +555,14 @@
 +                                operands[3]));
 +     DONE;
 +   }"
- )
++)
  
--
  (define_expand "cstoresi_eq0_thumb1"
    [(parallel
-     [(set (match_operand:SI 0 "s_register_operand" "")
-
-=== modified file 'gcc/config/arm/constraints.md'
---- old/gcc/config/arm/constraints.md   2009-12-07 20:34:53 +0000
-+++ new/gcc/config/arm/constraints.md   2010-07-29 16:58:56 +0000
+Index: gcc-4.5.3/gcc/config/arm/constraints.md
+===================================================================
+--- gcc-4.5.3.orig/gcc/config/arm/constraints.md
++++ gcc-4.5.3/gcc/config/arm/constraints.md
 @@ -29,7 +29,7 @@
  ;; in Thumb-1 state: I, J, K, L, M, N, O
  
@@ -586,11 +586,11 @@
  (define_constraint "Dn"
   "@internal
    In ARM/Thumb-2 state a const_vector which can be loaded with a Neon vmov
-
-=== modified file 'gcc/config/arm/predicates.md'
---- old/gcc/config/arm/predicates.md    2010-07-29 15:59:12 +0000
-+++ new/gcc/config/arm/predicates.md    2010-07-29 16:58:56 +0000
-@@ -86,6 +86,12 @@
+Index: gcc-4.5.3/gcc/config/arm/predicates.md
+===================================================================
+--- gcc-4.5.3.orig/gcc/config/arm/predicates.md
++++ gcc-4.5.3/gcc/config/arm/predicates.md
+@@ -101,6 +101,12 @@
    (and (match_code "const_int")
         (match_test "const_ok_for_arm (INTVAL (op))")))
  
@@ -603,7 +603,7 @@
  (define_predicate "arm_neg_immediate_operand"
    (and (match_code "const_int")
         (match_test "const_ok_for_arm (-INTVAL (op))")))
-@@ -115,6 +121,10 @@
+@@ -130,6 +136,10 @@
    (ior (match_operand 0 "arm_rhs_operand")
         (match_operand 0 "arm_not_immediate_operand")))
  
@@ -614,23 +614,23 @@
  ;; True if the operand is a memory reference which contains an
  ;; offsettable address.
  (define_predicate "offsettable_memory_operand"
-@@ -522,4 +532,12 @@
- (define_predicate "neon_lane_number"
+@@ -538,3 +548,12 @@
    (and (match_code "const_int")
-        (match_test "INTVAL (op) >= 0 && INTVAL (op) <= 7")))
+        (match_test "INTVAL (op) >= 0 && INTVAL (op) <= 15")))
+ 
 +;; Predicates for named expanders that overlap multiple ISAs.
 +
 +(define_predicate "cmpdi_operand"
 +  (if_then_else (match_test "TARGET_HARD_FLOAT && TARGET_MAVERICK")
-+               (and (match_test "TARGET_ARM")
-+                    (match_operand 0 "cirrus_fp_register"))
-+               (and (match_test "TARGET_32BIT")
-+                    (match_operand 0 "arm_di_operand"))))
- 
-
-=== added file 'gcc/testsuite/gcc.c-torture/execute/20100416-1.c'
---- old/gcc/testsuite/gcc.c-torture/execute/20100416-1.c        1970-01-01 00:00:00 +0000
-+++ new/gcc/testsuite/gcc.c-torture/execute/20100416-1.c        2010-07-29 16:58:56 +0000
++               (and (match_test "TARGET_ARM")
++                    (match_operand 0 "cirrus_fp_register"))
++               (and (match_test "TARGET_32BIT")
++                    (match_operand 0 "arm_di_operand"))))
++
+Index: gcc-4.5.3/gcc/testsuite/gcc.c-torture/execute/20100416-1.c
+===================================================================
+--- /dev/null
++++ gcc-4.5.3/gcc/testsuite/gcc.c-torture/execute/20100416-1.c
 @@ -0,0 +1,40 @@
 +void abort(void);
 +
@@ -672,4 +672,3 @@
 +    }
 +  return 0;
 +}
-