Ticket #28171: patch-mspgcc-4.4.5.diff

configure

@@ -2360 +2360 @@
   avr-*-*)
     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp"
     ;;
+  msp430-*-*)
+    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp"
+    ;;
   bfin-*-*)
     noconfigdirs="$noconfigdirs gdb"
     if test x${is_cross_compiler} != xno ; then

gcc/config.gcc

@@ -810 +810 @@
 avr-*-*)
         tm_file="avr/avr.h dbxelf.h"
         ;;
+msp430-*-*)
+        tm_file="msp430/msp430.h dbxelf.h"
+        c_target_objs=`cat ${srcdir}/config/msp430/objs-extra`
+        cxx_target_objs=`cat ${srcdir}/config/msp430/objs-extra`
+        use_fixproto=yes
+        ;;
 bfin*-elf*)
         tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
         tmake_file=bfin/t-bfin-elf

gcc/configure

@@ -1595 +1595 @@
 
 
 gcc_version=`cat $srcdir/BASE-VER`
+echo $gcc_version | sed s/\\\([0-9]\\\)\.\\\([0-9]\\\)\.\\\([0-9]\\\)/\#define\ GCC_VERSION_INT\ 0x\\1\\2\\3/g > $srcdir/_gccver.h
 
 # Determine the host, build, and target systems
 ac_aux_dir=
@@ -23819 +23820 @@
 case "$target" in
   i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
   | x86_64*-*-* | hppa*-*-* | arm*-*-* \
+  | msp430-*-* \
   | xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
   | spu-*-* | fido*-*-* | m32c-*-*)
     insn="nop"

gcc/dse.c

@@ -826 +826 @@
     case POST_INC:
       {
         rtx r1 = XEXP (x, 0);
-        rtx c = gen_int_mode (Pmode, data->size);
+        rtx c = gen_int_mode (data->size, Pmode);
         emit_insn_before (gen_rtx_SET (Pmode, r1, 
                                        gen_rtx_PLUS (Pmode, r1, c)),
                           data->insn);
@@ -837 +837 @@
     case POST_DEC:
       {
         rtx r1 = XEXP (x, 0);
-        rtx c = gen_int_mode (Pmode, -data->size);
+        rtx c = gen_int_mode (-data->size, Pmode);
         emit_insn_before (gen_rtx_SET (Pmode, r1, 
                                        gen_rtx_PLUS (Pmode, r1, c)),
                           data->insn);

gcc/emit-rtl.c

@@ -1686 +1686 @@
       base = get_base_address (base);
       if (base && DECL_P (base)
           && TREE_READONLY (base)
-          && (TREE_STATIC (base) || DECL_EXTERNAL (base)))
+          && (TREE_STATIC (base) || DECL_EXTERNAL (base))
+          && !TREE_THIS_VOLATILE (base))
         {
           tree base_type = TREE_TYPE (base);
           gcc_assert (!(base_type && TYPE_NEEDS_CONSTRUCTING (base_type))

gcc/expr.c

@@ -955 +955 @@
           data.autinc_from = 1;
           data.explicit_inc_from = -1;
         }
-      if (USE_LOAD_POST_INCREMENT (mode) && ! data.autinc_from)
+      if (USE_LOAD_POST_INCREMENT (mode) && !data.reverse && !data.autinc_from)
         {
           data.from_addr = copy_addr_to_reg (from_addr);
           data.autinc_from = 1;

gcc/loop-invariant.c

@@ -1171 +1171 @@
   rtx reg, set, dest, note;
   struct use *use;
   bitmap_iterator bi;
+  int n_validated;
 
   if (inv->reg)
     return true;
   if (!repr->move)
     return false;
+  n_validated = num_validated_changes ();
   /* If this is a representative of the class of equivalent invariants,
      really move the invariant.  Otherwise just replace its use with
      the register used for the representative.  */
@@ -1200 +1202 @@
       reg = gen_reg_rtx_and_attrs (dest);
 
       /* Try replacing the destination by a new pseudoregister.  */
-      if (!validate_change (inv->insn, &SET_DEST (set), reg, false))
+      validate_change (inv->insn, &SET_DEST (set), reg, true);
+
+      /* Replace the uses we know to be dominated.  It saves work for copy
+         propagation, and also it is necessary so that dependent invariants
+         are computed right.  */
+      /* Note that we must test the changes for validity, lest we might
+         rip apart a match_dup between a use and a clobber.  */
+      if (inv->def)
+        for (use = inv->def->uses; use; use = use->next)
+          validate_change (use->insn, use->pos, reg, true);
+      if (!apply_change_group ())
         goto fail;
       df_insn_rescan (inv->insn);
 
@@ -1221 +1233 @@
     }
   else
     {
-      if (!move_invariant_reg (loop, repr->invno))
-        goto fail;
+      /* Replace the uses we know to be dominated.  It saves work for copy
+         propagation, and also it is necessary so that dependent invariants
+         are computed right.  */
       reg = repr->reg;
+      if (inv->def)
+        for (use = inv->def->uses; use; use = use->next)
+          validate_change (use->insn, use->pos, reg, true);
+
+      if (verify_changes (n_validated)
+          && move_invariant_reg (loop, repr->invno))
+        confirm_change_group ();
+      else
+        {
+          cancel_changes (n_validated);
+          goto fail;
+        }
+
       set = single_set (inv->insn);
       emit_insn_after (gen_move_insn (SET_DEST (set), reg), inv->insn);
       delete_insn (inv->insn);
@@ -1232 +1258 @@
 
   inv->reg = reg;
 
-  /* Replace the uses we know to be dominated.  It saves work for copy
-     propagation, and also it is necessary so that dependent invariants
-     are computed right.  */
   if (inv->def)
-    {
-      for (use = inv->def->uses; use; use = use->next)
-        {
-          *use->pos = reg;
-          df_insn_rescan (use->insn);
-        }      
-    }
+    for (use = inv->def->uses; use; use = use->next)
+      df_insn_rescan (use->insn);
 
   return true;
 

libgcc/config.host

@@ -224 +224 @@
     # Make HImode functions for AVR
     tmake_file=${cpu_type}/t-avr
         ;;
+msp430-*-*)
+        ;;
 bfin*-elf*)
         ;;
 bfin*-uclinux*)