Changeset 1864309 for patches/gcc-4.8.1-branch_update-3.patch

Timestamp:

Oct 1, 2013, 4:38:35 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

e53d8f54

Parents:

23a1e45

Message:

Update GCC Branch update patch.

File:

• patches/gcc-4.8.1-branch_update-3.patch (moved) (moved from patches/gcc-4.8.1-branch_update-2.patch ) (1144 diffs)

patches/gcc-4.8.1-branch_update-3.patch

@@ -1 +1 @@
 Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 09-19-2013
+Date: 10-01-2013
 Initial Package Version: 4.8.1
 Origin: Upstream
@@ -7 +7 @@
              rechecked periodically.
 
-This patch was made from Revision # 202050.
-Added fix for BUILD¿CXXFLAGS.
-Added fix for ISL.
+This patch was made from Revision # 203062.
 
-diff -Naur gcc-4.8.1.orig/ChangeLog gcc-4.8.1/ChangeLog
---- gcc-4.8.1.orig/ChangeLog    2013-05-31 09:00:41.000000000 +0000
-+++ gcc-4.8.1/ChangeLog 2013-09-13 19:01:43.959862879 +0000
-@@ -1,3 +1,12 @@
-+2013-07-13  Tobias Grosser  <tobias@grosser.es>
-+
-+       PR tree-optimization/54094
-+       * graphite-clast-to-gimple.c (translate_clast_for_loop): Derive the
-+         scheduling dimension for the parallelism check from the polyhedral
-+         information in the AST.
-+       * graphite-dependences.c (carries_deps): Do not assume the schedule is
-+         in 2D + 1 form.
-+
- 2013-05-31  Release Manager
- 
-        * GCC 4.8.1 released.
+Added fix for BUILD_CXXFLAGS during crosscompile.
+Added fix for ISL 2D + 1 form in parallelism check.
+
+diff -Naur gcc-4.8.1.orig/boehm-gc/Makefile.am gcc-4.8.1/boehm-gc/Makefile.am
+--- gcc-4.8.1.orig/boehm-gc/Makefile.am 2013-03-22 14:19:12.000000000 +0000
++++ gcc-4.8.1/boehm-gc/Makefile.am      2013-10-01 16:06:43.760554292 +0000
+@@ -35,7 +35,7 @@
+ 
+ # Include THREADLIBS here to ensure that the correct versions of
+ # linuxthread semaphore functions get linked:
+-libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS)
++libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(EXTRA_TEST_LIBS)
+ libgcjgc_la_DEPENDENCIES = $(addobjs)
+ libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
+ libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS)
+diff -Naur gcc-4.8.1.orig/boehm-gc/Makefile.in gcc-4.8.1/boehm-gc/Makefile.in
+--- gcc-4.8.1.orig/boehm-gc/Makefile.in 2013-05-31 09:09:26.000000000 +0000
++++ gcc-4.8.1/boehm-gc/Makefile.in      2013-10-01 16:06:43.760554292 +0000
+@@ -280,7 +280,7 @@
+ 
+ # Include THREADLIBS here to ensure that the correct versions of
+ # linuxthread semaphore functions get linked:
+-libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS)
++libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(EXTRA_TEST_LIBS)
+ libgcjgc_la_DEPENDENCIES = $(addobjs)
+ libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
+ libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS)
+diff -Naur gcc-4.8.1.orig/configure gcc-4.8.1/configure
+--- gcc-4.8.1.orig/configure    2013-02-15 17:45:54.000000000 +0000
++++ gcc-4.8.1/configure 2013-10-01 16:06:43.764554292 +0000
+@@ -5939,6 +5939,55 @@
+   fi
+ 
+ 
++    if test "${gcc_cv_isl}" = no ; then
++
++  if test "${ENABLE_ISL_CHECK}" = yes ; then
++    _isl_saved_CFLAGS=$CFLAGS
++    _isl_saved_LDFLAGS=$LDFLAGS
++    _isl_saved_LIBS=$LIBS
++
++    CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
++    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
++    LIBS="${_isl_saved_LIBS} -lisl"
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.12 of ISL" >&5
++$as_echo_n "checking for version 0.12 of ISL... " >&6; }
++    if test "$cross_compiling" = yes; then :
++  gcc_cv_isl=yes
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <isl/version.h>
++   #include <string.h>
++int
++main ()
++{
++if (strncmp (isl_version (), "isl-0.12", strlen ("isl-0.12")) != 0)
++     return 1;
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  gcc_cv_isl=yes
++else
++  gcc_cv_isl=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
++$as_echo "$gcc_cv_isl" >&6; }
++
++    CFLAGS=$_isl_saved_CFLAGS
++    LDFLAGS=$_isl_saved_LDFLAGS
++    LIBS=$_isl_saved_LIBS
++  fi
++
++
++    fi
+   fi
+ 
+ 
+diff -Naur gcc-4.8.1.orig/configure.ac gcc-4.8.1/configure.ac
+--- gcc-4.8.1.orig/configure.ac 2013-02-15 17:45:54.000000000 +0000
++++ gcc-4.8.1/configure.ac      2013-10-01 16:06:43.764554292 +0000
+@@ -1630,6 +1630,9 @@
+   ISL_CHECK_VERSION(0,10)
+   if test "${gcc_cv_isl}" = no ; then
+     ISL_CHECK_VERSION(0,11)
++    if test "${gcc_cv_isl}" = no ; then
++      ISL_CHECK_VERSION(0,12)
++    fi
+   fi
+   dnl Only execute fail-action, if ISL has been requested.
+   ISL_IF_FAILED([
 diff -Naur gcc-4.8.1.orig/fixincludes/fixincl.x gcc-4.8.1/fixincludes/fixincl.x
 --- gcc-4.8.1.orig/fixincludes/fixincl.x        2013-01-16 04:07:20.000000000 +0000
-+++ gcc-4.8.1/fixincludes/fixincl.x     2013-09-13 19:01:42.876532387 +0000
++++ gcc-4.8.1/fixincludes/fixincl.x     2013-10-01 16:06:43.764554292 +0000
 @@ -2,11 +2,11 @@
   * 
@@ -55 +136 @@
 diff -Naur gcc-4.8.1.orig/fixincludes/inclhack.def gcc-4.8.1/fixincludes/inclhack.def
 --- gcc-4.8.1.orig/fixincludes/inclhack.def     2013-01-16 04:07:20.000000000 +0000
-+++ gcc-4.8.1/fixincludes/inclhack.def  2013-09-13 19:01:42.879865711 +0000
++++ gcc-4.8.1/fixincludes/inclhack.def  2013-10-01 16:06:43.764554292 +0000
 @@ -3447,7 +3447,7 @@
  
@@ -76 +157 @@
 diff -Naur gcc-4.8.1.orig/fixincludes/tests/base/iso/math_iso.h gcc-4.8.1/fixincludes/tests/base/iso/math_iso.h
 --- gcc-4.8.1.orig/fixincludes/tests/base/iso/math_iso.h        2011-08-10 08:43:38.000000000 +0000
-+++ gcc-4.8.1/fixincludes/tests/base/iso/math_iso.h     2013-09-13 19:01:42.879865711 +0000
++++ gcc-4.8.1/fixincludes/tests/base/iso/math_iso.h     2013-10-01 16:06:43.764554292 +0000
 @@ -10,7 +10,7 @@
  
@@ -86 +167 @@
                 __powl(__X, (long double) (__Y)); }
  #endif
+diff -Naur gcc-4.8.1.orig/gcc/ChangeLog gcc-4.8.1/gcc/ChangeLog
+--- gcc-4.8.1.orig/gcc/ChangeLog        2013-05-31 09:02:05.000000000 +0000
++++ gcc-4.8.1/gcc/ChangeLog     2013-10-01 16:08:15.584551652 +0000
+@@ -1,3 +1,12 @@
++2013-07-13  Tobias Grosser  <tobias@grosser.es>
++
++       PR tree-optimization/54094
++       * graphite-clast-to-gimple.c (translate_clast_for_loop): Derive the
++         scheduling dimension for the parallelism check from the polyhedral
++         information in the AST.
++       * graphite-dependences.c (carries_deps): Do not assume the schedule is
++         in 2D + 1 form.
++
+ 2013-05-31  Release Manager
+ 
+        * GCC 4.8.1 released.
 diff -Naur gcc-4.8.1.orig/gcc/DATESTAMP gcc-4.8.1/gcc/DATESTAMP
 --- gcc-4.8.1.orig/gcc/DATESTAMP        2013-05-31 00:16:35.000000000 +0000
-+++ gcc-4.8.1/gcc/DATESTAMP     2013-09-13 19:01:43.079865187 +0000
++++ gcc-4.8.1/gcc/DATESTAMP     2013-10-01 16:06:43.968554286 +0000
 @@ -1 +1 @@
 -20130531
-+20130828
++20131001
 diff -Naur gcc-4.8.1.orig/gcc/Makefile.in gcc-4.8.1/gcc/Makefile.in
 --- gcc-4.8.1.orig/gcc/Makefile.in      2013-05-21 16:00:49.000000000 +0000
-+++ gcc-4.8.1/gcc/Makefile.in   2013-09-13 19:01:43.176531600 +0000
++++ gcc-4.8.1/gcc/Makefile.in   2013-10-01 16:06:43.996554285 +0000
 @@ -2505,7 +2505,7 @@
     $(TM_H) coretypes.h $(TREE_PASS_H) $(FLAGS_H) \
@@ -106 +203 @@
 diff -Naur gcc-4.8.1.orig/gcc/ada/gcc-interface/ada-tree.h gcc-4.8.1/gcc/ada/gcc-interface/ada-tree.h
 --- gcc-4.8.1.orig/gcc/ada/gcc-interface/ada-tree.h     2013-02-25 19:08:51.000000000 +0000
-+++ gcc-4.8.1/gcc/ada/gcc-interface/ada-tree.h  2013-09-13 19:01:42.883199036 +0000
++++ gcc-4.8.1/gcc/ada/gcc-interface/ada-tree.h  2013-10-01 16:06:43.764554292 +0000
 @@ -360,10 +360,6 @@
     constant CONSTRUCTOR.  */
@@ -120 +217 @@
 diff -Naur gcc-4.8.1.orig/gcc/ada/gcc-interface/decl.c gcc-4.8.1/gcc/ada/gcc-interface/decl.c
 --- gcc-4.8.1.orig/gcc/ada/gcc-interface/decl.c 2013-05-07 08:03:15.000000000 +0000
-+++ gcc-4.8.1/gcc/ada/gcc-interface/decl.c      2013-09-13 19:01:42.886532361 +0000
++++ gcc-4.8.1/gcc/ada/gcc-interface/decl.c      2013-10-01 16:06:43.764554292 +0000
 @@ -1019,7 +1019,7 @@
                         save_gnu_tree (gnat_entity, gnu_decl, true);
@@ -199 +296 @@
 diff -Naur gcc-4.8.1.orig/gcc/ada/gcc-interface/gigi.h gcc-4.8.1/gcc/ada/gcc-interface/gigi.h
 --- gcc-4.8.1.orig/gcc/ada/gcc-interface/gigi.h 2013-02-06 13:19:20.000000000 +0000
-+++ gcc-4.8.1/gcc/ada/gcc-interface/gigi.h      2013-09-13 19:01:42.886532361 +0000
++++ gcc-4.8.1/gcc/ada/gcc-interface/gigi.h      2013-10-01 16:06:43.768554292 +0000
 @@ -177,10 +177,9 @@
  /* Given GNAT_ENTITY, an object (constant, variable, parameter, exception)
@@ -230 +327 @@
 diff -Naur gcc-4.8.1.orig/gcc/ada/gcc-interface/trans.c gcc-4.8.1/gcc/ada/gcc-interface/trans.c
 --- gcc-4.8.1.orig/gcc/ada/gcc-interface/trans.c        2013-05-26 10:04:50.000000000 +0000
-+++ gcc-4.8.1/gcc/ada/gcc-interface/trans.c     2013-09-13 19:01:42.889865685 +0000
-@@ -1075,19 +1075,6 @@
++++ gcc-4.8.1/gcc/ada/gcc-interface/trans.c     2013-10-01 16:06:43.768554292 +0000
+@@ -286,9 +286,6 @@
+   tree int64_type = gnat_type_for_size (64, 0);
+   struct elab_info *info;
+   int i;
+-#ifdef ORDINARY_MAP_INSTANCE
+-  struct line_map *map;
+-#endif
+ 
+   max_gnat_nodes = max_gnat_node;
+ 
+@@ -303,10 +300,6 @@
+ 
+   type_annotate_only = (gigi_operating_mode == 1);
+ 
+-  /* ??? Disable the generation of the SCO instance table until after the
+-     back-end supports instance based debug info discriminators.  */
+-  Generate_SCO_Instance_Table = False;
+-
+   for (i = 0; i < number_file; i++)
+     {
+       /* Use the identifier table to make a permanent copy of the filename as
+@@ -326,11 +319,6 @@
+       /* We create the line map for a source file at once, with a fixed number
+         of columns chosen to avoid jumping over the next power of 2.  */
+       linemap_add (line_table, LC_ENTER, 0, filename, 1);
+-#ifdef ORDINARY_MAP_INSTANCE
+-      map = LINEMAPS_ORDINARY_MAP_AT (line_table, i);
+-      if (flag_debug_instances)
+-       ORDINARY_MAP_INSTANCE (map) = file_info_ptr[i].Instance;
+-#endif
+       linemap_line_start (line_table, file_info_ptr[i].Num_Source_Lines, 252);
+       linemap_position_for_column (line_table, 252 - 1);
+       linemap_add (line_table, LC_LEAVE, 0, NULL, 0);
+@@ -1075,19 +1063,6 @@
      {
        const bool read_only = DECL_POINTS_TO_READONLY_P (gnu_result);
@@ -251 +381 @@
        if (TREE_CODE (gnu_result) == PARM_DECL
           && DECL_BY_COMPONENT_PTR_P (gnu_result))
-@@ -2280,7 +2267,10 @@
+@@ -1290,6 +1265,7 @@
+ static tree
+ Attribute_to_gnu (Node_Id gnat_node, tree *gnu_result_type_p, int attribute)
+ {
++  const Node_Id gnat_prefix = Prefix (gnat_node);
+   tree gnu_prefix, gnu_type, gnu_expr;
+   tree gnu_result_type, gnu_result = error_mark_node;
+   bool prefix_unused = false;
+@@ -1299,13 +1275,13 @@
+      parameter types might be incomplete types coming from a limited with.  */
+   if (Ekind (Etype (gnat_node)) == E_Access_Subprogram_Type
+       && Is_Dispatch_Table_Entity (Etype (gnat_node))
+-      && Nkind (Prefix (gnat_node)) == N_Identifier
+-      && Is_Subprogram (Entity (Prefix (gnat_node)))
+-      && Is_Public (Entity (Prefix (gnat_node)))
+-      && !present_gnu_tree (Entity (Prefix (gnat_node))))
+-    gnu_prefix = get_minimal_subprog_decl (Entity (Prefix (gnat_node)));
++      && Nkind (gnat_prefix) == N_Identifier
++      && Is_Subprogram (Entity (gnat_prefix))
++      && Is_Public (Entity (gnat_prefix))
++      && !present_gnu_tree (Entity (gnat_prefix)))
++    gnu_prefix = get_minimal_subprog_decl (Entity (gnat_prefix));
+   else
+-    gnu_prefix = gnat_to_gnu (Prefix (gnat_node));
++    gnu_prefix = gnat_to_gnu (gnat_prefix);
+   gnu_type = TREE_TYPE (gnu_prefix);
+ 
+   /* If the input is a NULL_EXPR, make a new one.  */
+@@ -1448,8 +1424,8 @@
+         since it can use a special calling convention on some platforms,
+         which cannot be propagated to the access type.  */
+       else if (attribute == Attr_Access
+-              && Nkind (Prefix (gnat_node)) == N_Identifier
+-              && is_cplusplus_method (Entity (Prefix (gnat_node))))
++              && Nkind (gnat_prefix) == N_Identifier
++              && is_cplusplus_method (Entity (gnat_prefix)))
+        post_error ("access to C++ constructor or member function not allowed",
+                    gnat_node);
+ 
+@@ -1560,13 +1536,12 @@
+          /* If this is a dereference and we have a special dynamic constrained
+             subtype on the prefix, use it to compute the size; otherwise, use
+             the designated subtype.  */
+-         if (Nkind (Prefix (gnat_node)) == N_Explicit_Dereference)
++         if (Nkind (gnat_prefix) == N_Explicit_Dereference)
+            {
+-             Node_Id gnat_deref = Prefix (gnat_node);
+              Node_Id gnat_actual_subtype
+-               = Actual_Designated_Subtype (gnat_deref);
++               = Actual_Designated_Subtype (gnat_prefix);
+              tree gnu_ptr_type
+-               = TREE_TYPE (gnat_to_gnu (Prefix (gnat_deref)));
++               = TREE_TYPE (gnat_to_gnu (Prefix (gnat_prefix)));
+ 
+              if (TYPE_IS_FAT_OR_THIN_POINTER_P (gnu_ptr_type)
+                  && Present (gnat_actual_subtype))
+@@ -1627,7 +1602,6 @@
+          align = DECL_ALIGN (TREE_OPERAND (gnu_prefix, 1)) / BITS_PER_UNIT;
+        else
+          {
+-           Node_Id gnat_prefix = Prefix (gnat_node);
+            Entity_Id gnat_type = Etype (gnat_prefix);
+            unsigned int double_align;
+            bool is_capped_double, align_clause;
+@@ -1699,28 +1673,38 @@
+                         : 1), i;
+        struct parm_attr_d *pa = NULL;
+        Entity_Id gnat_param = Empty;
++       bool unconstrained_ptr_deref = false;
+ 
+        /* Make sure any implicit dereference gets done.  */
+        gnu_prefix = maybe_implicit_deref (gnu_prefix);
+        gnu_prefix = maybe_unconstrained_array (gnu_prefix);
+ 
+-       /* We treat unconstrained array In parameters specially.  */
+-       if (!Is_Constrained (Etype (Prefix (gnat_node))))
+-         {
+-           Node_Id gnat_prefix = Prefix (gnat_node);
++       /* We treat unconstrained array In parameters specially.  We also note
++          whether we are dereferencing a pointer to unconstrained array.  */
++       if (!Is_Constrained (Etype (gnat_prefix)))
++         switch (Nkind (gnat_prefix))
++           {
++           case N_Identifier:
++             /* This is the direct case.  */
++             if (Ekind (Entity (gnat_prefix)) == E_In_Parameter)
++               gnat_param = Entity (gnat_prefix);
++             break;
+ 
+-           /* This is the direct case.  */
+-           if (Nkind (gnat_prefix) == N_Identifier
+-               && Ekind (Entity (gnat_prefix)) == E_In_Parameter)
+-             gnat_param = Entity (gnat_prefix);
+-
+-           /* This is the indirect case.  Note that we need to be sure that
+-              the access value cannot be null as we'll hoist the load.  */
+-           if (Nkind (gnat_prefix) == N_Explicit_Dereference
+-               && Nkind (Prefix (gnat_prefix)) == N_Identifier
+-               && Ekind (Entity (Prefix (gnat_prefix))) == E_In_Parameter
+-               && Can_Never_Be_Null (Entity (Prefix (gnat_prefix))))
+-             gnat_param = Entity (Prefix (gnat_prefix));
++           case N_Explicit_Dereference:
++             /* This is the indirect case.  Note that we need to be sure that
++                the access value cannot be null as we'll hoist the load.  */
++             if (Nkind (Prefix (gnat_prefix)) == N_Identifier
++                 && Ekind (Entity (Prefix (gnat_prefix))) == E_In_Parameter)
++               {
++                 if (Can_Never_Be_Null (Entity (Prefix (gnat_prefix))))
++                   gnat_param = Entity (Prefix (gnat_prefix));
++               }
++             else
++               unconstrained_ptr_deref = true;
++             break;
++
++           default:
++             break;
+          }
+ 
+        /* If the prefix is the view conversion of a constrained array to an
+@@ -1855,22 +1839,54 @@
+          {
+            gnu_result
+              = build1 (SAVE_EXPR, TREE_TYPE (gnu_result), gnu_result);
+-           if (attribute == Attr_First)
+-             pa->first = gnu_result;
+-           else if (attribute == Attr_Last)
+-             pa->last = gnu_result;
+-           else
+-             pa->length = gnu_result;
++           switch (attribute)
++             {
++             case Attr_First:
++               pa->first = gnu_result;
++               break;
++
++             case Attr_Last:
++               pa->last = gnu_result;
++               break;
++
++             case Attr_Length:
++             case Attr_Range_Length:
++               pa->length = gnu_result;
++               break;
++
++             default:
++               gcc_unreachable ();
++             }
+          }
+ 
+-       /* Set the source location onto the predicate of the condition in the
+-          'Length case but do not do it if the expression is cached to avoid
+-          messing up the debug info.  */
+-       else if ((attribute == Attr_Range_Length || attribute == Attr_Length)
+-                && TREE_CODE (gnu_result) == COND_EXPR
+-                && EXPR_P (TREE_OPERAND (gnu_result, 0)))
+-         set_expr_location_from_node (TREE_OPERAND (gnu_result, 0),
+-                                      gnat_node);
++       /* Otherwise, evaluate it each time it is referenced.  */
++       else
++         switch (attribute)
++           {
++           case Attr_First:
++           case Attr_Last:
++             /* If we are dereferencing a pointer to unconstrained array, we
++                need to capture the value because the pointed-to bounds may
++                subsequently be released.  */
++             if (unconstrained_ptr_deref)
++               gnu_result
++                 = build1 (SAVE_EXPR, TREE_TYPE (gnu_result), gnu_result);
++             break;
++
++           case Attr_Length:
++           case Attr_Range_Length:
++             /* Set the source location onto the predicate of the condition
++                but not if the expression is cached to avoid messing up the
++                debug info.  */
++             if (TREE_CODE (gnu_result) == COND_EXPR
++                 && EXPR_P (TREE_OPERAND (gnu_result, 0)))
++               set_expr_location_from_node (TREE_OPERAND (gnu_result, 0),
++                                            gnat_node);
++             break;
++
++           default:
++             gcc_unreachable ();
++           }
+ 
+        break;
+       }
+@@ -2043,8 +2059,8 @@
+ 
+     case Attr_Mechanism_Code:
+       {
++       Entity_Id gnat_obj = Entity (gnat_prefix);
+        int code;
+-       Entity_Id gnat_obj = Entity (Prefix (gnat_node));
+ 
+        prefix_unused = true;
+        gnu_result_type = get_unpadded_type (Etype (gnat_node));
+@@ -2079,10 +2095,11 @@
+      it has a side-effect.  But don't do it if the prefix is just an entity
+      name.  However, if an access check is needed, we must do it.  See second
+      example in AARM 11.6(5.e).  */
+-  if (prefix_unused && TREE_SIDE_EFFECTS (gnu_prefix)
+-      && !Is_Entity_Name (Prefix (gnat_node)))
+-    gnu_result = build_compound_expr  (TREE_TYPE (gnu_result), gnu_prefix,
+-                                      gnu_result);
++  if (prefix_unused
++      && TREE_SIDE_EFFECTS (gnu_prefix)
++      && !Is_Entity_Name (gnat_prefix))
++    gnu_result
++      = build_compound_expr  (TREE_TYPE (gnu_result), gnu_prefix, gnu_result);
+ 
+   *gnu_result_type_p = gnu_result_type;
+   return gnu_result;
+@@ -2280,7 +2297,10 @@
    if (TREE_CODE (val) != INTEGER_CST)
      return true;
@@ -263 +607 @@
  
  /* Return true if VAL (of type TYPE) can equal the minimum value of TYPE.
-@@ -3251,7 +3241,6 @@
+@@ -3251,7 +3271,6 @@
             = convert_vms_descriptor (TREE_TYPE (gnu_subprog_param),
                                       gnu_stub_param,
@@ -271 +615 @@
         }
        else
-@@ -3546,8 +3535,7 @@
+@@ -3490,6 +3509,8 @@
+     {
+       tree gnu_retval;
+ 
++      gnu_return_var_stack->pop ();
++
+       add_stmt (gnu_result);
+       add_stmt (build1 (LABEL_EXPR, void_type_node,
+                        gnu_return_label_stack->last ()));
+@@ -3546,8 +3567,7 @@
        bool is_var_decl = (TREE_CODE (gnu_param) == VAR_DECL);
  
@@ -281 +634 @@
        if (is_var_decl)
         save_gnu_tree (gnat_param, NULL_TREE, false);
-@@ -4009,12 +3997,6 @@
+@@ -4009,12 +4029,6 @@
           /* The symmetry of the paths to the type of an entity is broken here
              since arguments don't know that they will be passed by ref.  */
@@ -296 +649 @@
 diff -Naur gcc-4.8.1.orig/gcc/ada/gcc-interface/utils.c gcc-4.8.1/gcc/ada/gcc-interface/utils.c
 --- gcc-4.8.1.orig/gcc/ada/gcc-interface/utils.c        2013-02-06 13:19:20.000000000 +0000
-+++ gcc-4.8.1/gcc/ada/gcc-interface/utils.c     2013-09-13 19:01:42.893199010 +0000
++++ gcc-4.8.1/gcc/ada/gcc-interface/utils.c     2013-10-01 16:06:43.768554292 +0000
 @@ -4073,33 +4073,25 @@
  
@@ -356 +709 @@
 diff -Naur gcc-4.8.1.orig/gcc/ada/targparm.ads gcc-4.8.1/gcc/ada/targparm.ads
 --- gcc-4.8.1.orig/gcc/ada/targparm.ads 2013-02-06 10:35:52.000000000 +0000
-+++ gcc-4.8.1/gcc/ada/targparm.ads      2013-09-13 19:01:42.893199010 +0000
++++ gcc-4.8.1/gcc/ada/targparm.ads      2013-10-01 16:06:43.768554292 +0000
 @@ -436,7 +436,7 @@
     --  the source program may not contain explicit 64-bit shifts. In addition,
@@ -368 +721 @@
 diff -Naur gcc-4.8.1.orig/gcc/asan.c gcc-4.8.1/gcc/asan.c
 --- gcc-4.8.1.orig/gcc/asan.c   2013-02-28 21:23:23.000000000 +0000
-+++ gcc-4.8.1/gcc/asan.c        2013-09-13 19:01:42.896532334 +0000
++++ gcc-4.8.1/gcc/asan.c        2013-10-01 16:06:43.768554292 +0000
 @@ -1675,7 +1675,7 @@
     access to the last byte of the argument; it uses the result of the
@@ -403 +756 @@
 diff -Naur gcc-4.8.1.orig/gcc/c-family/c-ada-spec.c gcc-4.8.1/gcc/c-family/c-ada-spec.c
 --- gcc-4.8.1.orig/gcc/c-family/c-ada-spec.c    2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/c-family/c-ada-spec.c 2013-09-13 19:01:42.896532334 +0000
++++ gcc-4.8.1/gcc/c-family/c-ada-spec.c 2013-10-01 16:06:43.768554292 +0000
 @@ -2900,7 +2900,7 @@
        pp_string (buffer, "  -- ");
@@ -413 +766 @@
  
        newline_and_indent (buffer, spc);
+diff -Naur gcc-4.8.1.orig/gcc/cfgcleanup.c gcc-4.8.1/gcc/cfgcleanup.c
+--- gcc-4.8.1.orig/gcc/cfgcleanup.c     2013-01-30 11:53:28.000000000 +0000
++++ gcc-4.8.1/gcc/cfgcleanup.c  2013-10-01 16:06:43.772554291 +0000
+@@ -927,6 +927,24 @@
+          set_mem_align (y, MEM_ALIGN (x));
+        }
+     }
++  if (code == MEM)
++    {
++      if (MEM_READONLY_P (x) != MEM_READONLY_P (y))
++       {
++         MEM_READONLY_P (x) = 0;
++         MEM_READONLY_P (y) = 0;
++       }
++      if (MEM_NOTRAP_P (x) != MEM_NOTRAP_P (y))
++       {
++         MEM_NOTRAP_P (x) = 0;
++         MEM_NOTRAP_P (y) = 0;
++       }
++      if (MEM_VOLATILE_P (x) != MEM_VOLATILE_P (y))
++       {
++         MEM_VOLATILE_P (x) = 1;
++         MEM_VOLATILE_P (y) = 1;
++       }
++    }
+ 
+   fmt = GET_RTX_FORMAT (code);
+   for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
 diff -Naur gcc-4.8.1.orig/gcc/collect2.c gcc-4.8.1/gcc/collect2.c
 --- gcc-4.8.1.orig/gcc/collect2.c       2013-02-07 02:53:13.000000000 +0000
-+++ gcc-4.8.1/gcc/collect2.c    2013-09-13 19:01:42.899865659 +0000
++++ gcc-4.8.1/gcc/collect2.c    2013-10-01 16:06:43.772554291 +0000
 @@ -366,8 +366,8 @@
  
@@ -561 +942 @@
 diff -Naur gcc-4.8.1.orig/gcc/collect2.h gcc-4.8.1/gcc/collect2.h
 --- gcc-4.8.1.orig/gcc/collect2.h       2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/collect2.h    2013-09-13 19:01:42.899865659 +0000
++++ gcc-4.8.1/gcc/collect2.h    2013-10-01 16:06:43.772554291 +0000
 @@ -25,8 +25,6 @@
  extern struct pex_obj *collect_execute (const char *, char **, const char *,
@@ -573 +954 @@
 diff -Naur gcc-4.8.1.orig/gcc/common/config/s390/s390-common.c gcc-4.8.1/gcc/common/config/s390/s390-common.c
 --- gcc-4.8.1.orig/gcc/common/config/s390/s390-common.c 2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/common/config/s390/s390-common.c      2013-09-13 19:01:42.899865659 +0000
++++ gcc-4.8.1/gcc/common/config/s390/s390-common.c      2013-10-01 16:06:43.772554291 +0000
 @@ -42,7 +42,7 @@
      /* z196 */   PF_IEEE_FLOAT | PF_ZARCH | PF_LONG_DISPLACEMENT
@@ -585 +966 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/aarch64-builtins.c gcc-4.8.1/gcc/config/aarch64/aarch64-builtins.c
 --- gcc-4.8.1.orig/gcc/config/aarch64/aarch64-builtins.c        2013-02-28 17:19:33.000000000 +0000
-+++ gcc-4.8.1/gcc/config/aarch64/aarch64-builtins.c     2013-09-13 19:01:42.899865659 +0000
++++ gcc-4.8.1/gcc/config/aarch64/aarch64-builtins.c     2013-10-01 16:06:43.772554291 +0000
 @@ -1154,6 +1154,7 @@
        return aarch64_simd_expand_args (target, icode, 1, exp,
@@ -596 +977 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/aarch64-linux.h gcc-4.8.1/gcc/config/aarch64/aarch64-linux.h
 --- gcc-4.8.1.orig/gcc/config/aarch64/aarch64-linux.h   2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/aarch64/aarch64-linux.h        2013-09-13 19:01:42.903198984 +0000
++++ gcc-4.8.1/gcc/config/aarch64/aarch64-linux.h        2013-10-01 16:06:43.772554291 +0000
 @@ -23,6 +23,8 @@
  
@@ -608 +989 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/aarch64-simd-builtins.def gcc-4.8.1/gcc/config/aarch64/aarch64-simd-builtins.def
 --- gcc-4.8.1.orig/gcc/config/aarch64/aarch64-simd-builtins.def 2013-02-22 16:39:45.000000000 +0000
-+++ gcc-4.8.1/gcc/config/aarch64/aarch64-simd-builtins.def      2013-09-13 19:01:42.906532308 +0000
++++ gcc-4.8.1/gcc/config/aarch64/aarch64-simd-builtins.def      2013-10-01 16:06:43.776554291 +0000
 @@ -256,3 +256,10 @@
    BUILTIN_VALL (BINOP, uzp2)
@@ -622 +1003 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/aarch64-simd.md gcc-4.8.1/gcc/config/aarch64/aarch64-simd.md
 --- gcc-4.8.1.orig/gcc/config/aarch64/aarch64-simd.md   2013-04-11 14:14:56.000000000 +0000
-+++ gcc-4.8.1/gcc/config/aarch64/aarch64-simd.md        2013-09-13 19:01:42.906532308 +0000
++++ gcc-4.8.1/gcc/config/aarch64/aarch64-simd.md        2013-10-01 16:06:43.776554291 +0000
 @@ -3457,6 +3457,17 @@
    DONE;
@@ -661 +1042 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/aarch64.c gcc-4.8.1/gcc/config/aarch64/aarch64.c
 --- gcc-4.8.1.orig/gcc/config/aarch64/aarch64.c 2013-05-02 17:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/config/aarch64/aarch64.c      2013-09-13 19:01:42.903198984 +0000
++++ gcc-4.8.1/gcc/config/aarch64/aarch64.c      2013-10-01 16:06:43.772554291 +0000
 @@ -3373,7 +3373,7 @@
           output_operand_lossage ("invalid operand for '%%%c'", code);
@@ -673 +1054 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/aarch64.md gcc-4.8.1/gcc/config/aarch64/aarch64.md
 --- gcc-4.8.1.orig/gcc/config/aarch64/aarch64.md        2013-04-25 17:00:44.000000000 +0000
-+++ gcc-4.8.1/gcc/config/aarch64/aarch64.md     2013-09-13 19:01:42.906532308 +0000
++++ gcc-4.8.1/gcc/config/aarch64/aarch64.md     2013-10-01 16:06:43.772554291 +0000
 @@ -834,7 +834,8 @@
     movi\\t%d0, %1"
@@ -686 +1067 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/arm_neon.h gcc-4.8.1/gcc/config/aarch64/arm_neon.h
 --- gcc-4.8.1.orig/gcc/config/aarch64/arm_neon.h        2013-04-24 15:47:21.000000000 +0000
-+++ gcc-4.8.1/gcc/config/aarch64/arm_neon.h     2013-09-13 19:01:42.916532282 +0000
++++ gcc-4.8.1/gcc/config/aarch64/arm_neon.h     2013-10-01 16:06:43.776554291 +0000
 @@ -8518,28 +8518,6 @@
    return result;
@@ -1549 +1930 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/alpha/alpha.c gcc-4.8.1/gcc/config/alpha/alpha.c
 --- gcc-4.8.1.orig/gcc/config/alpha/alpha.c     2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/alpha/alpha.c  2013-09-13 19:01:42.919865606 +0000
-@@ -2700,12 +2700,12 @@
++++ gcc-4.8.1/gcc/config/alpha/alpha.c  2013-10-01 16:06:43.780554291 +0000
+@@ -2659,6 +2659,7 @@
+       cmp_mode = cmp_mode == DImode ? DFmode : DImode;
+       op0 = gen_lowpart (cmp_mode, tem);
+       op1 = CONST0_RTX (cmp_mode);
++      cmp = gen_rtx_fmt_ee (code, VOIDmode, op0, op1);
+       local_fast_math = 1;
+     }
+ 
+@@ -2700,12 +2701,12 @@
        break;
  
@@ -1569 +1958 @@
  
      default:
-@@ -3067,12 +3067,9 @@
+@@ -3067,12 +3068,9 @@
    operands[1] = op1;
    out = gen_reg_rtx (DImode);
@@ -1587 +1976 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/alpha/alpha.md gcc-4.8.1/gcc/config/alpha/alpha.md
 --- gcc-4.8.1.orig/gcc/config/alpha/alpha.md    2013-02-01 16:34:28.000000000 +0000
-+++ gcc-4.8.1/gcc/config/alpha/alpha.md 2013-09-13 19:01:42.923198931 +0000
++++ gcc-4.8.1/gcc/config/alpha/alpha.md 2013-10-01 16:06:43.780554291 +0000
 @@ -23,6 +23,7 @@
  ;; Uses of UNSPEC in this file:
@@ -1598 +1987 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/arm/arm.c gcc-4.8.1/gcc/config/arm/arm.c
 --- gcc-4.8.1.orig/gcc/config/arm/arm.c 2013-05-24 15:15:44.000000000 +0000
-+++ gcc-4.8.1/gcc/config/arm/arm.c      2013-09-13 19:01:42.933198905 +0000
++++ gcc-4.8.1/gcc/config/arm/arm.c      2013-10-01 16:06:43.784554291 +0000
 @@ -4459,7 +4459,9 @@
      if (((pcum->aapcs_vfp_regs_free >> regno) & mask) == mask)
@@ -1680 +2069 @@
                       + MEM_P (SET_DEST (x))));
  
+@@ -17453,7 +17475,8 @@
+            }
+        }
+ 
+-      if (current_tune->prefer_ldrd_strd
++      if (TARGET_LDRD
++         && current_tune->prefer_ldrd_strd
+           && !optimize_function_for_size_p (cfun))
+         {
+           if (TARGET_THUMB2)
+@@ -23767,7 +23790,8 @@
+         }
+       else
+         {
+-          if (current_tune->prefer_ldrd_strd
++          if (TARGET_LDRD
++             && current_tune->prefer_ldrd_strd
+               && !optimize_function_for_size_p (cfun))
+             {
+               if (TARGET_THUMB2)
 diff -Naur gcc-4.8.1.orig/gcc/config/arm/neon.md gcc-4.8.1/gcc/config/arm/neon.md
 --- gcc-4.8.1.orig/gcc/config/arm/neon.md       2013-04-04 14:34:01.000000000 +0000
-+++ gcc-4.8.1/gcc/config/arm/neon.md    2013-09-13 19:01:42.936532229 +0000
++++ gcc-4.8.1/gcc/config/arm/neon.md    2013-10-01 16:06:43.784554291 +0000
 @@ -244,7 +244,7 @@
    [(set (match_operand:VDQX 0 "neon_struct_or_register_operand")
@@ -1785 +2194 @@
        if (!inverse)
         emit_insn (base_comparison (mask, operands[4], operands[5], magic_rtx));
+diff -Naur gcc-4.8.1.orig/gcc/config/arm/vfp.md gcc-4.8.1/gcc/config/arm/vfp.md
+--- gcc-4.8.1.orig/gcc/config/arm/vfp.md        2013-01-29 18:34:12.000000000 +0000
++++ gcc-4.8.1/gcc/config/arm/vfp.md     2013-10-01 16:06:43.784554291 +0000
+@@ -1207,18 +1207,18 @@
+    (set_attr "type" "fcmpd")]
+ )
+ 
+-;; Fixed point to floating point conversions. 
++;; Fixed point to floating point conversions.
+ (define_code_iterator FCVT [unsigned_float float])
+ (define_code_attr FCVTI32typename [(unsigned_float "u32") (float "s32")])
+ 
+ (define_insn "*combine_vcvt_f32_<FCVTI32typename>"
+   [(set (match_operand:SF 0 "s_register_operand" "=t")
+        (mult:SF (FCVT:SF (match_operand:SI 1 "s_register_operand" "0"))
+-                (match_operand 2 
++                (match_operand 2
+                        "const_double_vcvt_power_of_two_reciprocal" "Dt")))]
+   "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_VFP3 && !flag_rounding_math"
+-  "vcvt.f32.<FCVTI32typename>\\t%0, %1, %v2"
+- [(set_attr "predicable" "no")
++  "vcvt%?.f32.<FCVTI32typename>\\t%0, %1, %v2"
++ [(set_attr "predicable" "yes")
+   (set_attr "type" "f_cvt")]
+ )
+ 
+@@ -1227,15 +1227,16 @@
+ (define_insn "*combine_vcvt_f64_<FCVTI32typename>"
+   [(set (match_operand:DF 0 "s_register_operand" "=x,x,w")
+        (mult:DF (FCVT:DF (match_operand:SI 1 "s_register_operand" "r,t,r"))
+-                (match_operand 2 
++                (match_operand 2
+                     "const_double_vcvt_power_of_two_reciprocal" "Dt,Dt,Dt")))]
+-  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_VFP3 && !flag_rounding_math 
++  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_VFP3 && !flag_rounding_math
+   && !TARGET_VFP_SINGLE"
+   "@
+-  vmov.f32\\t%0, %1\;vcvt.f64.<FCVTI32typename>\\t%P0, %P0, %v2
+-  vmov.f32\\t%0, %1\;vcvt.f64.<FCVTI32typename>\\t%P0, %P0, %v2
+-  vmov.f64\\t%P0, %1, %1\;vcvt.f64.<FCVTI32typename>\\t%P0, %P0, %v2"
+- [(set_attr "predicable" "no")
++  vmov%?.f32\\t%0, %1\;vcvt%?.f64.<FCVTI32typename>\\t%P0, %P0, %v2
++  vmov%?.f32\\t%0, %1\;vcvt%?.f64.<FCVTI32typename>\\t%P0, %P0, %v2
++  vmov%?.f64\\t%P0, %1, %1\;vcvt%?.f64.<FCVTI32typename>\\t%P0, %P0, %v2"
++ [(set_attr "predicable" "yes")
++  (set_attr "ce_count" "2")
+   (set_attr "type" "f_cvt")
+   (set_attr "length" "8")]
+ )
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/avr-fixed.md gcc-4.8.1/gcc/config/avr/avr-fixed.md
 --- gcc-4.8.1.orig/gcc/config/avr/avr-fixed.md  2013-02-08 10:13:37.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/avr-fixed.md       2013-09-13 19:01:42.939865554 +0000
++++ gcc-4.8.1/gcc/config/avr/avr-fixed.md       2013-10-01 16:06:43.792554291 +0000
 @@ -447,49 +447,18 @@
  ;; "roundqq3_const"  "rounduqq3_const"
@@ -1850 +2308 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/avr-mcus.def gcc-4.8.1/gcc/config/avr/avr-mcus.def
 --- gcc-4.8.1.orig/gcc/config/avr/avr-mcus.def  2013-02-28 09:03:09.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/avr-mcus.def       2013-09-13 19:01:42.939865554 +0000
++++ gcc-4.8.1/gcc/config/avr/avr-mcus.def       2013-10-01 16:06:43.792554291 +0000
 @@ -168,7 +168,6 @@
  AVR_MCU ("atmega169a",           ARCH_AVR5, "__AVR_ATmega169A__",        0, 0, 0x0100, 1, "m169a")
@@ -1901 +2359 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/avr-protos.h gcc-4.8.1/gcc/config/avr/avr-protos.h
 --- gcc-4.8.1.orig/gcc/config/avr/avr-protos.h  2013-01-14 15:08:45.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/avr-protos.h       2013-09-13 19:01:42.943198879 +0000
++++ gcc-4.8.1/gcc/config/avr/avr-protos.h       2013-10-01 16:06:43.792554291 +0000
 @@ -86,7 +86,8 @@
  extern void avr_output_addr_vec_elt (FILE *stream, int value);
@@ -1914 +2372 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/avr-tables.opt gcc-4.8.1/gcc/config/avr/avr-tables.opt
 --- gcc-4.8.1.orig/gcc/config/avr/avr-tables.opt        2013-02-28 09:03:09.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/avr-tables.opt     2013-09-13 19:01:42.946532203 +0000
++++ gcc-4.8.1/gcc/config/avr/avr-tables.opt     2013-10-01 16:06:43.792554291 +0000
 @@ -330,479 +330,440 @@
  Enum(avr_mcu) String(atmega169pa) Value(101)
@@ -2543 +3001 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/avr.c gcc-4.8.1/gcc/config/avr/avr.c
 --- gcc-4.8.1.orig/gcc/config/avr/avr.c 2013-03-12 11:42:26.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/avr.c      2013-09-13 19:01:42.939865554 +0000
++++ gcc-4.8.1/gcc/config/avr/avr.c      2013-10-01 16:06:43.784554291 +0000
 @@ -584,7 +584,12 @@
      {
@@ -2787 +3245 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/avr.md gcc-4.8.1/gcc/config/avr/avr.md
 --- gcc-4.8.1.orig/gcc/config/avr/avr.md        2013-02-08 10:13:37.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/avr.md     2013-09-13 19:01:42.943198879 +0000
++++ gcc-4.8.1/gcc/config/avr/avr.md     2013-10-01 16:06:43.792554291 +0000
 @@ -140,7 +140,7 @@
    "out_bitop, plus, addto_sp,
@@ -2799 +3257 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/avr.opt gcc-4.8.1/gcc/config/avr/avr.opt
 --- gcc-4.8.1.orig/gcc/config/avr/avr.opt       2013-03-12 11:42:26.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/avr.opt    2013-09-13 19:01:42.943198879 +0000
++++ gcc-4.8.1/gcc/config/avr/avr.opt    2013-10-01 16:06:43.792554291 +0000
 @@ -77,4 +77,4 @@
  
@@ -2808 +3266 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/gen-avr-mmcu-texi.c gcc-4.8.1/gcc/config/avr/gen-avr-mmcu-texi.c
 --- gcc-4.8.1.orig/gcc/config/avr/gen-avr-mmcu-texi.c   2013-01-14 18:09:34.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/gen-avr-mmcu-texi.c        2013-09-13 19:01:42.946532203 +0000
++++ gcc-4.8.1/gcc/config/avr/gen-avr-mmcu-texi.c        2013-10-01 16:06:43.792554291 +0000
 @@ -68,6 +68,7 @@
  static void
@@ -2841 +3299 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/avr/t-multilib gcc-4.8.1/gcc/config/avr/t-multilib
 --- gcc-4.8.1.orig/gcc/config/avr/t-multilib    2013-02-28 09:03:09.000000000 +0000
-+++ gcc-4.8.1/gcc/config/avr/t-multilib 2013-09-13 19:01:42.946532203 +0000
++++ gcc-4.8.1/gcc/config/avr/t-multilib 2013-10-01 16:06:43.792554291 +0000
 @@ -135,7 +135,6 @@
         mmcu?avr5=mmcu?atmega169a \
@@ -2892 +3350 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/darwin-protos.h gcc-4.8.1/gcc/config/darwin-protos.h
 --- gcc-4.8.1.orig/gcc/config/darwin-protos.h   2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/darwin-protos.h        2013-09-13 19:01:42.949865528 +0000
++++ gcc-4.8.1/gcc/config/darwin-protos.h        2013-10-01 16:06:43.792554291 +0000
 @@ -25,6 +25,7 @@
  extern void machopic_output_function_base_name (FILE *);
@@ -2903 +3361 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/darwin.c gcc-4.8.1/gcc/config/darwin.c
 --- gcc-4.8.1.orig/gcc/config/darwin.c  2013-02-11 22:36:23.000000000 +0000
-+++ gcc-4.8.1/gcc/config/darwin.c       2013-09-13 19:01:42.946532203 +0000
++++ gcc-4.8.1/gcc/config/darwin.c       2013-10-01 16:06:43.792554291 +0000
 @@ -369,14 +369,13 @@
  
@@ -2954 +3412 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/i386/bmiintrin.h gcc-4.8.1/gcc/config/i386/bmiintrin.h
 --- gcc-4.8.1.orig/gcc/config/i386/bmiintrin.h  2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/i386/bmiintrin.h       2013-09-13 19:01:42.949865528 +0000
++++ gcc-4.8.1/gcc/config/i386/bmiintrin.h       2013-10-01 16:06:43.792554291 +0000
 @@ -38,7 +38,6 @@
    return __builtin_ctzs (__X);
@@ -3084 +3542 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/i386/driver-i386.c gcc-4.8.1/gcc/config/i386/driver-i386.c
 --- gcc-4.8.1.orig/gcc/config/i386/driver-i386.c        2013-05-17 15:06:36.000000000 +0000
-+++ gcc-4.8.1/gcc/config/i386/driver-i386.c     2013-09-13 19:01:42.949865528 +0000
++++ gcc-4.8.1/gcc/config/i386/driver-i386.c     2013-10-01 16:06:43.792554291 +0000
 @@ -520,8 +520,7 @@
        if (vendor == signature_AMD_ebx
@@ -3153 +3611 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/i386/i386.c gcc-4.8.1/gcc/config/i386/i386.c
 --- gcc-4.8.1.orig/gcc/config/i386/i386.c       2013-05-17 15:06:36.000000000 +0000
-+++ gcc-4.8.1/gcc/config/i386/i386.c    2013-09-13 19:01:42.963198826 +0000
++++ gcc-4.8.1/gcc/config/i386/i386.c    2013-10-01 16:06:43.796554291 +0000
 @@ -2438,11 +2438,11 @@
    {&generic32_cost, 16, 7, 16, 7, 16},
@@ -3463 +3921 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/i386/i386.md gcc-4.8.1/gcc/config/i386/i386.md
 --- gcc-4.8.1.orig/gcc/config/i386/i386.md      2013-05-22 12:16:41.000000000 +0000
-+++ gcc-4.8.1/gcc/config/i386/i386.md   2013-09-13 19:01:42.969865475 +0000
++++ gcc-4.8.1/gcc/config/i386/i386.md   2013-10-01 16:06:43.928554287 +0000
 @@ -222,6 +222,8 @@
    UNSPECV_XEND
@@ -3573 +4031 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/i386/predicates.md gcc-4.8.1/gcc/config/i386/predicates.md
 --- gcc-4.8.1.orig/gcc/config/i386/predicates.md        2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/i386/predicates.md     2013-09-13 19:01:42.969865475 +0000
++++ gcc-4.8.1/gcc/config/i386/predicates.md     2013-10-01 16:06:43.928554287 +0000
 @@ -835,19 +835,28 @@
      return false;
@@ -3617 +4075 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/i386/sse.md gcc-4.8.1/gcc/config/i386/sse.md
 --- gcc-4.8.1.orig/gcc/config/i386/sse.md       2013-04-29 22:16:04.000000000 +0000
-+++ gcc-4.8.1/gcc/config/i386/sse.md    2013-09-13 19:01:42.976532125 +0000
++++ gcc-4.8.1/gcc/config/i386/sse.md    2013-10-01 16:06:43.928554287 +0000
 @@ -3603,7 +3603,7 @@
         (vec_select:V4SF
@@ -3680 +4138 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/i386/x86-64.h gcc-4.8.1/gcc/config/i386/x86-64.h
 --- gcc-4.8.1.orig/gcc/config/i386/x86-64.h     2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/i386/x86-64.h  2013-09-13 19:01:42.976532125 +0000
++++ gcc-4.8.1/gcc/config/i386/x86-64.h  2013-10-01 16:06:43.928554287 +0000
 @@ -103,3 +103,6 @@
  
@@ -3688 +4146 @@
 +#undef TARGET_SECTION_TYPE_FLAGS
 +#define TARGET_SECTION_TYPE_FLAGS  x86_64_elf_section_type_flags
+diff -Naur gcc-4.8.1.orig/gcc/config/pa/pa.c gcc-4.8.1/gcc/config/pa/pa.c
+--- gcc-4.8.1.orig/gcc/config/pa/pa.c   2013-04-06 17:46:50.000000000 +0000
++++ gcc-4.8.1/gcc/config/pa/pa.c        2013-10-01 16:06:43.928554287 +0000
+@@ -513,6 +513,12 @@
+       write_symbols = NO_DEBUG;
+     }
+ 
++#ifdef AUTO_INC_DEC
++  /* FIXME: Disable auto increment and decrement processing until reload
++     is completed.  See PR middle-end 56791.  */
++  flag_auto_inc_dec = reload_completed;
++#endif
++
+   /* We only support the "big PIC" model now.  And we always generate PIC
+      code when in 64bit mode.  */
+   if (flag_pic == 1 || TARGET_64BIT)
+@@ -4038,7 +4044,8 @@
+              || (! TARGET_64BIT && df_regs_ever_live_p (i + 1)))
+            {
+              rtx addr, insn, reg;
+-             addr = gen_rtx_MEM (DFmode, gen_rtx_POST_INC (DFmode, tmpreg));
++             addr = gen_rtx_MEM (DFmode,
++                                 gen_rtx_POST_INC (word_mode, tmpreg));
+              reg = gen_rtx_REG (DFmode, i);
+              insn = emit_move_insn (addr, reg);
+              if (DO_FRAME_NOTES)
+@@ -4331,7 +4338,8 @@
+        if (df_regs_ever_live_p (i)
+            || (! TARGET_64BIT && df_regs_ever_live_p (i + 1)))
+          {
+-           rtx src = gen_rtx_MEM (DFmode, gen_rtx_POST_INC (DFmode, tmpreg));
++           rtx src = gen_rtx_MEM (DFmode,
++                                  gen_rtx_POST_INC (word_mode, tmpreg));
+            rtx dest = gen_rtx_REG (DFmode, i);
+            emit_move_insn (dest, src);
+          }
+diff -Naur gcc-4.8.1.orig/gcc/config/pa/pa.md gcc-4.8.1/gcc/config/pa/pa.md
+--- gcc-4.8.1.orig/gcc/config/pa/pa.md  2013-03-11 00:44:28.000000000 +0000
++++ gcc-4.8.1/gcc/config/pa/pa.md       2013-10-01 16:06:43.932554287 +0000
+@@ -833,46 +833,46 @@
+ (define_insn "scc"
+   [(set (match_operand:SI 0 "register_operand" "=r")
+        (match_operator:SI 3 "comparison_operator"
+-                          [(match_operand:SI 1 "register_operand" "r")
++                          [(match_operand:SI 1 "reg_or_0_operand" "rM")
+                            (match_operand:SI 2 "arith11_operand" "rI")]))]
+   ""
+-  "{com%I2clr|cmp%I2clr},%B3 %2,%1,%0\;ldi 1,%0"
++  "{com%I2clr|cmp%I2clr},%B3 %2,%r1,%0\;ldi 1,%0"
+   [(set_attr "type" "binary")
+    (set_attr "length" "8")])
+ 
+ (define_insn ""
+   [(set (match_operand:DI 0 "register_operand" "=r")
+        (match_operator:DI 3 "comparison_operator"
+-                          [(match_operand:DI 1 "register_operand" "r")
++                          [(match_operand:DI 1 "reg_or_0_operand" "rM")
+                            (match_operand:DI 2 "arith11_operand" "rI")]))]
+   "TARGET_64BIT"
+-  "cmp%I2clr,*%B3 %2,%1,%0\;ldi 1,%0"
++  "cmp%I2clr,*%B3 %2,%r1,%0\;ldi 1,%0"
+   [(set_attr "type" "binary")
+    (set_attr "length" "8")])
+ 
+ (define_insn "iorscc"
+   [(set (match_operand:SI 0 "register_operand" "=r")
+        (ior:SI (match_operator:SI 3 "comparison_operator"
+-                                  [(match_operand:SI 1 "register_operand" "r")
++                                  [(match_operand:SI 1 "reg_or_0_operand" "rM")
+                                    (match_operand:SI 2 "arith11_operand" "rI")])
+                (match_operator:SI 6 "comparison_operator"
+-                                  [(match_operand:SI 4 "register_operand" "r")
++                                  [(match_operand:SI 4 "reg_or_0_operand" "rM")
+                                    (match_operand:SI 5 "arith11_operand" "rI")])))]
+   ""
+-  "{com%I2clr|cmp%I2clr},%S3 %2,%1,%%r0\;{com%I5clr|cmp%I5clr},%B6 %5,%4,%0\;ldi 1,%0"
++  "{com%I2clr|cmp%I2clr},%S3 %2,%r1,%%r0\;{com%I5clr|cmp%I5clr},%B6 %5,%r4,%0\;ldi 1,%0"
+   [(set_attr "type" "binary")
+    (set_attr "length" "12")])
+ 
+ (define_insn ""
+   [(set (match_operand:DI 0 "register_operand" "=r")
+        (ior:DI (match_operator:DI 3 "comparison_operator"
+-                                  [(match_operand:DI 1 "register_operand" "r")
++                                  [(match_operand:DI 1 "reg_or_0_operand" "rM")
+                                    (match_operand:DI 2 "arith11_operand" "rI")])
+                (match_operator:DI 6 "comparison_operator"
+-                                  [(match_operand:DI 4 "register_operand" "r")
++                                  [(match_operand:DI 4 "reg_or_0_operand" "rM")
+                                    (match_operand:DI 5 "arith11_operand" "rI")])))]
+   "TARGET_64BIT"
+-  "cmp%I2clr,*%S3 %2,%1,%%r0\;cmp%I5clr,*%B6 %5,%4,%0\;ldi 1,%0"
++  "cmp%I2clr,*%S3 %2,%r1,%%r0\;cmp%I5clr,*%B6 %5,%r4,%0\;ldi 1,%0"
+   [(set_attr "type" "binary")
+    (set_attr "length" "12")])
+ 
+@@ -881,20 +881,20 @@
+ (define_insn "negscc"
+   [(set (match_operand:SI 0 "register_operand" "=r")
+        (neg:SI (match_operator:SI 3 "comparison_operator"
+-              [(match_operand:SI 1 "register_operand" "r")
++              [(match_operand:SI 1 "reg_or_0_operand" "rM")
+                (match_operand:SI 2 "arith11_operand" "rI")])))]
+   ""
+-  "{com%I2clr|cmp%I2clr},%B3 %2,%1,%0\;ldi -1,%0"
++  "{com%I2clr|cmp%I2clr},%B3 %2,%r1,%0\;ldi -1,%0"
+   [(set_attr "type" "binary")
+    (set_attr "length" "8")])
+ 
+ (define_insn ""
+   [(set (match_operand:DI 0 "register_operand" "=r")
+        (neg:DI (match_operator:DI 3 "comparison_operator"
+-              [(match_operand:DI 1 "register_operand" "r")
++              [(match_operand:DI 1 "reg_or_0_operand" "rM")
+                (match_operand:DI 2 "arith11_operand" "rI")])))]
+   "TARGET_64BIT"
+-  "cmp%I2clr,*%B3 %2,%1,%0\;ldi -1,%0"
++  "cmp%I2clr,*%B3 %2,%r1,%0\;ldi -1,%0"
+   [(set_attr "type" "binary")
+    (set_attr "length" "8")])
+ 
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/default64.h gcc-4.8.1/gcc/config/rs6000/default64.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/default64.h        2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/default64.h     2013-09-13 19:01:42.976532125 +0000
++++ gcc-4.8.1/gcc/config/rs6000/default64.h     2013-10-01 16:06:43.932554287 +0000
 @@ -18,5 +18,10 @@
  along with GCC; see the file COPYING3.  If not see
@@ -3704 +4283 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/dfp.md gcc-4.8.1/gcc/config/rs6000/dfp.md
 --- gcc-4.8.1.orig/gcc/config/rs6000/dfp.md     2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/dfp.md  2013-09-13 19:01:42.976532125 +0000
++++ gcc-4.8.1/gcc/config/rs6000/dfp.md  2013-10-01 16:06:43.932554287 +0000
 @@ -394,11 +394,14 @@
    "")
@@ -3726 +4305 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/linux.h gcc-4.8.1/gcc/config/rs6000/linux.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/linux.h    2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/linux.h 2013-09-13 19:01:42.979865449 +0000
++++ gcc-4.8.1/gcc/config/rs6000/linux.h 2013-10-01 16:06:43.932554287 +0000
 @@ -79,6 +79,24 @@
  #undef LINK_OS_DEFAULT_SPEC
@@ -3754 +4333 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/linux64.h gcc-4.8.1/gcc/config/rs6000/linux64.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/linux64.h  2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/linux64.h       2013-09-13 19:01:42.976532125 +0000
++++ gcc-4.8.1/gcc/config/rs6000/linux64.h       2013-10-01 16:06:43.932554287 +0000
 @@ -180,20 +180,14 @@
  #endif
@@ -3826 +4405 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/linuxaltivec.h gcc-4.8.1/gcc/config/rs6000/linuxaltivec.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/linuxaltivec.h     2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/linuxaltivec.h  2013-09-13 19:01:42.976532125 +0000
++++ gcc-4.8.1/gcc/config/rs6000/linuxaltivec.h  2013-10-01 16:06:43.932554287 +0000
 @@ -20,8 +20,13 @@
     <http://www.gnu.org/licenses/>.  */
@@ -3843 +4422 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/linuxspe.h gcc-4.8.1/gcc/config/rs6000/linuxspe.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/linuxspe.h 2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/linuxspe.h      2013-09-13 19:01:42.979865449 +0000
++++ gcc-4.8.1/gcc/config/rs6000/linuxspe.h      2013-10-01 16:06:43.932554287 +0000
 @@ -20,8 +20,13 @@
     <http://www.gnu.org/licenses/>.  */
@@ -3860 +4439 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/predicates.md gcc-4.8.1/gcc/config/rs6000/predicates.md
 --- gcc-4.8.1.orig/gcc/config/rs6000/predicates.md      2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/predicates.md   2013-09-13 19:01:42.979865449 +0000
-@@ -464,9 +464,11 @@
++++ gcc-4.8.1/gcc/config/rs6000/predicates.md   2013-10-01 16:06:43.932554287 +0000
+@@ -275,14 +275,18 @@
+   (ior (match_code "const_int")
+        (match_operand 0 "gpc_reg_operand")))
+ 
++;; Return 1 if op is a constant integer valid for addition with addis, addi.
++(define_predicate "add_cint_operand"
++  (and (match_code "const_int")
++       (match_test "(unsigned HOST_WIDE_INT)
++                     (INTVAL (op) + (mode == SImode ? 0x80000000 : 0x80008000))
++                   < (unsigned HOST_WIDE_INT) 0x100000000ll")))
++
+ ;; Return 1 if op is a constant integer valid for addition
+ ;; or non-special register.
+ (define_predicate "reg_or_add_cint_operand"
+   (if_then_else (match_code "const_int")
+-    (match_test "(HOST_BITS_PER_WIDE_INT == 32
+-                 && (mode == SImode || INTVAL (op) < 0x7fff8000))
+-                || ((unsigned HOST_WIDE_INT) (INTVAL (op) + 0x80008000)
+-                    < (unsigned HOST_WIDE_INT) 0x100000000ll)")
++    (match_operand 0 "add_cint_operand")
+     (match_operand 0 "gpc_reg_operand")))
+ 
+ ;; Return 1 if op is a constant integer valid for subtraction
+@@ -464,9 +468,11 @@
             (match_test "easy_altivec_constant (op, mode)")))
  {
@@ -3874 +4476 @@
    return EASY_VECTOR_15_ADD_SELF (val);
  })
-@@ -478,9 +480,11 @@
+@@ -478,9 +484,11 @@
             (match_test "easy_altivec_constant (op, mode)")))
  {
@@ -3887 +4489 @@
  })
  
+@@ -1521,7 +1529,7 @@
+ (define_predicate "small_toc_ref"
+   (match_code "unspec,plus")
+ {
+-  if (GET_CODE (op) == PLUS && CONST_INT_P (XEXP (op, 1)))
++  if (GET_CODE (op) == PLUS && add_cint_operand (XEXP (op, 1), mode))
+     op = XEXP (op, 0);
+ 
+   return GET_CODE (op) == UNSPEC && XINT (op, 1) == UNSPEC_TOCREL;
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/rs6000.c gcc-4.8.1/gcc/config/rs6000/rs6000.c
 --- gcc-4.8.1.orig/gcc/config/rs6000/rs6000.c   2013-05-10 01:54:06.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/rs6000.c        2013-09-13 19:01:42.986532098 +0000
-@@ -2190,7 +2190,8 @@
++++ gcc-4.8.1/gcc/config/rs6000/rs6000.c        2013-10-01 16:06:43.936554287 +0000
+@@ -284,9 +284,6 @@
+   { "rsqrtd",   (RECIP_DF_RSQRT | RECIP_V2DF_RSQRT) },
+ };
+ 
+-/* 2 argument gen function typedef.  */
+-typedef rtx (*gen_2arg_fn_t) (rtx, rtx, rtx);
+-
+ /* Pointer to function (in rs6000-c.c) that can define or undefine target
+    macros that have changed.  Languages that don't support the preprocessor
+    don't link in rs6000-c.c, so we can't call it directly.  */
+@@ -2190,7 +2187,8 @@
           int reg_size2 = reg_size;
  
@@ -3900 +4521 @@
  
           rs6000_class_max_nregs[m][c]
-@@ -4239,7 +4240,7 @@
+@@ -4239,7 +4237,7 @@
    bitsize = GET_MODE_BITSIZE (inner);
    mask = GET_MODE_MASK (inner);
@@ -3909 +4530 @@
    msb_val = val > 0 ? 0 : -1;
  
-@@ -4279,7 +4280,7 @@
+@@ -4279,7 +4277,7 @@
    for (i = 0; i < nunits - 1; ++i)
      {
@@ -3918 +4539 @@
        else
         desired_val = msb_val;
-@@ -4364,13 +4365,13 @@
+@@ -4364,13 +4362,13 @@
  {
    enum machine_mode mode = GET_MODE (op);
@@ -3934 +4555 @@
    /* Then try with a vspltish.  */
    if (step == 1)
-@@ -4379,7 +4380,7 @@
+@@ -4379,7 +4377,7 @@
      step >>= 1;
  
@@ -3943 +4564 @@
    /* And finally a vspltisb.  */
    if (step == 1)
-@@ -4388,7 +4389,7 @@
+@@ -4388,7 +4386,7 @@
      step >>= 1;
  
@@ -3952 +4573 @@
    gcc_unreachable ();
  }
-@@ -9066,19 +9067,20 @@
+@@ -5337,7 +5335,7 @@
+ 
+   tocrel_base = op;
+   tocrel_offset = const0_rtx;
+-  if (GET_CODE (op) == PLUS && CONST_INT_P (XEXP (op, 1)))
++  if (GET_CODE (op) == PLUS && add_cint_operand (XEXP (op, 1), GET_MODE (op)))
+     {
+       tocrel_base = XEXP (op, 0);
+       tocrel_offset = XEXP (op, 1);
+@@ -9066,19 +9064,20 @@
        && cfun->va_list_gpr_size)
      {
@@ -3977 +4607 @@
        mem = gen_rtx_MEM (BLKmode,
                          plus_constant (Pmode, save_area,
-@@ -16900,8 +16902,9 @@
+@@ -16900,8 +16899,9 @@
    shift = gen_reg_rtx (SImode);
    addr = gen_lowpart (SImode, addr);
@@ -3989 +4619 @@
  
    /* Mask for insertion.  */
-@@ -19957,8 +19960,7 @@
+@@ -19957,8 +19957,7 @@
           HOST_WIDE_INT offset;
  
@@ -3999 +4629 @@
           spe_save_area_ptr = gen_rtx_REG (Pmode, 11);
           save_off = frame_off - offset;
-@@ -21200,8 +21202,7 @@
+@@ -21200,8 +21199,7 @@
              anew to every function.  */
  
@@ -4009 +4639 @@
           emit_insn (gen_addsi3 (frame_reg_rtx, old_frame_reg_rtx,
                                  GEN_INT (info->spe_gp_save_offset
-@@ -22151,20 +22152,22 @@
+@@ -22151,20 +22149,22 @@
  
        if (TARGET_64BIT)
@@ -4036 +4666 @@
           else
             fprintf (file, "\t.tc FT_%lx_%lx_%lx_%lx[TC],",
-@@ -22191,18 +22194,19 @@
+@@ -22191,18 +22191,19 @@
  
        if (TARGET_64BIT)
@@ -4059 +4689 @@
           else
             fprintf (file, "\t.tc FD_%lx_%lx[TC],",
-@@ -22226,16 +22230,19 @@
+@@ -22226,16 +22227,19 @@
  
        if (TARGET_64BIT)
@@ -4082 +4712 @@
           else
             fprintf (file, "\t.tc FS_%lx[TC],", l & 0xffffffff);
-@@ -22267,9 +22274,8 @@
+@@ -22267,9 +22271,8 @@
         }
  #endif
@@ -4094 +4724 @@
          a separate constant pool, because then we'd have
          to have both a TOC entry _and_ the actual constant.)
-@@ -22280,7 +22286,7 @@
+@@ -22280,7 +22283,7 @@
        /* It would be easy to make this work, but it doesn't now.  */
        gcc_assert (!TARGET_64BIT || POINTER_SIZE >= GET_MODE_BITSIZE (mode));
@@ -4103 +4733 @@
  #if HOST_BITS_PER_WIDE_INT == 32
           lshift_double (low, high, POINTER_SIZE - GET_MODE_BITSIZE (mode),
-@@ -22295,7 +22301,7 @@
+@@ -22295,7 +22298,7 @@
  
        if (TARGET_64BIT)
@@ -4112 +4742 @@
           else
             fprintf (file, "\t.tc ID_%lx_%lx[TC],",
-@@ -22308,7 +22314,7 @@
+@@ -22308,7 +22311,7 @@
         {
           if (POINTER_SIZE < GET_MODE_BITSIZE (mode))
@@ -4121 +4751 @@
               else
                 fprintf (file, "\t.tc ID_%lx_%lx[TC],",
-@@ -22318,7 +22324,7 @@
+@@ -22318,7 +22321,7 @@
             }
           else
@@ -4130 +4760 @@
               else
                 fprintf (file, "\t.tc IS_%lx[TC],", (long) low & 0xffffffff);
-@@ -22356,7 +22362,7 @@
+@@ -22356,7 +22359,7 @@
        gcc_unreachable ();
      }
@@ -4139 +4769 @@
    else
      {
+@@ -26651,7 +26654,7 @@
+   enum machine_mode mode = GET_MODE (dst);
+   rtx x0, e0, e1, y1, u0, v0;
+   enum insn_code code = optab_handler (smul_optab, mode);
+-  gen_2arg_fn_t gen_mul = (gen_2arg_fn_t) GEN_FCN (code);
++  insn_gen_fn gen_mul = GEN_FCN (code);
+   rtx one = rs6000_load_constant_and_splat (mode, dconst1);
+ 
+   gcc_assert (code != CODE_FOR_nothing);
+@@ -26689,7 +26692,7 @@
+   enum machine_mode mode = GET_MODE (dst);
+   rtx x0, e0, e1, e2, y1, y2, y3, u0, v0, one;
+   enum insn_code code = optab_handler (smul_optab, mode);
+-  gen_2arg_fn_t gen_mul = (gen_2arg_fn_t) GEN_FCN (code);
++  insn_gen_fn gen_mul = GEN_FCN (code);
+ 
+   gcc_assert (code != CODE_FOR_nothing);
+ 
+@@ -26760,7 +26763,7 @@
+   int i;
+   rtx halfthree;
+   enum insn_code code = optab_handler (smul_optab, mode);
+-  gen_2arg_fn_t gen_mul = (gen_2arg_fn_t) GEN_FCN (code);
++  insn_gen_fn gen_mul = GEN_FCN (code);
+ 
+   gcc_assert (code != CODE_FOR_nothing);
+ 
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/rs6000.h gcc-4.8.1/gcc/config/rs6000/rs6000.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/rs6000.h   2013-05-06 23:33:49.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/rs6000.h        2013-09-13 19:01:42.989865423 +0000
++++ gcc-4.8.1/gcc/config/rs6000/rs6000.h        2013-10-01 16:06:43.936554287 +0000
 @@ -662,6 +662,11 @@
     instructions for them.  Might as well be consistent with bits and bytes.  */
@@ -4170 +4827 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/rs6000.md gcc-4.8.1/gcc/config/rs6000/rs6000.md
 --- gcc-4.8.1.orig/gcc/config/rs6000/rs6000.md  2013-02-07 08:04:58.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/rs6000.md       2013-09-13 19:01:42.993198747 +0000
++++ gcc-4.8.1/gcc/config/rs6000/rs6000.md       2013-10-01 16:06:43.936554287 +0000
 @@ -1990,6 +1990,8 @@
    [(set_attr "length" "4,4,12")
@@ -4189 +4846 @@
    [(set (match_operand:SI 0 "gpc_reg_operand" "")
         (bswap:SI (match_operand:SI 1 "gpc_reg_operand" "")))]
-@@ -2125,8 +2129,10 @@
+@@ -2106,7 +2110,9 @@
+    (clobber (match_scratch:DI 3 "=&r,&r,&r"))
+    (clobber (match_scratch:DI 4 "=&r,X,&r"))]
+   "TARGET_POWERPC64 && !TARGET_LDBRX
+-   && (REG_P (operands[0]) || REG_P (operands[1]))"
++   && (REG_P (operands[0]) || REG_P (operands[1]))
++   && !(MEM_P (operands[0]) && MEM_VOLATILE_P (operands[0]))
++   && !(MEM_P (operands[1]) && MEM_VOLATILE_P (operands[1]))"
+   "#"
+   [(set_attr "length" "16,12,36")])
+ 
+@@ -2125,8 +2131,10 @@
    rtx op2    = operands[2];
    rtx op3    = operands[3];
@@ -4202 +4870 @@
    rtx addr2;
    rtx word_high;
-@@ -2186,8 +2192,10 @@
+@@ -2186,8 +2194,10 @@
    rtx src    = operands[1];
    rtx op2    = operands[2];
@@ -4215 +4883 @@
    rtx addr2;
    rtx word_high;
-@@ -2221,16 +2229,14 @@
+@@ -2221,16 +2231,14 @@
      {
        word_high = change_address (dest, SImode, addr1);
@@ -4234 +4902 @@
  
  (define_split
-@@ -2247,10 +2253,11 @@
+@@ -2247,10 +2255,11 @@
    rtx src     = operands[1];
    rtx op2     = operands[2];
@@ -4250 +4918 @@
    emit_insn (gen_lshrdi3 (op2, src, GEN_INT (32)));
    emit_insn (gen_bswapsi2 (dest_si, src_si));
-@@ -2275,15 +2282,15 @@
+@@ -2275,15 +2284,15 @@
    [(const_int 0)]
    "
@@ -4273 +4941 @@
    addr1 = XEXP (src, 0);
    if (GET_CODE (addr1) == PLUS)
-@@ -2308,19 +2315,11 @@
+@@ -2308,19 +2317,11 @@
        addr2 = gen_rtx_PLUS (SImode, op2, addr1);
      }
@@ -4297 +4965 @@
  
  (define_split
-@@ -2331,15 +2330,15 @@
+@@ -2331,15 +2332,15 @@
    [(const_int 0)]
    "
@@ -4320 +4988 @@
    addr1 = XEXP (dest, 0);
    if (GET_CODE (addr1) == PLUS)
-@@ -2364,19 +2363,11 @@
+@@ -2364,19 +2365,11 @@
        addr2 = gen_rtx_PLUS (SImode, op2, addr1);
      }
@@ -4344 +5012 @@
  
  (define_split
-@@ -2387,15 +2378,15 @@
+@@ -2387,15 +2380,15 @@
    [(const_int 0)]
    "
@@ -4368 +5036 @@
  
  (define_insn "mulsi3"
-@@ -4682,6 +4673,41 @@
+@@ -4682,6 +4675,41 @@
    "frsqrtes %0,%1"
    [(set_attr "type" "fp")])
@@ -4410 +5078 @@
    [(set (match_dup 3)
          (abs:SFDF (match_operand:SFDF 1 "gpc_reg_operand" "")))
-@@ -6210,10 +6236,25 @@
+@@ -6210,10 +6238,25 @@
    [(set (match_operand:DI 0 "gpc_reg_operand" "=&r,&r")
         (ashiftrt:DI (match_operand:DI 1 "gpc_reg_operand" "r,r")
@@ -4440 +5108 @@
     (set_attr "length" "8,12")])
  
-@@ -7064,13 +7105,12 @@
+@@ -7064,13 +7107,12 @@
    [(set (match_operand:DI 0 "gpc_reg_operand" "")
         (ashiftrt:DI (match_operand:DI 1 "gpc_reg_operand" "")
@@ -4456 +5124 @@
        emit_insn (gen_ashrdi3_no_power (operands[0], operands[1], operands[2]));
        DONE;
-@@ -8277,8 +8317,8 @@
+@@ -8277,8 +8319,8 @@
    "&& reload_completed"
    [(pc)]
@@ -4467 +5135 @@
                   operands[1]);
    emit_move_insn (simplify_gen_subreg (DFmode, operands[0], TFmode, lo_word),
-@@ -8507,8 +8547,8 @@
+@@ -8507,8 +8549,8 @@
     && TARGET_LONG_DOUBLE_128"
    "
@@ -4478 +5146 @@
    operands[4] = gen_reg_rtx (CCFPmode);
    operands[5] = simplify_gen_subreg (DFmode, operands[0], TFmode, hi_word);
-@@ -11609,8 +11649,8 @@
+@@ -10422,7 +10464,7 @@
+            (unspec [(match_operand:DI 1 "" "")
+                     (match_operand:DI 2 "gpc_reg_operand" "b")]
+                    UNSPEC_TOCREL)
+-           (match_operand 3 "const_int_operand" "n"))))]
++           (match_operand:DI 3 "add_cint_operand" "n"))))]
+    "TARGET_ELF && TARGET_CMODEL != CMODEL_SMALL"
+    "addis %0,%2,%1+%3@toc@ha")
+ 
+@@ -10433,7 +10475,7 @@
+            (unspec [(match_operand:P 1 "" "")
+                     (match_operand:P 2 "gpc_reg_operand" "b")]
+                    UNSPEC_TOCREL)
+-           (match_operand 3 "const_int_operand" "n"))))]
++           (match_operand:P 3 "add_cint_operand" "n"))))]
+    "TARGET_XCOFF && TARGET_CMODEL != CMODEL_SMALL"
+    "addis %0,%1+%3@u(%2)")
+ 
+@@ -11609,8 +11651,8 @@
     (match_dup 13)]
  {
@@ -4491 +5177 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/rtems.h gcc-4.8.1/gcc/config/rs6000/rtems.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/rtems.h    2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/rtems.h 2013-09-13 19:01:42.996532072 +0000
++++ gcc-4.8.1/gcc/config/rs6000/rtems.h 2013-10-01 16:06:43.936554287 +0000
 @@ -34,6 +34,9 @@
      }                                     \
@@ -4504 +5190 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/spe.md gcc-4.8.1/gcc/config/rs6000/spe.md
 --- gcc-4.8.1.orig/gcc/config/rs6000/spe.md     2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/spe.md  2013-09-13 19:01:42.996532072 +0000
++++ gcc-4.8.1/gcc/config/rs6000/spe.md  2013-10-01 16:06:43.940554287 +0000
 @@ -2604,8 +2604,8 @@
     && TARGET_HARD_FLOAT && TARGET_E500_DOUBLE && TARGET_LONG_DOUBLE_128"
@@ -4529 +5215 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/sysv4.h gcc-4.8.1/gcc/config/rs6000/sysv4.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/sysv4.h    2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/sysv4.h 2013-09-13 19:01:42.996532072 +0000
++++ gcc-4.8.1/gcc/config/rs6000/sysv4.h 2013-10-01 16:06:43.940554287 +0000
 @@ -187,12 +187,6 @@
              rs6000_abi_name);                                          \
@@ -4615 +5301 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/sysv4le.h gcc-4.8.1/gcc/config/rs6000/sysv4le.h
 --- gcc-4.8.1.orig/gcc/config/rs6000/sysv4le.h  2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/rs6000/sysv4le.h       2013-09-13 19:01:42.999865397 +0000
++++ gcc-4.8.1/gcc/config/rs6000/sysv4le.h       2013-10-01 16:06:43.940554287 +0000
 @@ -25,12 +25,12 @@
  #undef CC1_ENDIAN_DEFAULT_SPEC
@@ -4636 +5322 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/htmintrin.h gcc-4.8.1/gcc/config/s390/htmintrin.h
 --- gcc-4.8.1.orig/gcc/config/s390/htmintrin.h  1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/htmintrin.h       2013-09-13 19:01:42.999865397 +0000
++++ gcc-4.8.1/gcc/config/s390/htmintrin.h       2013-10-01 16:06:43.940554287 +0000
 @@ -0,0 +1,57 @@
 +/* GNU compiler hardware transactional execution intrinsics
@@ -4697 +5383 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/htmxlintrin.h gcc-4.8.1/gcc/config/s390/htmxlintrin.h
 --- gcc-4.8.1.orig/gcc/config/s390/htmxlintrin.h        1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/htmxlintrin.h     2013-09-13 19:01:42.999865397 +0000
++++ gcc-4.8.1/gcc/config/s390/htmxlintrin.h     2013-10-01 16:06:43.940554287 +0000
 @@ -0,0 +1,182 @@
 +/* XL compiler hardware transactional execution intrinsics
@@ -4883 +5569 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/predicates.md gcc-4.8.1/gcc/config/s390/predicates.md
 --- gcc-4.8.1.orig/gcc/config/s390/predicates.md        2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/predicates.md     2013-09-13 19:01:42.999865397 +0000
++++ gcc-4.8.1/gcc/config/s390/predicates.md     2013-10-01 16:06:43.940554287 +0000
 @@ -176,7 +176,11 @@
  {
@@ -4912 +5598 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/s390-modes.def gcc-4.8.1/gcc/config/s390/s390-modes.def
 --- gcc-4.8.1.orig/gcc/config/s390/s390-modes.def       2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/s390-modes.def    2013-09-13 19:01:43.009865370 +0000
++++ gcc-4.8.1/gcc/config/s390/s390-modes.def    2013-10-01 16:06:43.944554286 +0000
 @@ -152,6 +152,14 @@
  operands were equal/unequal. The CCZ1 mode ensures the result can be
@@ -4935 +5621 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/s390-protos.h gcc-4.8.1/gcc/config/s390/s390-protos.h
 --- gcc-4.8.1.orig/gcc/config/s390/s390-protos.h        2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/s390-protos.h     2013-09-13 19:01:43.009865370 +0000
++++ gcc-4.8.1/gcc/config/s390/s390-protos.h     2013-10-01 16:06:43.944554286 +0000
 @@ -58,7 +58,7 @@
  extern enum machine_mode s390_tm_ccmode (rtx, rtx, bool);
@@ -4955 +5641 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/s390.c gcc-4.8.1/gcc/config/s390/s390.c
 --- gcc-4.8.1.orig/gcc/config/s390/s390.c       2013-04-08 07:55:57.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/s390.c    2013-09-13 19:01:43.003198721 +0000
++++ gcc-4.8.1/gcc/config/s390/s390.c    2013-10-01 16:06:43.940554287 +0000
 @@ -367,6 +367,10 @@
    const char *some_ld_name;
@@ -5100 +5786 @@
      {
        if (target_flags_explicit & MASK_HARD_DFP)
-@@ -7341,11 +7377,11 @@
+@@ -7028,25 +7064,12 @@
+         or a casesi jump, check all potential targets.  */
+       else if (GET_CODE (insn) == JUMP_INSN)
+        {
+-          rtx pat = PATTERN (insn);
+-         if (GET_CODE (pat) == PARALLEL && XVECLEN (pat, 0) > 2)
+-           pat = XVECEXP (pat, 0, 0);
+-
+-          if (GET_CODE (pat) == SET)
+-            {
+-             rtx label = JUMP_LABEL (insn);
+-             if (label)
+-               {
+-                 if (s390_find_pool (pool_list, label)
+-                     != s390_find_pool (pool_list, insn))
+-                   bitmap_set_bit (far_labels, CODE_LABEL_NUMBER (label));
+-               }
+-            }
+-         else if (GET_CODE (pat) == PARALLEL
+-                  && XVECLEN (pat, 0) == 2
+-                  && GET_CODE (XVECEXP (pat, 0, 0)) == SET
+-                  && GET_CODE (XVECEXP (pat, 0, 1)) == USE
+-                  && GET_CODE (XEXP (XVECEXP (pat, 0, 1), 0)) == LABEL_REF)
++         rtx pat = PATTERN (insn);
++         if (GET_CODE (pat) == PARALLEL
++             && XVECLEN (pat, 0) == 2
++             && GET_CODE (XVECEXP (pat, 0, 0)) == SET
++             && GET_CODE (XVECEXP (pat, 0, 1)) == USE
++             && GET_CODE (XEXP (XVECEXP (pat, 0, 1), 0)) == LABEL_REF)
+            {
+              /* Find the jump table used by this casesi jump.  */
+              rtx vec_label = XEXP (XEXP (XVECEXP (pat, 0, 1), 0), 0);
+@@ -7068,8 +7091,23 @@
+                        bitmap_set_bit (far_labels, CODE_LABEL_NUMBER (label));
+                    }
+                }
++             continue;
+            }
+-        }
++
++         if (GET_CODE (pat) == PARALLEL)
++           pat = XVECEXP (pat, 0, 0);
++
++         if (GET_CODE (pat) == SET)
++           {
++             rtx label = JUMP_LABEL (insn);
++             if (label)
++               {
++                 if (s390_find_pool (pool_list, label)
++                     != s390_find_pool (pool_list, insn))
++                   bitmap_set_bit (far_labels, CODE_LABEL_NUMBER (label));
++               }
++           }
++       }
+     }
+ 
+   /* Insert base register reload insns before every pool.  */
+@@ -7341,11 +7379,11 @@
    if (GET_CODE (setreg) == SUBREG)
      {
@@ -5114 +5857 @@
    else
      return;
-@@ -7368,13 +7404,13 @@
+@@ -7368,13 +7406,13 @@
    rtx cur_insn;
    unsigned int i;
@@ -5130 +5873 @@
      }
  
-@@ -7396,7 +7432,7 @@
+@@ -7396,7 +7434,7 @@
       See expand_builtin_unwind_init.  For regs_ever_live this is done by
       reload.  */
@@ -5139 +5882 @@
         regs_ever_clobbered[i] = 1;
  
-@@ -7462,17 +7498,6 @@
+@@ -7462,17 +7500,6 @@
  {
    int i, j;
@@ -5157 +5900 @@
       data, except that we don't save and restore global registers.
  
-@@ -7481,6 +7506,28 @@
+@@ -7481,6 +7508,28 @@
  
    s390_regs_ever_clobbered (clobbered_regs);
@@ -5186 +5929 @@
      clobbered_regs[i] = clobbered_regs[i] && !global_regs[i] && !fixed_regs[i];
  
-@@ -7731,7 +7778,7 @@
+@@ -7731,7 +7780,7 @@
  {
    HOST_WIDE_INT frame_size;
@@ -5195 +5938 @@
    /* On S/390 machines, we may need to perform branch splitting, which
       will require both base and return address register.  We have no
-@@ -7766,6 +7813,157 @@
+@@ -7766,6 +7815,157 @@
    while (frame_size != cfun_frame_layout.frame_size);
  }
@@ -5353 +6096 @@
     current info and update regs_ever_live for the special registers.
     May be called multiple times, but may never cause *more* registers
-@@ -7774,7 +7972,7 @@
+@@ -7774,7 +7974,7 @@
  static void
  s390_update_frame_layout (void)
@@ -5362 +6105 @@
    s390_register_info (clobbered_regs);
  
-@@ -8204,8 +8402,10 @@
+@@ -8204,8 +8404,10 @@
    int offset;
    int next_fpr = 0;
@@ -5374 +6117 @@
  
    /* Annotate all constant pool references to let the scheduler know
-@@ -9353,6 +9553,291 @@
+@@ -9353,6 +9555,291 @@
    return build_va_arg_indirect_ref (addr);
  }
@@ -5666 +6409 @@
     stdio stream FILE.
  
-@@ -11008,6 +11493,11 @@
+@@ -11008,6 +11495,11 @@
  #undef TARGET_RETURN_IN_MEMORY
  #define TARGET_RETURN_IN_MEMORY s390_return_in_memory
@@ -5680 +6423 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/s390.h gcc-4.8.1/gcc/config/s390/s390.h
 --- gcc-4.8.1.orig/gcc/config/s390/s390.h       2013-03-05 12:02:06.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/s390.h    2013-09-13 19:01:43.003198721 +0000
++++ gcc-4.8.1/gcc/config/s390/s390.h    2013-10-01 16:06:43.940554287 +0000
 @@ -34,7 +34,8 @@
    PF_DFP = 16,
@@ -5762 +6505 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/s390.md gcc-4.8.1/gcc/config/s390/s390.md
 --- gcc-4.8.1.orig/gcc/config/s390/s390.md      2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/s390.md   2013-09-13 19:01:43.009865370 +0000
++++ gcc-4.8.1/gcc/config/s390/s390.md   2013-10-01 16:06:43.944554286 +0000
 @@ -59,11 +59,17 @@
  (define_c_enum "unspec" [
@@ -6186 +6929 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/s390.opt gcc-4.8.1/gcc/config/s390/s390.opt
 --- gcc-4.8.1.orig/gcc/config/s390/s390.opt     2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/s390.opt  2013-09-13 19:01:43.009865370 +0000
++++ gcc-4.8.1/gcc/config/s390/s390.opt  2013-10-01 16:06:43.944554286 +0000
 @@ -104,6 +104,10 @@
  Target Report RejectNegative Negative(mlong-double-128) InverseMask(LONG_DOUBLE_128)
@@ -6200 +6943 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/s390/s390intrin.h gcc-4.8.1/gcc/config/s390/s390intrin.h
 --- gcc-4.8.1.orig/gcc/config/s390/s390intrin.h 1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/config/s390/s390intrin.h      2013-09-13 19:01:43.006532046 +0000
++++ gcc-4.8.1/gcc/config/s390/s390intrin.h      2013-10-01 16:06:43.940554287 +0000
 @@ -0,0 +1,33 @@
 +/* S/390 System z specific intrinsics
@@ -6237 +6980 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/sh/sh.md gcc-4.8.1/gcc/config/sh/sh.md
 --- gcc-4.8.1.orig/gcc/config/sh/sh.md  2013-05-06 19:53:56.000000000 +0000
-+++ gcc-4.8.1/gcc/config/sh/sh.md       2013-09-13 19:01:43.016532020 +0000
-@@ -12073,10 +12073,10 @@
++++ gcc-4.8.1/gcc/config/sh/sh.md       2013-10-01 16:06:43.944554286 +0000
+@@ -6834,10 +6834,11 @@
+ ;; If movqi_reg_reg is specified as an alternative of movqi, movqi will be
+ ;; selected to copy QImode regs.  If one of them happens to be allocated
+ ;; on the stack, reload will stick to movqi insn and generate wrong
+-;; displacement addressing because of the generic m alternatives.  
+-;; With the movqi_reg_reg being specified before movqi it will be initially 
+-;; picked to load/store regs.  If the regs regs are on the stack reload will
+-;; try other insns and not stick to movqi_reg_reg.
++;; displacement addressing because of the generic m alternatives.
++;; With the movqi_reg_reg being specified before movqi it will be initially
++;; picked to load/store regs.  If the regs regs are on the stack reload
++;; try other insns and not stick to movqi_reg_reg, unless there were spilled
++;; pseudos in which case 'm' constraints pertain.
+ ;; The same applies to the movhi variants.
+ ;;
+ ;; Notice, that T bit is not allowed as a mov src operand here.  This is to
+@@ -6849,11 +6850,14 @@
+ ;; reloading MAC subregs otherwise.  For that probably special patterns
+ ;; would be required.
+ (define_insn "*mov<mode>_reg_reg"
+-  [(set (match_operand:QIHI 0 "arith_reg_dest" "=r")
+-       (match_operand:QIHI 1 "register_operand" "r"))]
++  [(set (match_operand:QIHI 0 "arith_reg_dest" "=r,m,*z")
++       (match_operand:QIHI 1 "register_operand" "r,*z,m"))]
+   "TARGET_SH1 && !t_reg_operand (operands[1], VOIDmode)"
+-  "mov %1,%0"
+-  [(set_attr "type" "move")])
++  "@
++    mov                %1,%0
++    mov.<bw>   %1,%0
++    mov.<bw>   %1,%0"
++  [(set_attr "type" "move,store,load")])
+ 
+ ;; FIXME: The non-SH2A and SH2A variants should be combined by adding
+ ;; "enabled" attribute as it is done in other targets.
+@@ -12073,10 +12077,10 @@
  
  ;; FMA (fused multiply-add) patterns
@@ -6253 +7031 @@
  {
    if (TARGET_SH2E)
-@@ -12107,6 +12107,43 @@
+@@ -12107,6 +12111,43 @@
    "fmac.s %1, %2, %0"
    [(set_attr "type" "fparith_media")])
@@ -6299 +7077 @@
 diff -Naur gcc-4.8.1.orig/gcc/config/sparc/sparc.c gcc-4.8.1/gcc/config/sparc/sparc.c
 --- gcc-4.8.1.orig/gcc/config/sparc/sparc.c     2013-04-15 08:31:12.000000000 +0000
-+++ gcc-4.8.1/gcc/config/sparc/sparc.c  2013-09-13 19:01:43.019865344 +0000
++++ gcc-4.8.1/gcc/config/sparc/sparc.c  2013-10-01 16:06:43.944554286 +0000
 @@ -11174,6 +11174,11 @@
        /* Total Store Ordering: all memory transactions with store semantics
@@ -6314 +7092 @@
 diff -Naur gcc-4.8.1.orig/gcc/config.gcc gcc-4.8.1/gcc/config.gcc
 --- gcc-4.8.1.orig/gcc/config.gcc       2013-03-13 09:47:41.000000000 +0000
-+++ gcc-4.8.1/gcc/config.gcc    2013-09-13 19:01:43.023198669 +0000
++++ gcc-4.8.1/gcc/config.gcc    2013-10-01 16:06:43.948554286 +0000
 @@ -452,6 +452,7 @@
         cpu_type=s390
@@ -6362 +7140 @@
 diff -Naur gcc-4.8.1.orig/gcc/config.in gcc-4.8.1/gcc/config.in
 --- gcc-4.8.1.orig/gcc/config.in        2013-05-31 09:09:26.000000000 +0000
-+++ gcc-4.8.1/gcc/config.in     2013-09-13 19:01:43.023198669 +0000
++++ gcc-4.8.1/gcc/config.in     2013-10-01 16:06:43.948554286 +0000
 @@ -1228,7 +1228,7 @@
  #endif
@@ -6374 +7152 @@
 diff -Naur gcc-4.8.1.orig/gcc/configure gcc-4.8.1/gcc/configure
 --- gcc-4.8.1.orig/gcc/configure        2013-05-08 11:36:36.000000000 +0000
-+++ gcc-4.8.1/gcc/configure     2013-09-13 19:01:43.973196178 +0000
++++ gcc-4.8.1/gcc/configure     2013-10-01 16:06:55.812553945 +0000
 @@ -11703,6 +11703,7 @@
  if test x$build != x$host || test "x$coverage_flags" != x
@@ -6463 +7241 @@
 diff -Naur gcc-4.8.1.orig/gcc/configure.ac gcc-4.8.1/gcc/configure.ac
 --- gcc-4.8.1.orig/gcc/configure.ac     2013-05-08 11:36:36.000000000 +0000
-+++ gcc-4.8.1/gcc/configure.ac  2013-09-13 19:01:43.976529502 +0000
++++ gcc-4.8.1/gcc/configure.ac  2013-10-01 16:06:55.816553945 +0000
 @@ -1887,6 +1887,7 @@
  if test x$build != x$host || test "x$coverage_flags" != x
@@ -6561 +7339 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/call.c gcc-4.8.1/gcc/cp/call.c
 --- gcc-4.8.1.orig/gcc/cp/call.c        2013-05-14 12:51:17.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/call.c     2013-09-13 19:01:43.036531967 +0000
++++ gcc-4.8.1/gcc/cp/call.c     2013-10-01 16:06:43.952554286 +0000
 @@ -6195,8 +6195,8 @@
    if (convs->check_narrowing)
@@ -6584 +7362 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/class.c gcc-4.8.1/gcc/cp/class.c
 --- gcc-4.8.1.orig/gcc/cp/class.c       2013-04-01 19:05:21.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/class.c    2013-09-13 19:01:43.039865292 +0000
++++ gcc-4.8.1/gcc/cp/class.c    2013-10-01 16:06:43.952554286 +0000
 @@ -4574,15 +4574,20 @@
  static void
@@ -6654 +7432 @@
     a DECL for the field or TYPE itself (DR 253).  */
  
+@@ -7465,7 +7508,7 @@
+      dependent on overload resolution.  */
+   gcc_assert (TREE_CODE (rhs) == ADDR_EXPR
+              || TREE_CODE (rhs) == COMPONENT_REF
+-             || really_overloaded_fn (rhs)
++             || is_overloaded_fn (rhs)
+              || (flag_ms_extensions && TREE_CODE (rhs) == FUNCTION_DECL));
+ 
+   /* This should really only be used when attempting to distinguish
 diff -Naur gcc-4.8.1.orig/gcc/cp/cp-tree.h gcc-4.8.1/gcc/cp/cp-tree.h
 --- gcc-4.8.1.orig/gcc/cp/cp-tree.h     2013-04-24 15:42:20.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/cp-tree.h  2013-09-13 19:01:43.043198616 +0000
++++ gcc-4.8.1/gcc/cp/cp-tree.h  2013-10-01 16:06:43.956554286 +0000
 @@ -1211,17 +1211,20 @@
  /* The _DECL for this _TYPE.  */
@@ -6722 +7509 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/cvt.c gcc-4.8.1/gcc/cp/cvt.c
 --- gcc-4.8.1.orig/gcc/cp/cvt.c 2013-02-20 09:02:35.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/cvt.c      2013-09-13 19:01:43.043198616 +0000
++++ gcc-4.8.1/gcc/cp/cvt.c      2013-10-01 16:06:43.956554286 +0000
 @@ -620,6 +620,9 @@
  
@@ -6777 +7564 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/decl.c gcc-4.8.1/gcc/cp/decl.c
 --- gcc-4.8.1.orig/gcc/cp/decl.c        2013-05-16 15:09:07.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/decl.c     2013-09-13 19:01:43.049865266 +0000
++++ gcc-4.8.1/gcc/cp/decl.c     2013-10-01 16:06:43.956554286 +0000
 @@ -10878,7 +10878,7 @@
     DECL, if there is no DECL available.  */
@@ -6833 +7620 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/init.c gcc-4.8.1/gcc/cp/init.c
 --- gcc-4.8.1.orig/gcc/cp/init.c        2013-04-25 16:25:04.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/init.c     2013-09-13 19:01:43.049865266 +0000
++++ gcc-4.8.1/gcc/cp/init.c     2013-10-01 16:06:43.956554286 +0000
 @@ -3524,6 +3524,8 @@
  
@@ -6843 +7630 @@
    else if (from_array)
      {
+@@ -4062,6 +4064,7 @@
+       tree cookie_addr;
+       tree size_ptr_type = build_pointer_type (sizetype);
+ 
++      base = mark_rvalue_use (base);
+       if (TREE_SIDE_EFFECTS (base))
+        {
+          base_init = get_target_expr (base);
 diff -Naur gcc-4.8.1.orig/gcc/cp/method.c gcc-4.8.1/gcc/cp/method.c
 --- gcc-4.8.1.orig/gcc/cp/method.c      2013-02-12 20:47:15.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/method.c   2013-09-13 19:01:43.053198590 +0000
++++ gcc-4.8.1/gcc/cp/method.c   2013-10-01 16:06:43.956554286 +0000
 @@ -1340,7 +1340,8 @@
        if (diag && assign_p && move_p
@@ -6858 +7653 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/name-lookup.c gcc-4.8.1/gcc/cp/name-lookup.c
 --- gcc-4.8.1.orig/gcc/cp/name-lookup.c 2013-02-27 18:13:24.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/name-lookup.c      2013-09-13 19:01:43.053198590 +0000
++++ gcc-4.8.1/gcc/cp/name-lookup.c      2013-10-01 16:06:43.956554286 +0000
 @@ -3015,8 +3015,10 @@
    if (name == error_mark_node)
@@ -6874 +7669 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/parser.c gcc-4.8.1/gcc/cp/parser.c
 --- gcc-4.8.1.orig/gcc/cp/parser.c      2013-05-14 20:37:48.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/parser.c   2013-09-13 19:01:43.063198564 +0000
++++ gcc-4.8.1/gcc/cp/parser.c   2013-10-01 16:06:43.960554286 +0000
 @@ -5438,11 +5438,18 @@
         /* Restore the old message.  */
@@ -6930 +7725 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/pt.c gcc-4.8.1/gcc/cp/pt.c
 --- gcc-4.8.1.orig/gcc/cp/pt.c  2013-05-24 13:25:44.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/pt.c       2013-09-13 19:01:43.069865213 +0000
++++ gcc-4.8.1/gcc/cp/pt.c       2013-10-01 16:06:43.964554286 +0000
 @@ -138,6 +138,7 @@
                                              tree);
@@ -7194 +7989 @@
      {
        if (TREE_CODE (expression) == ADDR_EXPR)
+@@ -20077,7 +20127,7 @@
+ any_type_dependent_elements_p (const_tree list)
+ {
+   for (; list; list = TREE_CHAIN (list))
+-    if (value_dependent_expression_p (TREE_VALUE (list)))
++    if (type_dependent_expression_p (TREE_VALUE (list)))
+       return true;
+ 
+   return false;
 @@ -20626,7 +20676,7 @@
      = build_tree_list (NULL_TREE, TYPE_NAME (auto_node));
@@ -7205 +8009 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/semantics.c gcc-4.8.1/gcc/cp/semantics.c
 --- gcc-4.8.1.orig/gcc/cp/semantics.c   2013-05-14 12:51:17.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/semantics.c        2013-09-13 19:01:43.073198538 +0000
++++ gcc-4.8.1/gcc/cp/semantics.c        2013-10-01 16:06:43.964554286 +0000
 @@ -155,6 +155,17 @@
      }
@@ -7296 +8100 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/tree.c gcc-4.8.1/gcc/cp/tree.c
 --- gcc-4.8.1.orig/gcc/cp/tree.c        2013-05-24 13:25:51.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/tree.c     2013-09-13 19:01:43.073198538 +0000
++++ gcc-4.8.1/gcc/cp/tree.c     2013-10-01 16:06:43.964554286 +0000
 @@ -1220,6 +1220,8 @@
             result =
@@ -7308 +8112 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/typeck.c gcc-4.8.1/gcc/cp/typeck.c
 --- gcc-4.8.1.orig/gcc/cp/typeck.c      2013-05-13 19:34:15.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/typeck.c   2013-09-13 19:01:43.079865187 +0000
++++ gcc-4.8.1/gcc/cp/typeck.c   2013-10-01 16:06:43.968554286 +0000
 @@ -8307,7 +8307,8 @@
       && TREE_CODE (retval) == VAR_DECL
@@ -7331 +8135 @@
 diff -Naur gcc-4.8.1.orig/gcc/cp/typeck2.c gcc-4.8.1/gcc/cp/typeck2.c
 --- gcc-4.8.1.orig/gcc/cp/typeck2.c     2013-04-11 16:05:02.000000000 +0000
-+++ gcc-4.8.1/gcc/cp/typeck2.c  2013-09-13 19:01:43.076531862 +0000
++++ gcc-4.8.1/gcc/cp/typeck2.c  2013-10-01 16:06:43.964554286 +0000
 @@ -262,7 +262,7 @@
       so that we can check again once it is completed. This makes sense
@@ -7343 +8147 @@
 diff -Naur gcc-4.8.1.orig/gcc/doc/avr-mmcu.texi gcc-4.8.1/gcc/doc/avr-mmcu.texi
 --- gcc-4.8.1.orig/gcc/doc/avr-mmcu.texi        2013-02-28 09:03:09.000000000 +0000
-+++ gcc-4.8.1/gcc/doc/avr-mmcu.texi     2013-09-13 19:01:43.079865187 +0000
++++ gcc-4.8.1/gcc/doc/avr-mmcu.texi     2013-10-01 16:06:43.968554286 +0000
 @@ -38,7 +38,7 @@
  
@@ -7355 +8159 @@
 diff -Naur gcc-4.8.1.orig/gcc/doc/cpp.texi gcc-4.8.1/gcc/doc/cpp.texi
 --- gcc-4.8.1.orig/gcc/doc/cpp.texi     2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/doc/cpp.texi  2013-09-13 19:01:43.083198511 +0000
++++ gcc-4.8.1/gcc/doc/cpp.texi  2013-10-01 16:06:43.968554286 +0000
 @@ -1926,11 +1926,9 @@
  This macro is defined when the C++ compiler is in use.  You can use
@@ -7373 +8177 @@
 diff -Naur gcc-4.8.1.orig/gcc/doc/extend.texi gcc-4.8.1/gcc/doc/extend.texi
 --- gcc-4.8.1.orig/gcc/doc/extend.texi  2013-03-28 14:07:55.000000000 +0000
-+++ gcc-4.8.1/gcc/doc/extend.texi       2013-09-13 19:01:43.086531836 +0000
-@@ -8786,6 +8786,7 @@
++++ gcc-4.8.1/gcc/doc/extend.texi       2013-10-01 16:06:43.968554286 +0000
+@@ -7412,6 +7412,8 @@
+ the byte at @code{*@var{ptr}}.  The byte is set to some implementation
+ defined nonzero ``set'' value and the return value is @code{true} if and only
+ if the previous contents were ``set''.
++It should be only used for operands of type @code{bool} or @code{char}. For 
++other types only part of the value may be set.
+ 
+ All memory models are valid.
+ 
+@@ -7421,6 +7423,10 @@
+ 
+ This built-in function performs an atomic clear operation on
+ @code{*@var{ptr}}.  After the operation, @code{*@var{ptr}} contains 0.
++It should be only used for operands of type @code{bool} or @code{char} and 
++in conjunction with @code{__atomic_test_and_set}.
++For other types it may only clear partially. If the type is not @code{bool}
++prefer using @code{__atomic_store}.
+ 
+ The valid memory model variants are
+ @code{__ATOMIC_RELAXED}, @code{__ATOMIC_SEQ_CST}, and
+@@ -7492,18 +7498,20 @@
+ Memory model must be @code{__ATOMIC_RELEASE} or stronger.
+ @end table
+ 
+-When a lock acquire fails it's required for good performance to abort
++When a lock acquire fails it is required for good performance to abort
+ the transaction quickly. This can be done with a @code{_mm_pause}
+ 
+ @smallexample
+ #include <immintrin.h> // For _mm_pause
+ 
++int lockvar;
++
+ /* Acquire lock with lock elision */
+ while (__atomic_exchange_n(&lockvar, 1, __ATOMIC_ACQUIRE|__ATOMIC_HLE_ACQUIRE))
+     _mm_pause(); /* Abort failed transaction */
+ ...
+ /* Free lock with lock elision */
+-__atomic_clear(&lockvar, __ATOMIC_RELEASE|__ATOMIC_HLE_RELEASE);
++__atomic_store_n(&lockvar, 0, __ATOMIC_RELEASE|__ATOMIC_HLE_RELEASE);
+ @end smallexample
+ 
+ @node Object Size Checking
+@@ -8786,6 +8794,7 @@
  * PowerPC Built-in Functions::
  * PowerPC AltiVec/VSX Built-in Functions::
@@ -7382 +8229 @@
  * SPARC VIS Built-in Functions::
  * SPU Built-in Functions::
-@@ -14026,6 +14027,120 @@
+@@ -14026,6 +14035,120 @@
  Generates the @code{wait} machine instruction.
  @end deftypefn
@@ -7503 +8350 @@
  @subsection SH Built-in Functions
  The following built-in functions are supported on the SH1, SH2, SH3 and SH4
+diff -Naur gcc-4.8.1.orig/gcc/doc/implement-cxx.texi gcc-4.8.1/gcc/doc/implement-cxx.texi
+--- gcc-4.8.1.orig/gcc/doc/implement-cxx.texi   2013-01-10 20:38:27.000000000 +0000
++++ gcc-4.8.1/gcc/doc/implement-cxx.texi        2013-10-01 16:06:43.968554286 +0000
+@@ -9,8 +9,8 @@
+ A conforming implementation of ISO C++ is required to document its
+ choice of behavior in each of the areas that are designated
+ ``implementation defined''.  The following lists all such areas,
+-along with the section numbers from the ISO/IEC 14822:1998 and ISO/IEC
+-14822:2003 standards.  Some areas are only implementation-defined in
++along with the section numbers from the ISO/IEC 14882:1998 and ISO/IEC
++14882:2003 standards.  Some areas are only implementation-defined in
+ one version of the standard.
+ 
+ Some choices depend on the externally determined ABI for the platform
 diff -Naur gcc-4.8.1.orig/gcc/doc/invoke.texi gcc-4.8.1/gcc/doc/invoke.texi
 --- gcc-4.8.1.orig/gcc/doc/invoke.texi  2013-03-29 13:41:29.000000000 +0000
-+++ gcc-4.8.1/gcc/doc/invoke.texi       2013-09-13 19:01:43.093198485 +0000
++++ gcc-4.8.1/gcc/doc/invoke.texi       2013-10-01 16:06:43.972554286 +0000
 @@ -13726,8 +13726,13 @@
  SSE4.1, SSE4.2, AVX, AES, PCLMUL, FSGSBASE, RDRND and F16C instruction
@@ -7521 +8382 @@
  
  @item k6
+diff -Naur gcc-4.8.1.orig/gcc/explow.c gcc-4.8.1/gcc/explow.c
+--- gcc-4.8.1.orig/gcc/explow.c 2013-01-10 20:38:27.000000000 +0000
++++ gcc-4.8.1/gcc/explow.c      2013-10-01 16:06:43.972554286 +0000
+@@ -106,10 +106,10 @@
+          if (overflow)
+            gcc_unreachable ();
+ 
+-         return immed_double_int_const (v, VOIDmode);
++         return immed_double_int_const (v, mode);
+        }
+ 
+-      return GEN_INT (INTVAL (x) + c);
++      return gen_int_mode (INTVAL (x) + c, mode);
+ 
+     case CONST_DOUBLE:
+       {
+@@ -124,7 +124,7 @@
+             To fix, add constant support wider than CONST_DOUBLE.  */
+          gcc_assert (GET_MODE_BITSIZE (mode) <= HOST_BITS_PER_DOUBLE_INT);
+ 
+-       return immed_double_int_const (v, VOIDmode);
++       return immed_double_int_const (v, mode);
+       }
+ 
+     case MEM:
+diff -Naur gcc-4.8.1.orig/gcc/expr.c gcc-4.8.1/gcc/expr.c
+--- gcc-4.8.1.orig/gcc/expr.c   2013-05-14 06:28:12.000000000 +0000
++++ gcc-4.8.1/gcc/expr.c        2013-10-01 16:06:43.976554286 +0000
+@@ -119,7 +119,7 @@
+   int reverse;
+ };
+ 
+-static void move_by_pieces_1 (rtx (*) (rtx, ...), enum machine_mode,
++static void move_by_pieces_1 (insn_gen_fn, machine_mode,
+                              struct move_by_pieces_d *);
+ static bool block_move_libcall_safe_for_call_parm (void);
+ static bool emit_block_move_via_movmem (rtx, rtx, rtx, unsigned, unsigned, HOST_WIDE_INT);
+@@ -128,7 +128,7 @@
+ static rtx clear_by_pieces_1 (void *, HOST_WIDE_INT, enum machine_mode);
+ static void clear_by_pieces (rtx, unsigned HOST_WIDE_INT, unsigned int);
+ static void store_by_pieces_1 (struct store_by_pieces_d *, unsigned int);
+-static void store_by_pieces_2 (rtx (*) (rtx, ...), enum machine_mode,
++static void store_by_pieces_2 (insn_gen_fn, machine_mode,
+                               struct store_by_pieces_d *);
+ static tree clear_storage_libcall_fn (int);
+ static rtx compress_float_constant (rtx, rtx);
+@@ -1043,7 +1043,7 @@
+    to make a move insn for that mode.  DATA has all the other info.  */
+ 
+ static void
+-move_by_pieces_1 (rtx (*genfun) (rtx, ...), enum machine_mode mode,
++move_by_pieces_1 (insn_gen_fn genfun, machine_mode mode,
+                  struct move_by_pieces_d *data)
+ {
+   unsigned int size = GET_MODE_SIZE (mode);
+@@ -2657,7 +2657,7 @@
+    to make a move insn for that mode.  DATA has all the other info.  */
+ 
+ static void
+-store_by_pieces_2 (rtx (*genfun) (rtx, ...), enum machine_mode mode,
++store_by_pieces_2 (insn_gen_fn genfun, machine_mode mode,
+                   struct store_by_pieces_d *data)
+ {
+   unsigned int size = GET_MODE_SIZE (mode);
 diff -Naur gcc-4.8.1.orig/gcc/file-find.c gcc-4.8.1/gcc/file-find.c
 --- gcc-4.8.1.orig/gcc/file-find.c      2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/file-find.c   2013-09-13 19:01:43.093198485 +0000
++++ gcc-4.8.1/gcc/file-find.c   2013-10-01 16:06:43.976554286 +0000
 @@ -31,7 +31,7 @@
  }
@@ -7571 +8496 @@
 diff -Naur gcc-4.8.1.orig/gcc/file-find.h gcc-4.8.1/gcc/file-find.h
 --- gcc-4.8.1.orig/gcc/file-find.h      2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/file-find.h   2013-09-13 19:01:43.096531810 +0000
++++ gcc-4.8.1/gcc/file-find.h   2013-10-01 16:06:43.976554286 +0000
 @@ -38,7 +38,7 @@
  };
@@ -7581 +8506 @@
  extern void prefix_from_env (const char *, struct path_prefix *);
  extern void prefix_from_string (const char *, struct path_prefix *);
+diff -Naur gcc-4.8.1.orig/gcc/fold-const.c gcc-4.8.1/gcc/fold-const.c
+--- gcc-4.8.1.orig/gcc/fold-const.c     2013-05-17 08:52:36.000000000 +0000
++++ gcc-4.8.1/gcc/fold-const.c  2013-10-01 16:06:43.976554286 +0000
+@@ -469,11 +469,24 @@
+         and actually traps on some architectures.  But if overflow is
+         undefined, we can negate, because - (INT_MIN / 1) is an
+         overflow.  */
+-      if (INTEGRAL_TYPE_P (TREE_TYPE (t))
+-         && !TYPE_OVERFLOW_UNDEFINED (TREE_TYPE (t)))
+-        break;
+-      return negate_expr_p (TREE_OPERAND (t, 1))
+-             || negate_expr_p (TREE_OPERAND (t, 0));
++      if (INTEGRAL_TYPE_P (TREE_TYPE (t)))
++       {
++         if (!TYPE_OVERFLOW_UNDEFINED (TREE_TYPE (t)))
++           break;
++         /* If overflow is undefined then we have to be careful because
++            we ask whether it's ok to associate the negate with the
++            division which is not ok for example for
++            -((a - b) / c) where (-(a - b)) / c may invoke undefined
++            overflow because of negating INT_MIN.  So do not use
++            negate_expr_p here but open-code the two important cases.  */
++         if (TREE_CODE (TREE_OPERAND (t, 0)) == NEGATE_EXPR
++             || (TREE_CODE (TREE_OPERAND (t, 0)) == INTEGER_CST
++                 && may_negate_without_overflow_p (TREE_OPERAND (t, 0))))
++           return true;
++       }
++      else if (negate_expr_p (TREE_OPERAND (t, 0)))
++       return true;
++      return negate_expr_p (TREE_OPERAND (t, 1));
+ 
+     case NOP_EXPR:
+       /* Negate -((double)float) as (double)(-float).  */
+@@ -653,16 +666,20 @@
+              return fold_build2_loc (loc, TREE_CODE (t), type,
+                                  TREE_OPERAND (t, 0), negate_expr (tem));
+            }
++         /* If overflow is undefined then we have to be careful because
++            we ask whether it's ok to associate the negate with the
++            division which is not ok for example for
++            -((a - b) / c) where (-(a - b)) / c may invoke undefined
++            overflow because of negating INT_MIN.  So do not use
++            negate_expr_p here but open-code the two important cases.  */
+           tem = TREE_OPERAND (t, 0);
+-          if (negate_expr_p (tem))
+-           {
+-             if (INTEGRAL_TYPE_P (type)
+-                 && (TREE_CODE (tem) != INTEGER_CST
+-                     || tree_int_cst_equal (tem, TYPE_MIN_VALUE (type))))
+-               fold_overflow_warning (warnmsg, WARN_STRICT_OVERFLOW_MISC);
+-             return fold_build2_loc (loc, TREE_CODE (t), type,
+-                                 negate_expr (tem), TREE_OPERAND (t, 1));
+-           }
++         if ((INTEGRAL_TYPE_P (type)
++              && (TREE_CODE (tem) == NEGATE_EXPR
++                  || (TREE_CODE (tem) == INTEGER_CST
++                      && may_negate_without_overflow_p (tem))))
++             || !INTEGRAL_TYPE_P (type))
++           return fold_build2_loc (loc, TREE_CODE (t), type,
++                                   negate_expr (tem), TREE_OPERAND (t, 1));
+         }
+       break;
+ 
+@@ -4220,7 +4237,7 @@
+     }
+ 
+   if (low == 0 && high == 0)
+-    return build_int_cst (type, 1);
++    return omit_one_operand_loc (loc, type, build_int_cst (type, 1), exp);
+ 
+   if (low == 0)
+     return fold_build2_loc (loc, LE_EXPR, type, exp,
+@@ -9851,6 +9868,24 @@
+     }
+ }
+ 
++/*  Mask out the tz least significant bits of X of type TYPE where
++    tz is the number of trailing zeroes in Y.  */
++static double_int
++mask_with_tz (tree type, double_int x, double_int y)
++{
++  int tz = y.trailing_zeros ();
++
++  if (tz > 0)
++    {
++      double_int mask;
++
++      mask = ~double_int::mask (tz);
++      mask = mask.ext (TYPE_PRECISION (type), TYPE_UNSIGNED (type));
++      return mask & x;
++    }
++  return x;
++}
++
+ /* Fold a binary expression of code CODE and type TYPE with operands
+    OP0 and OP1.  LOC is the location of the resulting expression.
+    Return the folded expression if folding is successful.  Otherwise,
+@@ -11175,6 +11210,8 @@
+        {
+          double_int c1, c2, c3, msk;
+          int width = TYPE_PRECISION (type), w;
++         bool try_simplify = true;
++
+          c1 = tree_to_double_int (TREE_OPERAND (arg0, 1));
+          c2 = tree_to_double_int (arg1);
+ 
+@@ -11209,7 +11246,21 @@
+                  break;
+                }
+            }
+-         if (c3 != c1)
++
++         /* If X is a tree of the form (Y * K1) & K2, this might conflict
++            with that optimization from the BIT_AND_EXPR optimizations.
++            This could end up in an infinite recursion.  */
++         if (TREE_CODE (TREE_OPERAND (arg0, 0)) == MULT_EXPR
++             && TREE_CODE (TREE_OPERAND (TREE_OPERAND (arg0, 0), 1))
++                           == INTEGER_CST)
++         {
++           tree t = TREE_OPERAND (TREE_OPERAND (arg0, 0), 1);
++           double_int masked = mask_with_tz (type, c3, tree_to_double_int (t));
++
++           try_simplify = (masked != c1);
++         }
++
++         if (try_simplify && c3 != c1)
+            return fold_build2_loc (loc, BIT_IOR_EXPR, type,
+                                    fold_build2_loc (loc, BIT_AND_EXPR, type,
+                                                     TREE_OPERAND (arg0, 0),
+@@ -11599,22 +11650,16 @@
+          && TREE_CODE (arg0) == MULT_EXPR
+          && TREE_CODE (TREE_OPERAND (arg0, 1)) == INTEGER_CST)
+        {
+-         int arg1tz
+-           = tree_to_double_int (TREE_OPERAND (arg0, 1)).trailing_zeros ();
+-         if (arg1tz > 0)
+-           {
+-             double_int arg1mask, masked;
+-             arg1mask = ~double_int::mask (arg1tz);
+-             arg1mask = arg1mask.ext (TYPE_PRECISION (type),
+-                                        TYPE_UNSIGNED (type));
+-             masked = arg1mask & tree_to_double_int (arg1);
+-             if (masked.is_zero ())
+-               return omit_two_operands_loc (loc, type, build_zero_cst (type),
+-                                             arg0, arg1);
+-             else if (masked != tree_to_double_int (arg1))
+-               return fold_build2_loc (loc, code, type, op0,
+-                                       double_int_to_tree (type, masked));
+-           }
++         double_int masked
++           = mask_with_tz (type, tree_to_double_int (arg1),
++                           tree_to_double_int (TREE_OPERAND (arg0, 1)));
++
++         if (masked.is_zero ())
++           return omit_two_operands_loc (loc, type, build_zero_cst (type),
++                                         arg0, arg1);
++         else if (masked != tree_to_double_int (arg1))
++           return fold_build2_loc (loc, code, type, op0,
++                                   double_int_to_tree (type, masked));
+        }
+ 
+       /* For constants M and N, if M == (1LL << cst) - 1 && (N & M) == M,
+@@ -14040,14 +14085,29 @@
+          && integer_zerop (op2)
+          && (tem = sign_bit_p (TREE_OPERAND (arg0, 0), arg1)))
+        {
++         /* sign_bit_p looks through both zero and sign extensions,
++            but for this optimization only sign extensions are
++            usable.  */
++         tree tem2 = TREE_OPERAND (arg0, 0);
++         while (tem != tem2)
++           {
++             if (TREE_CODE (tem2) != NOP_EXPR
++                 || TYPE_UNSIGNED (TREE_TYPE (TREE_OPERAND (tem2, 0))))
++               {
++                 tem = NULL_TREE;
++                 break;
++               }
++             tem2 = TREE_OPERAND (tem2, 0);
++           }
+          /* sign_bit_p only checks ARG1 bits within A's precision.
+             If <sign bit of A> has wider type than A, bits outside
+             of A's precision in <sign bit of A> need to be checked.
+             If they are all 0, this optimization needs to be done
+             in unsigned A's type, if they are all 1 in signed A's type,
+             otherwise this can't be done.  */
+-         if (TYPE_PRECISION (TREE_TYPE (tem))
+-             < TYPE_PRECISION (TREE_TYPE (arg1))
++         if (tem
++             && TYPE_PRECISION (TREE_TYPE (tem))
++                < TYPE_PRECISION (TREE_TYPE (arg1))
+              && TYPE_PRECISION (TREE_TYPE (tem))
+                 < TYPE_PRECISION (type))
+            {
 diff -Naur gcc-4.8.1.orig/gcc/fortran/interface.c gcc-4.8.1/gcc/fortran/interface.c
 --- gcc-4.8.1.orig/gcc/fortran/interface.c      2013-04-26 19:20:55.000000000 +0000
-+++ gcc-4.8.1/gcc/fortran/interface.c   2013-09-13 19:01:43.096531810 +0000
++++ gcc-4.8.1/gcc/fortran/interface.c   2013-10-01 16:06:43.976554286 +0000
 @@ -1024,7 +1024,8 @@
                              bool type_must_agree, char *errmsg, int err_len)
@@ -7596 +8715 @@
 diff -Naur gcc-4.8.1.orig/gcc/fortran/match.c gcc-4.8.1/gcc/fortran/match.c
 --- gcc-4.8.1.orig/gcc/fortran/match.c  2013-04-18 18:20:22.000000000 +0000
-+++ gcc-4.8.1/gcc/fortran/match.c       2013-09-13 19:01:43.099865134 +0000
++++ gcc-4.8.1/gcc/fortran/match.c       2013-10-01 16:06:43.980554285 +0000
 @@ -5142,7 +5142,6 @@
  {
@@ -7674 +8793 @@
 diff -Naur gcc-4.8.1.orig/gcc/fortran/module.c gcc-4.8.1/gcc/fortran/module.c
 --- gcc-4.8.1.orig/gcc/fortran/module.c 2013-01-29 21:40:51.000000000 +0000
-+++ gcc-4.8.1/gcc/fortran/module.c      2013-09-13 19:01:43.099865134 +0000
++++ gcc-4.8.1/gcc/fortran/module.c      2013-10-01 16:06:43.980554285 +0000
 @@ -4465,7 +4465,7 @@
    module_locus locus;
@@ -7686 +8805 @@
 diff -Naur gcc-4.8.1.orig/gcc/fortran/resolve.c gcc-4.8.1/gcc/fortran/resolve.c
 --- gcc-4.8.1.orig/gcc/fortran/resolve.c        2013-05-07 16:36:48.000000000 +0000
-+++ gcc-4.8.1/gcc/fortran/resolve.c     2013-09-13 19:01:43.103198459 +0000
++++ gcc-4.8.1/gcc/fortran/resolve.c     2013-10-01 16:06:43.980554285 +0000
 @@ -9746,6 +9746,10 @@
  
@@ -7708 +8827 @@
 diff -Naur gcc-4.8.1.orig/gcc/fortran/simplify.c gcc-4.8.1/gcc/fortran/simplify.c
 --- gcc-4.8.1.orig/gcc/fortran/simplify.c       2013-05-07 16:36:48.000000000 +0000
-+++ gcc-4.8.1/gcc/fortran/simplify.c    2013-09-13 19:01:43.106531784 +0000
++++ gcc-4.8.1/gcc/fortran/simplify.c    2013-10-01 16:06:43.980554285 +0000
 @@ -332,13 +332,15 @@
  }
@@ -7763 +8882 @@
 diff -Naur gcc-4.8.1.orig/gcc/fortran/trans-array.c gcc-4.8.1/gcc/fortran/trans-array.c
 --- gcc-4.8.1.orig/gcc/fortran/trans-array.c    2013-02-21 12:26:44.000000000 +0000
-+++ gcc-4.8.1/gcc/fortran/trans-array.c 2013-09-13 19:01:43.109865108 +0000
++++ gcc-4.8.1/gcc/fortran/trans-array.c 2013-10-01 16:06:43.984554285 +0000
 @@ -3674,7 +3674,7 @@
  /* Calculate the lower bound of an array section.  */
@@ -7900 +9019 @@
 diff -Naur gcc-4.8.1.orig/gcc/fortran/trans-intrinsic.c gcc-4.8.1/gcc/fortran/trans-intrinsic.c
 --- gcc-4.8.1.orig/gcc/fortran/trans-intrinsic.c        2013-03-15 10:09:39.000000000 +0000
-+++ gcc-4.8.1/gcc/fortran/trans-intrinsic.c     2013-09-13 19:01:43.113198433 +0000
++++ gcc-4.8.1/gcc/fortran/trans-intrinsic.c     2013-10-01 16:06:43.984554285 +0000
 @@ -5653,8 +5653,7 @@
  
@@ -7927 +9046 @@
 diff -Naur gcc-4.8.1.orig/gcc/gcc-ar.c gcc-4.8.1/gcc/gcc-ar.c
 --- gcc-4.8.1.orig/gcc/gcc-ar.c 2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/gcc-ar.c      2013-09-13 19:01:43.113198433 +0000
++++ gcc-4.8.1/gcc/gcc-ar.c      2013-10-01 16:06:43.984554285 +0000
 @@ -136,7 +136,7 @@
    setup_prefixes (av[0]);
@@ -7968 +9087 @@
  
    /* Create new command line with plugin */
+diff -Naur gcc-4.8.1.orig/gcc/genoutput.c gcc-4.8.1/gcc/genoutput.c
+--- gcc-4.8.1.orig/gcc/genoutput.c      2013-01-10 20:38:27.000000000 +0000
++++ gcc-4.8.1/gcc/genoutput.c   2013-10-01 16:06:43.984554285 +0000
+@@ -404,9 +404,9 @@
+        }
+ 
+       if (d->name && d->name[0] != '*')
+-       printf ("    (insn_gen_fn) gen_%s,\n", d->name);
++       printf ("    { (insn_gen_fn::stored_funcptr) gen_%s },\n", d->name);
+       else
+-       printf ("    0,\n");
++       printf ("    { 0 },\n");
+ 
+       printf ("    &operand_data[%d],\n", d->operand_number);
+       printf ("    %d,\n", d->n_generator_args);
 diff -Naur gcc-4.8.1.orig/gcc/gimple-ssa-strength-reduction.c gcc-4.8.1/gcc/gimple-ssa-strength-reduction.c
 --- gcc-4.8.1.orig/gcc/gimple-ssa-strength-reduction.c  2013-04-15 15:00:06.000000000 +0000
-+++ gcc-4.8.1/gcc/gimple-ssa-strength-reduction.c       2013-09-13 19:01:43.116531757 +0000
++++ gcc-4.8.1/gcc/gimple-ssa-strength-reduction.c       2013-10-01 16:06:43.984554285 +0000
 @@ -1525,11 +1525,23 @@
  static void
@@ -8002 +9136 @@
 diff -Naur gcc-4.8.1.orig/gcc/gimple.c gcc-4.8.1/gcc/gimple.c
 --- gcc-4.8.1.orig/gcc/gimple.c 2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/gimple.c      2013-09-13 19:01:43.113198433 +0000
++++ gcc-4.8.1/gcc/gimple.c      2013-10-01 16:06:43.984554285 +0000
 @@ -4045,6 +4045,13 @@
             ret |= visit_addr (stmt, TREE_OPERAND (op, 0), data);
@@ -8019 +9153 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/go-gcc.cc gcc-4.8.1/gcc/go/go-gcc.cc
 --- gcc-4.8.1.orig/gcc/go/go-gcc.cc     2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/go/go-gcc.cc  2013-09-13 19:01:43.166531626 +0000
-@@ -287,10 +287,10 @@
++++ gcc-4.8.1/gcc/go/go-gcc.cc  2013-10-01 16:06:43.992554285 +0000
+@@ -208,6 +208,16 @@
+   Bexpression*
+   zero_expression(Btype*);
+ 
++  Bexpression*
++  error_expression()
++  { return this->make_expression(error_mark_node); }
++
++  Bexpression*
++  var_expression(Bvariable* var, Location);
++
++  Bexpression*
++  indirect_expression(Bexpression* expr, bool known_valid, Location);
++
+   // Statements.
+ 
+   Bstatement*
+@@ -287,10 +297,10 @@
                      Location, Bstatement**);
  
@@ -8033 +9184 @@
  
    Bvariable*
-@@ -1242,20 +1242,41 @@
+@@ -848,6 +858,30 @@
+   return tree_to_expr(ret);
+ }
+ 
++// An expression that references a variable.
++
++Bexpression*
++Gcc_backend::var_expression(Bvariable* var, Location)
++{
++  tree ret = var->get_tree();
++  if (ret == error_mark_node)
++    return this->error_expression();
++  return tree_to_expr(ret);
++}
++
++// An expression that indirectly references an expression.
++
++Bexpression*
++Gcc_backend::indirect_expression(Bexpression* expr, bool known_valid,
++                                 Location location)
++{
++  tree ret = build_fold_indirect_ref_loc(location.gcc_location(),
++                                         expr->get_tree());
++  if (known_valid)
++    TREE_THIS_NOTRAP(ret) = 1;
++  return tree_to_expr(ret);
++}
++
+ // An expression as a statement.
+ 
+ Bstatement*
+@@ -1242,20 +1276,41 @@
    switch (TREE_CODE(type))
      {
@@ -8089 +9271 @@
      case ARRAY_TYPE:
        {
-@@ -1454,8 +1475,8 @@
+@@ -1454,8 +1509,8 @@
  // Create a named immutable initialized data structure.
  
@@ -8095 +9277 @@
 -Gcc_backend::immutable_struct(const std::string& name, bool, Btype* btype,
 -                             Location location)
-+Gcc_backend::immutable_struct(const std::string& name, bool, bool,
-+                             Btype* btype, Location location)
++Gcc_backend::immutable_struct(const std::string& name, bool is_hidden,
++                             bool, Btype* btype, Location location)
  {
    tree type_tree = btype->get_tree();
    if (type_tree == error_mark_node)
-@@ -1482,7 +1503,7 @@
+@@ -1469,6 +1524,8 @@
+   TREE_CONSTANT(decl) = 1;
+   TREE_USED(decl) = 1;
+   DECL_ARTIFICIAL(decl) = 1;
++  if (!is_hidden)
++    TREE_PUBLIC(decl) = 1;
+ 
+   // We don't call rest_of_decl_compilation until we have the
+   // initializer.
+@@ -1482,8 +1539,7 @@
  
  void
  Gcc_backend::immutable_struct_set_init(Bvariable* var, const std::string&,
 -                                      bool is_common, Btype*,
-+                                      bool is_hidden, bool is_common, Btype*,
-                                       Location,
+-                                      Location,
++                                      bool, bool is_common, Btype*, Location,
                                        Bexpression* initializer)
  {
-@@ -1495,12 +1516,18 @@
+   tree decl = var->get_tree();
+@@ -1494,13 +1550,14 @@
+   DECL_INITIAL(decl) = init_tree;
  
    // We can't call make_decl_one_only until we set DECL_INITIAL.
-   if (!is_common)
+-  if (!is_common)
 -    TREE_PUBLIC(decl) = 1;
 -  else
-     {
+-    {
 -      make_decl_one_only(decl, DECL_ASSEMBLER_NAME(decl));
 -      resolve_unique_section(decl, 1, 0);
-+      if (!is_hidden)
-+       TREE_PUBLIC(decl) = 1;
-     }
-+  else
+-    }
++  if (is_common)
 +    make_decl_one_only(decl, DECL_ASSEMBLER_NAME(decl));
 +
@@ -8134 +9325 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/backend.h gcc-4.8.1/gcc/go/gofrontend/backend.h
 --- gcc-4.8.1.orig/gcc/go/gofrontend/backend.h  2012-11-29 18:11:17.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/backend.h       2013-09-13 19:01:43.116531757 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/backend.h       2013-10-01 16:06:43.984554285 +0000
 @@ -95,7 +95,10 @@
  
@@ -8147 +9338 @@
    function_type(const Btyped_identifier& receiver,
                 const std::vector<Btyped_identifier>& parameters,
-@@ -388,18 +391,22 @@
+@@ -228,6 +231,22 @@
+   virtual Bexpression*
+   zero_expression(Btype*) = 0;
+ 
++  // Create an error expression. This is used for cases which should
++  // not occur in a correct program, in order to keep the compilation
++  // going without crashing.
++  virtual Bexpression*
++  error_expression() = 0;
++
++  // Create a reference to a variable.
++  virtual Bexpression*
++  var_expression(Bvariable* var, Location) = 0;
++
++  // Create an expression that indirects through the pointer expression EXPR
++  // (i.e., return the expression for *EXPR). KNOWN_VALID is true if the pointer
++  // is known to point to a valid memory location.
++  virtual Bexpression*
++  indirect_expression(Bexpression* expr, bool known_valid, Location) = 0;
++
+   // Statements.
+ 
+   // Create an error statement.  This is used for cases which should
+@@ -388,18 +407,22 @@
                      Bstatement** pstatement) = 0;
  
@@ -8174 +9388 @@
    // TYPE will be a struct type; the type of the returned expression
    // must be a pointer to this struct type.
-@@ -409,20 +416,20 @@
+@@ -409,20 +432,20 @@
    // address.  After calling this the frontend will call
    // immutable_struct_set_init.
@@ -8206 +9420 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/expressions.cc gcc-4.8.1/gcc/go/gofrontend/expressions.cc
 --- gcc-4.8.1.orig/gcc/go/gofrontend/expressions.cc     2012-12-21 15:59:27.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/expressions.cc  2013-09-13 19:01:43.119865082 +0000
-@@ -1090,6 +1090,15 @@
++++ gcc-4.8.1/gcc/go/gofrontend/expressions.cc  2013-10-01 16:06:43.988554285 +0000
+@@ -978,22 +978,19 @@
+ {
+   Bvariable* bvar = this->variable_->get_backend_variable(context->gogo(),
+                                                          context->function());
+-  tree ret = var_to_tree(bvar);
+-  if (ret == error_mark_node)
+-    return error_mark_node;
+   bool is_in_heap;
++  Location loc = this->location();
+   if (this->variable_->is_variable())
+     is_in_heap = this->variable_->var_value()->is_in_heap();
+   else if (this->variable_->is_result_variable())
+     is_in_heap = this->variable_->result_var_value()->is_in_heap();
+   else
+     go_unreachable();
++
++  Bexpression* ret = context->backend()->var_expression(bvar, loc);
+   if (is_in_heap)
+-    {
+-      ret = build_fold_indirect_ref_loc(this->location().gcc_location(), ret);
+-      TREE_THIS_NOTRAP(ret) = 1;
+-    }
+-  return ret;
++    ret = context->backend()->indirect_expression(ret, true, loc);
++  return expr_to_tree(ret);
+ }
+ 
+ // Ast dump for variable expression.
+@@ -1090,6 +1087,15 @@
    return this->statement_->type();
  }
@@ -8223 +9465 @@
  
  void
-@@ -1255,17 +1264,16 @@
+@@ -1255,17 +1261,16 @@
      go_unreachable();
  }
@@ -8247 +9489 @@
      go_unreachable();
  
-@@ -1273,14 +1281,12 @@
+@@ -1273,14 +1278,12 @@
    // can't take their address.
    if (fntype->is_builtin())
@@ -8264 +9506 @@
    if (id == error_mark_node)
      return error_mark_node;
-@@ -1296,46 +1302,55 @@
+@@ -1296,46 +1299,55 @@
    if (fndecl == error_mark_node)
      return error_mark_node;
@@ -8349 +9591 @@
  
  // Ast dump for function.
-@@ -1361,6 +1376,197 @@
+@@ -1361,6 +1373,181 @@
    return new Func_expression(function, closure, location);
  }
@@ -8359 +9601 @@
 +Func_descriptor_expression::Func_descriptor_expression(Named_object* fn)
 +  : Expression(EXPRESSION_FUNC_DESCRIPTOR, fn->location()),
-+    fn_(fn), dfn_(NULL), dvar_(NULL)
++    fn_(fn), dvar_(NULL)
 +{
 +  go_assert(!fn->is_function() || !fn->func_value()->needs_closure());
@@ -8394 +9636 @@
 +}
 +
-+// Copy a Func_descriptor_expression;
-+
-+Expression*
-+Func_descriptor_expression::do_copy()
-+{
-+  Func_descriptor_expression* fde =
-+    Expression::make_func_descriptor(this->fn_);
-+  if (this->dfn_ != NULL)
-+    fde->set_descriptor_wrapper(this->dfn_);
-+  return fde;
-+}
-+
 +// The tree for a function descriptor.
 +
@@ -8432 +9662 @@
 +  if (no->package() != NULL
 +      || Linemap::is_predeclared_location(no->location()))
-+    {
-+      bvar = context->backend()->immutable_struct_reference(var_name, btype,
-+                                                           loc);
-+      go_assert(this->dfn_ == NULL);
-+    }
++    bvar = context->backend()->immutable_struct_reference(var_name, btype,
++                                                         loc);
 +  else
 +    {
@@ -8446 +9673 @@
 +                                                 btype, bloc);
 +      Expression_list* vals = new Expression_list();
-+      go_assert(this->dfn_ != NULL);
-+      vals->push_back(Expression::make_func_code_reference(this->dfn_, bloc));
++      vals->push_back(Expression::make_func_code_reference(this->fn_, bloc));
 +      Expression* init =
 +       Expression::make_struct_composite_literal(this->type(), vals, bloc);
@@ -8547 +9773 @@
  
  // Return the name of an unknown expression.
-@@ -5462,6 +5668,7 @@
+@@ -5462,6 +5649,7 @@
        if (tleft->is_abstract()
           && subcontext.type != NULL
@@ -8555 +9781 @@
         this->report_error(("invalid context-determined non-integer type "
                             "for left operand of shift"));
-@@ -5641,6 +5848,20 @@
+@@ -5641,6 +5829,20 @@
           this->set_is_error();
           return;
@@ -8576 +9802 @@
    else
      {
-@@ -6429,20 +6650,49 @@
+@@ -6429,20 +6631,49 @@
    return Expression::traverse(&this->expr_, traverse);
  }
@@ -8633 +9859 @@
  
  // Determine the types of a method expression.
-@@ -6450,7 +6700,14 @@
+@@ -6450,7 +6681,14 @@
  void
  Bound_method_expression::do_determine_type(const Type_context*)
@@ -8649 +9875 @@
      this->expr_->determine_type_no_context();
    else
-@@ -6465,31 +6722,278 @@
+@@ -6465,31 +6703,278 @@
  void
  Bound_method_expression::do_check_types(Gogo*)
@@ -8668 +9894 @@
 +  else if (fn->is_function_declaration())
 +    fntype = fn->func_declaration_value()->type();
-   else
++  else
 +    go_unreachable();
 +  Type* rtype = fntype->receiver()->type()->deref();
@@ -8703 +9929 @@
 +    Bound_method_expression::method_value_thunks.insert(val);
 +  if (!ins.second)
++    {
++      // We have seen this method before.
++      go_assert(ins.first->second != NULL);
++      return ins.first->second;
++    }
++
++  Location loc = fn->location();
++
++  Function_type* orig_fntype;
++  if (fn->is_function())
++    orig_fntype = fn->func_value()->type();
++  else if (fn->is_function_declaration())
++    orig_fntype = fn->func_declaration_value()->type();
++  else
++    orig_fntype = NULL;
++
++  if (orig_fntype == NULL || !orig_fntype->is_method())
++    {
++      ins.first->second = Named_object::make_erroneous_name(Gogo::thunk_name());
++      return ins.first->second;
++    }
++
++  Struct_field_list* sfl = new Struct_field_list();
++  // The type here is wrong--it should be the C function type.  But it
++  // doesn't really matter.
++  Type* vt = Type::make_pointer_type(Type::make_void_type());
++  sfl->push_back(Struct_field(Typed_identifier("fn.0", vt, loc)));
++  sfl->push_back(Struct_field(Typed_identifier("val.1",
++                                              orig_fntype->receiver()->type(),
++                                              loc)));
++  Type* closure_type = Type::make_struct_type(sfl, loc);
++  closure_type = Type::make_pointer_type(closure_type);
++
++  Function_type* new_fntype = orig_fntype->copy_with_names();
++
++  Named_object* new_no = gogo->start_function(Gogo::thunk_name(), new_fntype,
++                                             false, loc);
++
++  Variable* cvar = new Variable(closure_type, NULL, false, false, false, loc);
++  cvar->set_is_used();
++  Named_object* cp = Named_object::make_variable("$closure", NULL, cvar);
++  new_no->func_value()->set_closure_var(cp);
++
++  gogo->start_block(loc);
++
++  // Field 0 of the closure is the function code pointer, field 1 is
++  // the value on which to invoke the method.
++  Expression* arg = Expression::make_var_reference(cp, loc);
++  arg = Expression::make_unary(OPERATOR_MULT, arg, loc);
++  arg = Expression::make_field_reference(arg, 1, loc);
++
++  Expression* bme = Expression::make_bound_method(arg, method, fn, loc);
++
++  const Typed_identifier_list* orig_params = orig_fntype->parameters();
++  Expression_list* args;
++  if (orig_params == NULL || orig_params->empty())
++    args = NULL;
+   else
      {
 -      Type* rtype = this->type()->function_type()->receiver()->type()->deref();
@@ -8711 +9995 @@
 -      if (!Type::are_identical(rtype, etype, true, NULL))
 -       this->report_error(_("method type does not match object type"));
-+      // We have seen this method before.
-+      go_assert(ins.first->second != NULL);
-+      return ins.first->second;
-     }
-+
-+  Location loc = fn->location();
-+
-+  Function_type* orig_fntype;
-+  if (fn->is_function())
-+    orig_fntype = fn->func_value()->type();
-+  else if (fn->is_function_declaration())
-+    orig_fntype = fn->func_declaration_value()->type();
-+  else
-+    orig_fntype = NULL;
-+
-+  if (orig_fntype == NULL || !orig_fntype->is_method())
-+    {
-+      ins.first->second = Named_object::make_erroneous_name(Gogo::thunk_name());
-+      return ins.first->second;
-+    }
-+
-+  Struct_field_list* sfl = new Struct_field_list();
-+  // The type here is wrong--it should be new_fntype.  But we don't
-+  // have new_fntype yet, and it doesn't really matter.
-+  Type* vt = Type::make_pointer_type(Type::make_void_type());
-+  sfl->push_back(Struct_field(Typed_identifier("fn.0", vt, loc)));
-+  sfl->push_back(Struct_field(Typed_identifier("val.1",
-+                                              orig_fntype->receiver()->type(),
-+                                              loc)));
-+  Type* closure_type = Type::make_struct_type(sfl, loc);
-+  closure_type = Type::make_pointer_type(closure_type);
-+
-+  Function_type* new_fntype = orig_fntype->copy_with_closure(closure_type);
-+
-+  Named_object* new_no = gogo->start_function(Gogo::thunk_name(), new_fntype,
-+                                             false, loc);
-+
-+  gogo->start_block(loc);
-+
-+  Named_object* cp = gogo->lookup("closure.0", NULL);
-+  go_assert(cp != NULL
-+           && cp->is_variable()
-+           && cp->var_value()->is_parameter());
-+
-+  // Field 0 of the closure is the function code pointer, field 1 is
-+  // the value on which to invoke the method.
-+  Expression* arg = Expression::make_var_reference(cp, loc);
-+  arg = Expression::make_unary(OPERATOR_MULT, arg, loc);
-+  arg = Expression::make_field_reference(arg, 1, loc);
-+
-+  Expression* bme = Expression::make_bound_method(arg, method, fn, loc);
-+
-+  const Typed_identifier_list* orig_params = orig_fntype->parameters();
-+  Expression_list* args;
-+  if (orig_params == NULL || orig_params->empty())
-+    args = NULL;
-+  else
-+    {
 +      const Typed_identifier_list* new_params = new_fntype->parameters();
 +      args = new Expression_list();
 +      for (Typed_identifier_list::const_iterator p = new_params->begin();
-+          p + 1 != new_params->end();
++          p != new_params->end();
 +          ++p)
 +       {
@@ -8781 +10007 @@
 +         args->push_back(Expression::make_var_reference(p_no, loc));
 +       }
-+    }
+     }
 +
 +  Call_expression* call = Expression::make_call(bme, args,
@@ -8945 +10171 @@
  
  // Dump ast representation of a bound method expression.
-@@ -6508,16 +7012,16 @@
+@@ -6508,16 +6993,16 @@
        ast_dump_context->ostream() << ")";
      }
@@ -8966 +10192 @@
  
  // Class Builtin_call_expression.  This is used for a call to a
-@@ -6722,6 +7226,26 @@
+@@ -6722,6 +7207,26 @@
        return Expression::make_error(loc);
      }
@@ -8993 +10219 @@
      {
        Numeric_constant nc;
-@@ -6874,6 +7398,8 @@
+@@ -6874,6 +7379,8 @@
    Type* uintptr_type = Type::lookup_integer_type("uintptr");
    int uintptr_bits = uintptr_type->integer_type()->bits();
@@ -9002 +10228 @@
    Expression* len_arg;
    if (parg == args->end())
-@@ -6892,6 +7418,7 @@
+@@ -6892,6 +7399,7 @@
    else
      {
@@ -9010 +10236 @@
         return Expression::make_error(this->location());
        if (len_arg->type()->integer_type() != NULL
-@@ -6904,6 +7431,7 @@
+@@ -6904,6 +7412,7 @@
    if (is_slice && parg != args->end())
      {
@@ -9018 +10244 @@
         return Expression::make_error(this->location());
  
-@@ -7279,19 +7807,31 @@
+@@ -7240,8 +7749,6 @@
+        return false;
+       if (arg_type->is_abstract())
+        return false;
+-      if (arg_type->named_type() != NULL)
+-       arg_type->named_type()->convert(this->gogo_);
+ 
+       unsigned int ret;
+       if (this->code_ == BUILTIN_SIZEOF)
+@@ -7279,19 +7786,31 @@
        Field_reference_expression* farg = arg->field_reference_expression();
        if (farg == NULL)
@@ -9062 +10297 @@
      }
    else if (this->code_ == BUILTIN_REAL || this->code_ == BUILTIN_IMAG)
-@@ -7509,6 +8049,8 @@
+@@ -7509,6 +8028,8 @@
      case BUILTIN_REAL:
      case BUILTIN_IMAG:
@@ -9071 +10306 @@
        break;
  
-@@ -7517,6 +8059,8 @@
+@@ -7517,6 +8038,8 @@
         // For the complex function the type of one operand can
         // determine the type of the other, as in a binary expression.
@@ -9080 +10315 @@
           {
             Type* t1 = args->front()->type();
-@@ -8509,6 +9053,74 @@
+@@ -8509,6 +9032,74 @@
  
  // Class Call_expression.
@@ -9155 +10390 @@
  
  int
-@@ -8624,7 +9236,7 @@
+@@ -8542,35 +9133,27 @@
+   // Because do_type will return an error type and thus prevent future
+   // errors, check for that case now to ensure that the error gets
+   // reported.
+-  if (this->get_function_type() == NULL)
++  Function_type* fntype = this->get_function_type();
++  if (fntype == NULL)
+     {
+       if (!this->fn_->type()->is_error())
+        this->report_error(_("expected function"));
+       return Expression::make_error(loc);
+     }
+ 
+-  // Recognize a call to a builtin function.
+-  Func_expression* fne = this->fn_->func_expression();
+-  if (fne != NULL
+-      && fne->named_object()->is_function_declaration()
+-      && fne->named_object()->func_declaration_value()->type()->is_builtin())
+-    return new Builtin_call_expression(gogo, this->fn_, this->args_,
+-                                      this->is_varargs_, loc);
+-
+   // Handle an argument which is a call to a function which returns
+   // multiple results.
+   if (this->args_ != NULL
+       && this->args_->size() == 1
+-      && this->args_->front()->call_expression() != NULL
+-      && this->fn_->type()->function_type() != NULL)
++      && this->args_->front()->call_expression() != NULL)
+     {
+-      Function_type* fntype = this->fn_->type()->function_type();
+       size_t rc = this->args_->front()->call_expression()->result_count();
+       if (rc > 1
+-         && fntype->parameters() != NULL
+-         && (fntype->parameters()->size() == rc
+-             || (fntype->is_varargs()
+-                 && fntype->parameters()->size() - 1 <= rc)))
++         && ((fntype->parameters() != NULL
++               && (fntype->parameters()->size() == rc
++                   || (fntype->is_varargs()
++                       && fntype->parameters()->size() - 1 <= rc)))
++              || fntype->is_builtin()))
+        {
+          Call_expression* call = this->args_->front()->call_expression();
+          Expression_list* args = new Expression_list;
+@@ -8584,6 +9167,11 @@
+        }
+     }
+ 
++  // Recognize a call to a builtin function.
++  if (fntype->is_builtin())
++    return new Builtin_call_expression(gogo, this->fn_, this->args_,
++                                      this->is_varargs_, loc);
++
+   // If this call returns multiple results, create a temporary
+   // variable for each result.
+   size_t rc = this->result_count();
+@@ -8592,8 +9180,7 @@
+       std::vector<Temporary_statement*>* temps =
+        new std::vector<Temporary_statement*>;
+       temps->reserve(rc);
+-      const Typed_identifier_list* results =
+-       this->fn_->type()->function_type()->results();
++      const Typed_identifier_list* results = fntype->results();
+       for (Typed_identifier_list::const_iterator p = results->begin();
+           p != results->end();
+           ++p)
+@@ -8608,10 +9195,8 @@
+ 
+   // Handle a call to a varargs function by packaging up the extra
+   // parameters.
+-  if (this->fn_->type()->function_type() != NULL
+-      && this->fn_->type()->function_type()->is_varargs())
++  if (fntype->is_varargs())
+     {
+-      Function_type* fntype = this->fn_->type()->function_type();
+       const Typed_identifier_list* parameters = fntype->parameters();
+       go_assert(parameters != NULL && !parameters->empty());
+       Type* varargs_type = parameters->back().type();
+@@ -8624,7 +9209,7 @@
    Bound_method_expression* bme = this->fn_->bound_method_expression();
    if (bme != NULL)
@@ -9164 +10477 @@
  
        // We always pass a pointer when calling a method.
-@@ -8665,7 +9277,7 @@
+@@ -8665,7 +9250,7 @@
        // old arguments, because we may be traversing them up in some
        // caller.  FIXME.
@@ -9173 +10486 @@
      }
  
-@@ -9117,11 +9729,21 @@
+@@ -9117,6 +9702,16 @@
    const bool has_closure = func != NULL && func->closure() != NULL;
    const bool is_interface_method = interface_method != NULL;
  
-+  int closure_arg;
++  bool has_closure_arg;
 +  if (has_closure)
-+    closure_arg = 1;
++    has_closure_arg = true;
 +  else if (func != NULL)
-+    closure_arg = 0;
++    has_closure_arg = false;
 +  else if (is_interface_method)
-+    closure_arg = 0;
++    has_closure_arg = false;
 +  else
-+    closure_arg = 1;
++    has_closure_arg = true;
 +
    int nargs;
    tree* args;
    if (this->args_ == NULL || this->args_->empty())
-     {
--      nargs = is_interface_method ? 1 : 0;
-+      nargs = (is_interface_method ? 1 : 0) + closure_arg;
-       args = nargs == 0 ? NULL : new tree[nargs];
-     }
-   else if (fntype->parameters() == NULL || fntype->parameters()->empty())
-@@ -9130,7 +9752,7 @@
-       go_assert(!is_interface_method
-                && fntype->is_method()
-                && this->args_->size() == 1);
--      nargs = 1;
-+      nargs = 1 + closure_arg;
-       args = new tree[nargs];
-       args[0] = this->args_->front()->get_tree(context);
-     }
-@@ -9141,6 +9763,7 @@
-       nargs = this->args_->size();
-       int i = is_interface_method ? 1 : 0;
-       nargs += i;
-+      nargs += closure_arg;
-       args = new tree[nargs];
- 
-       Typed_identifier_list::const_iterator pp = params->begin();
-@@ -9161,36 +9784,71 @@
+@@ -9161,36 +9756,71 @@
                                                        arg_val,
                                                        location);
@@ -9224 +10514 @@
         }
        go_assert(pp == params->end());
--      go_assert(i == nargs);
-+      go_assert(i + closure_arg == nargs);
+       go_assert(i == nargs);
      }
  
@@ -9251 +10540 @@
 -  if (has_closure)
 -    fn = func->get_tree_without_closure(gogo);
++  tree closure_tree;
 +  if (func != NULL)
 +    {
 +      Named_object* no = func->named_object();
-+      go_assert(!no->is_function()
-+               || !no->func_value()->is_descriptor_wrapper());
 +      fn = Func_expression::get_code_pointer(gogo, no, location);
-+      if (has_closure)
++      if (!has_closure)
++       closure_tree = NULL_TREE;
++      else
 +       {
-+         go_assert(closure_arg == 1 && nargs > 0);
-+         args[nargs - 1] = func->closure()->get_tree(context);
++         closure_tree = func->closure()->get_tree(context);
++         if (closure_tree == error_mark_node)
++           return error_mark_node;
 +       }
 +    }
@@ -9272 +10563 @@
 -      delete[] args;
 -      return error_mark_node;
-+      tree closure_tree = this->fn_->get_tree(context);
++      closure_tree = this->fn_->get_tree(context);
 +      if (closure_tree == error_mark_node)
 +       return error_mark_node;
@@ -9286 +10577 @@
 +                                                      fnc),
 +                          field, NULL_TREE);
-+      go_assert(closure_arg == 1 && nargs > 0);
-+      args[nargs - 1] = closure_tree;
 +    }      
 +  else
@@ -9295 +10584 @@
 +      if (fn == error_mark_node)
 +       return error_mark_node;
-+      go_assert(closure_arg == 0);
++      closure_tree = NULL_TREE;
      }
  
@@ -9304 +10593 @@
    if (TREE_CODE(fndecl) == ADDR_EXPR)
      fndecl = TREE_OPERAND(fndecl, 0);
-@@ -9198,12 +9856,7 @@
+@@ -9198,12 +9828,7 @@
    // Add a type cast in case the type of the function is a recursive
    // type which refers to itself.
@@ -9318 +10607 @@
    // This is to support builtin math functions when using 80387 math.
    tree excess_type = NULL_TREE;
-@@ -9247,13 +9900,6 @@
+@@ -9241,19 +9866,38 @@
+   if (func == NULL)
+     fn = save_expr(fn);
+ 
++  if (!has_closure_arg)
++    go_assert(closure_tree == NULL_TREE);
++  else
++    {
++      // Pass the closure argument by calling the function function
++      // __go_set_closure.  In the order_evaluations pass we have
++      // ensured that if any parameters contain call expressions, they
++      // will have been moved out to temporary variables.
++
++      go_assert(closure_tree != NULL_TREE);
++      closure_tree = fold_convert_loc(location.gcc_location(), ptr_type_node,
++                                     closure_tree);
++      static tree set_closure_fndecl;
++      tree set_closure = Gogo::call_builtin(&set_closure_fndecl,
++                                           location,
++                                           "__go_set_closure",
++                                           1,
++                                           void_type_node,
++                                           ptr_type_node,
++                                           closure_tree);
++      if (set_closure == error_mark_node)
++       return error_mark_node;
++      fn = build2_loc(location.gcc_location(), COMPOUND_EXPR,
++                     TREE_TYPE(fn), set_closure, fn);
++    }
++
+   tree ret = build_call_array(excess_type != NULL_TREE ? excess_type : rettype,
+                              fn, nargs, args);
+   delete[] args;
  
    SET_EXPR_LOCATION(ret, location.gcc_location());
@@ -9332 +10653 @@
    //   type F func() F
    // we have used ptr_type_node for the return type.  Add a cast here
-@@ -9274,24 +9920,6 @@
+@@ -9274,24 +9918,6 @@
    if (this->results_ != NULL)
      ret = this->set_results(context, ret);
@@ -9357 +10678 @@
  
    return ret;
-@@ -9774,13 +10402,20 @@
+@@ -9774,13 +10400,20 @@
  void
  Array_index_expression::do_check_types(Gogo*)
@@ -9380 +10701 @@
  
    Array_type* array_type = this->array_->type()->array_type();
-@@ -10845,6 +11480,28 @@
+@@ -10845,6 +11478,28 @@
    return Expression::traverse(&this->expr_, traverse);
  }
@@ -9409 +10730 @@
  
  Type*
-@@ -10905,18 +11562,188 @@
+@@ -10905,18 +11560,188 @@
      }
  }
@@ -9466 +10787 @@
 +
 +  Struct_field_list* sfl = new Struct_field_list();
-+  // The type here is wrong--it should be new_fntype.  But we don't
-+  // have new_fntype yet, and it doesn't really matter.
++  // The type here is wrong--it should be the C function type.  But it
++  // doesn't really matter.
 +  Type* vt = Type::make_pointer_type(Type::make_void_type());
 +  sfl->push_back(Struct_field(Typed_identifier("fn.0", vt, loc)));
@@ -9474 +10795 @@
 +  closure_type = Type::make_pointer_type(closure_type);
 +
-+  Function_type* new_fntype = orig_fntype->copy_with_closure(closure_type);
++  Function_type* new_fntype = orig_fntype->copy_with_names();
 +
 +  Named_object* new_no = gogo->start_function(Gogo::thunk_name(), new_fntype,
 +                                             false, loc);
 +
++  Variable* cvar = new Variable(closure_type, NULL, false, false, false, loc);
++  cvar->set_is_used();
++  Named_object* cp = Named_object::make_variable("$closure", NULL, cvar);
++  new_no->func_value()->set_closure_var(cp);
++
 +  gogo->start_block(loc);
-+
-+  Named_object* cp = gogo->lookup("closure.0", NULL);
-+  go_assert(cp != NULL
-+           && cp->is_variable()
-+           && cp->var_value()->is_parameter());
 +
 +  // Field 0 of the closure is the function code pointer, field 1 is
@@ -9504 +10825 @@
 +      args = new Expression_list();
 +      for (Typed_identifier_list::const_iterator p = new_params->begin();
-+          p + 1 != new_params->end();
++          p != new_params->end();
 +          ++p)
 +       {
@@ -9607 +10928 @@
  
  // Dump ast representation for an interface field reference.
-@@ -11114,8 +11941,10 @@
+@@ -11114,8 +11939,10 @@
    // as their first argument.  If this is for a pointer type, we can
    // simply reuse the existing function.  We use an internal hack to
@@ -9620 +10941 @@
        Named_object* mno = (method->needs_stub_method()
                            ? method->stub_object()
-@@ -11170,22 +11999,7 @@
+@@ -11170,22 +11997,7 @@
                                                 method_type->is_varargs(),
                                                 location);
@@ -9646 +10967 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/expressions.h gcc-4.8.1/gcc/go/gofrontend/expressions.h
 --- gcc-4.8.1.orig/gcc/go/gofrontend/expressions.h      2013-01-29 00:28:09.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/expressions.h   2013-09-13 19:01:43.123198407 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/expressions.h   2013-10-01 16:06:43.988554285 +0000
 @@ -16,6 +16,7 @@
  class Traverse;
@@ -9756 +11077 @@
   protected:
    int
-@@ -1532,11 +1556,68 @@
+@@ -1532,11 +1556,59 @@
    // The function itself.
    Named_object* function_;
@@ -9776 +11097 @@
 +  Func_descriptor_expression(Named_object* fn);
 +
-+  // Set the descriptor wrapper.
-+  void
-+  set_descriptor_wrapper(Named_object* dfn)
-+  {
-+    go_assert(this->dfn_ == NULL);
-+    this->dfn_ = dfn;
-+  }
-+
 +  // Make the function descriptor type, so that it can be converted.
 +  static void
@@ -9800 +11113 @@
 +
 +  Expression*
-+  do_copy();
++  do_copy()
++  { return Expression::make_func_descriptor(this->fn_); }
 +
 +  bool
@@ -9818 +11132 @@
 +  // The function for which this is the descriptor.
 +  Named_object* fn_;
-+  // The descriptor function.
-+  Named_object* dfn_;
 +  // The descriptor variable.
 +  Bvariable* dvar_;
@@ -9827 +11139 @@
  
  class Unknown_expression : public Parser_expression
-@@ -1773,10 +1854,10 @@
+@@ -1773,10 +1845,10 @@
  class Bound_method_expression : public Expression
  {
@@ -9841 +11153 @@
  
    // Return the object which is the first argument.
-@@ -1791,20 +1872,33 @@
+@@ -1791,20 +1863,33 @@
    first_argument_type() const
    { return this->expr_type_; }
@@ -9878 +11190 @@
    do_type();
  
-@@ -1818,7 +1912,7 @@
+@@ -1818,7 +1903,7 @@
    do_copy()
    {
@@ -9887 +11199 @@
  
    tree
-@@ -1828,6 +1922,11 @@
+@@ -1828,6 +1913,11 @@
    do_dump_expression(Ast_dump_context*) const;
  
@@ -9899 +11211 @@
    // as the first argument.
    Expression* expr_;
-@@ -1835,8 +1934,12 @@
+@@ -1835,8 +1925,12 @@
    // NULL in the normal case, non-NULL when using a method from an
    // anonymous field which does not require a stub.
@@ -9914 +11226 @@
  
  // A reference to a field in a struct.
-@@ -1847,7 +1950,7 @@
+@@ -1847,7 +1941,7 @@
    Field_reference_expression(Expression* expr, unsigned int field_index,
                              Location location)
@@ -9923 +11235 @@
  
    // Return the struct expression.
-@@ -1860,6 +1963,15 @@
+@@ -1860,6 +1954,15 @@
    field_index() const
    { return this->field_index_; }
@@ -9939 +11251 @@
    void
    set_struct_expression(Expression* expr)
-@@ -1914,6 +2026,9 @@
+@@ -1914,6 +2017,9 @@
    Expression* expr_;
    // The zero-based index of the field we are retrieving.
@@ -9949 +11261 @@
    bool called_fieldtrack_;
  };
-@@ -1940,6 +2055,11 @@
+@@ -1940,6 +2046,11 @@
    name() const
    { return this->name_; }
@@ -9961 +11273 @@
    // tree for the expression.
    tree
-@@ -1955,6 +2075,9 @@
+@@ -1955,6 +2066,9 @@
    int
    do_traverse(Traverse* traverse);
@@ -9971 +11283 @@
    do_type();
  
-@@ -1979,6 +2102,13 @@
+@@ -1979,6 +2093,13 @@
    do_dump_expression(Ast_dump_context*) const;
  
@@ -9987 +11299 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/go.cc gcc-4.8.1/gcc/go/gofrontend/go.cc
 --- gcc-4.8.1.orig/gcc/go/gofrontend/go.cc      2012-10-31 00:38:49.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/go.cc   2013-09-13 19:01:43.123198407 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/go.cc   2013-10-01 16:06:43.988554285 +0000
 @@ -44,7 +44,7 @@
  GO_EXTERN_C
@@ -10027 +11339 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/gogo-tree.cc gcc-4.8.1/gcc/go/gofrontend/gogo-tree.cc
 --- gcc-4.8.1.orig/gcc/go/gofrontend/gogo-tree.cc       2013-01-29 00:28:09.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/gogo-tree.cc    2013-09-13 19:01:43.126531731 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/gogo-tree.cc    2013-10-01 16:06:43.988554285 +0000
 @@ -755,6 +755,18 @@
    this->build_interface_method_tables();
@@ -10072 +11384 @@
        // have ideal or non-integral type.
        if (no->is_const())
-@@ -1255,14 +1278,47 @@
+@@ -986,6 +1009,16 @@
+       else
+        package_name = this->package_->package_name();
+ 
++      // Note that this will be misleading if this is an unexported
++      // method generated for an embedded imported type.  In that case
++      // the unexported method should have the package name of the
++      // package from which it is imported, but we are going to give
++      // it our package name.  Fixing this would require knowing the
++      // package name, but we only know the package path.  It might be
++      // better to use package paths here anyhow.  This doesn't affect
++      // the assembler code, because we always set that name in
++      // Function::get_or_make_decl anyhow.  FIXME.
++
+       decl_name = package_name + '.' + Gogo::unpack_hidden_name(this->name_);
+ 
+       Function_type* fntype;
+@@ -1028,6 +1061,12 @@
+   if (this->tree_ != NULL_TREE)
+     return this->tree_;
+ 
++  if (Gogo::is_erroneous_name(this->name_))
++    {
++      this->tree_ = error_mark_node;
++      return error_mark_node;
++    }
++
+   tree name;
+   if (this->classification_ == NAMED_OBJECT_TYPE)
+     name = NULL_TREE;
+@@ -1255,14 +1294,23 @@
    if (this->fndecl_ == NULL_TREE)
      {
@@ -10087 +11429 @@
 +         go_assert(FUNCTION_POINTER_TYPE_P(functype));
 +         functype = TREE_TYPE(functype);
-+
-+         // In the struct, the function type always has a trailing
-+         // closure argument.  For the function body, we only use
-+         // that trailing arg if this is a function literal or if it
-+         // is a wrapper created to store in a descriptor.  Remove it
-+         // in that case.
-+         if (this->enclosing_ == NULL && !this->is_descriptor_wrapper_)
-+           {
-+             tree old_params = TYPE_ARG_TYPES(functype);
-+             go_assert(old_params != NULL_TREE
-+                       && old_params != void_list_node);
-+             tree new_params = NULL_TREE;
-+             tree *pp = &new_params;
-+             while (TREE_CHAIN (old_params) != void_list_node)
-+               {
-+                 tree p = TREE_VALUE(old_params);
-+                 go_assert(TYPE_P(p));
-+                 *pp = tree_cons(NULL_TREE, p, NULL_TREE);
-+                 pp = &TREE_CHAIN(*pp);
-+                 old_params = TREE_CHAIN (old_params);
-+               }
-+             *pp = void_list_node;
-+             functype = build_function_type(TREE_TYPE(functype), new_params);
-+           }
 +       }
 +
@@ -10124 +11442 @@
                                   id, functype);
  
-@@ -1308,9 +1364,6 @@
+@@ -1285,7 +1333,21 @@
+                   || this->type_->is_method())
+            {
+              TREE_PUBLIC(decl) = 1;
+-             std::string asm_name = gogo->pkgpath_symbol();
++             std::string pkgpath = gogo->pkgpath_symbol();
++             if (this->type_->is_method()
++                 && Gogo::is_hidden_name(no->name())
++                 && Gogo::hidden_name_pkgpath(no->name()) != gogo->pkgpath())
++               {
++                 // This is a method we created for an unexported
++                 // method of an imported embedded type.  We need to
++                 // use the pkgpath of the imported package to avoid
++                 // a possible name collision.  See bug478 for a test
++                 // case.
++                 pkgpath = Gogo::hidden_name_pkgpath(no->name());
++                 pkgpath = Gogo::pkgpath_for_symbol(pkgpath);
++               }
++
++             std::string asm_name = pkgpath;
+              asm_name.append(1, '.');
+              asm_name.append(Gogo::unpack_hidden_name(no->name()));
+              if (this->type_->is_method())
+@@ -1308,9 +1370,6 @@
           DECL_CONTEXT(resdecl) = decl;
           DECL_RESULT(decl) = resdecl;
@@ -10134 +11475 @@
           // can't inline it, because recover behaves differently in a
           // function passed directly to defer.  If this is a recover
-@@ -1333,29 +1386,6 @@
+@@ -1333,29 +1392,6 @@
             resolve_unique_section (decl, 0, 1);
  
@@ -10164 +11505 @@
      }
    return this->fndecl_;
-@@ -1382,15 +1412,44 @@
+@@ -1382,15 +1418,24 @@
         }
  
@@ -10179 +11520 @@
 +         go_assert(FUNCTION_POINTER_TYPE_P(functype));
 +         functype = TREE_TYPE(functype);
-+
-+         // In the struct, the function type always has a trailing
-+         // closure argument.  Here we are referring to the function
-+         // code directly, and we know it is not a function literal,
-+         // and we know it is not a wrapper created to store in a
-+         // descriptor.  Remove that trailing argument.
-+         tree old_params = TYPE_ARG_TYPES(functype);
-+         go_assert(old_params != NULL_TREE && old_params != void_list_node);
-+         tree new_params = NULL_TREE;
-+         tree *pp = &new_params;
-+         while (TREE_CHAIN (old_params) != void_list_node)
-+           {
-+             tree p = TREE_VALUE(old_params);
-+             go_assert(TYPE_P(p));
-+             *pp = tree_cons(NULL_TREE, p, NULL_TREE);
-+             pp = &TREE_CHAIN(*pp);
-+             old_params = TREE_CHAIN (old_params);
-+           }
-+         *pp = void_list_node;
-+         functype = build_function_type(TREE_TYPE(functype), new_params);
 +       }
 +
@@ -10213 +11534 @@
                              functype);
           TREE_PUBLIC(decl) = 1;
-@@ -1599,6 +1658,32 @@
+@@ -1599,10 +1644,41 @@
             }
         }
      }
 +
-+  // The closure variable is passed last, if this is a function
-+  // literal or a descriptor wrapper.
+   *pp = NULL_TREE;
+ 
+   DECL_ARGUMENTS(fndecl) = params;
+ 
++  // If we need a closure variable, fetch it by calling a runtime
++  // function.  The caller will have called __go_set_closure before
++  // the function call.
 +  if (this->closure_var_ != NULL)
 +    {
@@ -10227 +11553 @@
 +      if (var_decl != error_mark_node)
 +       {
-+         go_assert(TREE_CODE(var_decl) == PARM_DECL);
-+         *pp = var_decl;
-+         pp = &DECL_CHAIN(*pp);
++         go_assert(TREE_CODE(var_decl) == VAR_DECL);
++         static tree get_closure_fndecl;
++         tree get_closure = Gogo::call_builtin(&get_closure_fndecl,
++                                               this->location_,
++                                               "__go_get_closure",
++                                               0,
++                                               ptr_type_node);
++
++         // Mark the __go_get_closure function as pure, since it
++         // depends only on the global variable g.
++         DECL_PURE_P(get_closure_fndecl) = 1;
++
++         get_closure = fold_convert_loc(this->location_.gcc_location(),
++                                        TREE_TYPE(var_decl), get_closure);
++         DECL_INITIAL(var_decl) = get_closure;
++         DECL_CHAIN(var_decl) = declare_vars;
++         declare_vars = var_decl;
 +       }
 +    }
-+  else if (this->enclosing_ != NULL || this->is_descriptor_wrapper_)
-+    {
-+      tree parm_decl = build_decl(this->location_.gcc_location(), PARM_DECL,
-+                                 get_identifier("$closure"),
-+                                 const_ptr_type_node);
-+      DECL_CONTEXT(parm_decl) = current_function_decl;
-+      DECL_ARG_TYPE(parm_decl) = const_ptr_type_node;
-+      *pp = parm_decl;
-+      pp = &DECL_CHAIN(*pp);
-+    }
-+
-   *pp = NULL_TREE;
- 
-   DECL_ARGUMENTS(fndecl) = params;
-@@ -1681,6 +1766,13 @@
++
+   if (this->block_ != NULL)
+     {
+       go_assert(DECL_INITIAL(fndecl) == NULL_TREE);
+@@ -1681,6 +1757,13 @@
  
        DECL_SAVED_TREE(fndecl) = code;
@@ -10260 +11590 @@
  
  // Build the wrappers around function code needed if the function has
-@@ -1844,6 +1936,20 @@
+@@ -1844,6 +1927,20 @@
      }
  }
@@ -10281 +11611 @@
  
  GO_EXTERN_C
-@@ -2437,70 +2543,3 @@
+@@ -2437,70 +2534,3 @@
                     build2(COMPOUND_EXPR, type_tree, call, tmp));
      }
@@ -10354 +11684 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/gogo.cc gcc-4.8.1/gcc/go/gofrontend/gogo.cc
 --- gcc-4.8.1.orig/gcc/go/gofrontend/gogo.cc    2013-02-10 06:02:38.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/gogo.cc 2013-09-13 19:01:43.126531731 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/gogo.cc 2013-10-01 16:06:43.988554285 +0000
 @@ -364,7 +364,7 @@
        // Declare "main" as a function which takes no parameters and
@@ -10374 +11704 @@
    else if (!type->is_method())
      {
-@@ -1277,6 +1278,14 @@
+@@ -1191,6 +1192,27 @@
+   this->interface_types_.push_back(itype);
+ }
+ 
++// Return an erroneous name that indicates that an error has already
++// been reported.
++
++std::string
++Gogo::erroneous_name()
++{
++  static int erroneous_count;
++  char name[50];
++  snprintf(name, sizeof name, "$erroneous%d", erroneous_count);
++  ++erroneous_count;
++  return name;
++}
++
++// Return whether a name is an erroneous name.
++
++bool
++Gogo::is_erroneous_name(const std::string& name)
++{
++  return name.compare(0, 10, "$erroneous") == 0;
++}
++
+ // Return a name for a thunk object.
+ 
+ std::string
+@@ -1277,6 +1299,14 @@
                    n.c_str());
           inform(pf->second, "%qs imported here", n.c_str());
@@ -10389 +11747 @@
  }
  
-@@ -1599,8 +1608,9 @@
+@@ -1599,8 +1629,9 @@
    return TRAVERSE_CONTINUE;
  }
@@ -10401 +11759 @@
  int
  Lower_parse_tree::function(Named_object* no)
-@@ -1732,6 +1742,146 @@
+@@ -1732,6 +1763,146 @@
    lower.constant(no, false);
  }
@@ -10433 +11791 @@
 +      && no->func_value()->enclosing() == NULL
 +      && !no->func_value()->is_method()
-+      && !no->func_value()->is_descriptor_wrapper()
-+      && !Gogo::is_hidden_name(no->name()))
++      && !Gogo::is_hidden_name(no->name())
++      && !Gogo::is_thunk(no))
 +    no->func_value()->descriptor(this->gogo_, no);
 +
@@ -10548 +11906 @@
  // interfaces.
  
-@@ -2643,6 +2793,13 @@
+@@ -2217,7 +2388,7 @@
+   Block* retblock = new Block(enclosing, loc);
+   retblock->set_end_location(loc);
+ 
+-  Temporary_statement* ts = Statement::make_temporary(Type::lookup_bool_type(),
++  Temporary_statement* ts = Statement::make_temporary(shortcut->type(),
+                                                      left, loc);
+   retblock->add_statement(ts);
+ 
+@@ -2391,13 +2562,38 @@
+     return TRAVERSE_CONTINUE;
+ 
+   // If there is only one expression with a side-effect, we can
+-  // usually leave it in place.  However, for an assignment statement,
+-  // we need to evaluate an expression on the right hand side before
+-  // we evaluate any index expression on the left hand side, so for
+-  // that case we always move the expression.  Otherwise we mishandle
+-  // m[0] = len(m) where m is a map.
+-  if (c == 1 && s->classification() != Statement::STATEMENT_ASSIGNMENT)
+-    return TRAVERSE_CONTINUE;
++  // usually leave it in place.
++  if (c == 1)
++    {
++      switch (s->classification())
++       {
++       case Statement::STATEMENT_ASSIGNMENT:
++         // For an assignment statement, we need to evaluate an
++         // expression on the right hand side before we evaluate any
++         // index expression on the left hand side, so for that case
++         // we always move the expression.  Otherwise we mishandle
++         // m[0] = len(m) where m is a map.
++         break;
++
++       case Statement::STATEMENT_EXPRESSION:
++         {
++           // If this is a call statement that doesn't return any
++           // values, it will not have been counted as a value to
++           // move.  We need to move any subexpressions in case they
++           // are themselves call statements that require passing a
++           // closure.
++           Expression* expr = s->expression_statement()->expr();
++           if (expr->call_expression() != NULL
++               && expr->call_expression()->result_count() == 0)
++             break;
++           return TRAVERSE_CONTINUE;
++         }
++
++       default:
++         // We can leave the expression in place.
++         return TRAVERSE_CONTINUE;
++       }
++    }
+ 
+   bool is_thunk = s->thunk_statement() != NULL;
+   for (Find_eval_ordering::const_iterator p = find_eval_ordering.begin();
+@@ -2643,10 +2839,17 @@
    Expression* closure = NULL;
    if (orig_func->needs_closure())
@@ -10562 +11975 @@
        Variable* orig_closure_var = orig_closure_no->var_value();
        Variable* new_var = new Variable(orig_closure_var->type(), NULL, false,
-@@ -2682,22 +2839,7 @@
+-                                      true, false, location);
++                                      false, false, location);
+       snprintf(buf, sizeof buf, "closure.%u", count);
+       ++count;
+       Named_object* new_closure_no = Named_object::make_variable(buf, NULL,
+@@ -2682,22 +2885,7 @@
    // Any varargs call has already been lowered.
    call->set_varargs_are_lowered();
@@ -10586 +12004 @@
    gogo->add_statement(s);
  
-@@ -2991,7 +3133,8 @@
+@@ -2991,7 +3179,8 @@
      return TRAVERSE_CONTINUE;
  
@@ -10596 +12014 @@
    return TRAVERSE_CONTINUE;
  }
-@@ -3101,6 +3244,7 @@
+@@ -3101,6 +3290,7 @@
    Map_type::make_map_descriptor_type();
    Channel_type::make_chan_type_descriptor_type();
@@ -10604 +12022 @@
  
    Runtime::convert_types(this);
-@@ -3128,10 +3272,10 @@
+@@ -3128,9 +3318,9 @@
                    Location location)
    : type_(type), enclosing_(enclosing), results_(NULL),
@@ -10611 +12029 @@
 -    results_are_named_(false), nointerface_(false), calls_recover_(false),
 -    is_recover_thunk_(false), has_recover_thunk_(false),
--    in_unique_section_(false)
 +    local_type_count_(0), descriptor_(NULL), fndecl_(NULL), defer_stack_(NULL),
 +    is_sink_(false), results_are_named_(false), nointerface_(false),
 +    calls_recover_(false), is_recover_thunk_(false), has_recover_thunk_(false),
-+    in_unique_section_(false), is_descriptor_wrapper_(false)
+     in_unique_section_(false)
  {
  }
- 
-@@ -3206,6 +3350,7 @@
+@@ -3206,15 +3396,16 @@
  {
    if (this->closure_var_ == NULL)
@@ -10627 +12043 @@
        // we find them.
        Location loc = this->type_->location();
-@@ -3229,7 +3374,14 @@
+       Struct_field_list* sfl = new Struct_field_list;
+       Type* struct_type = Type::make_struct_type(sfl, loc);
+       Variable* var = new Variable(Type::make_pointer_type(struct_type),
+-                                  NULL, false, true, false, loc);
++                                  NULL, false, false, false, loc);
+       var->set_is_used();
+-      this->closure_var_ = Named_object::make_variable("closure", NULL, var);
++      this->closure_var_ = Named_object::make_variable("$closure", NULL, var);
+       // Note that the new variable is not in any binding contour.
+     }
+   return this->closure_var_;
+@@ -3229,7 +3420,14 @@
      return;
    Named_object* closure = this->closure_var_;
@@ -10643 +12070 @@
         p != this->closure_fields_.end();
         ++p, ++index)
-@@ -3410,6 +3562,102 @@
+@@ -3410,6 +3608,19 @@
      this->block_->determine_types();
  }
  
-+// Build a wrapper function for a function descriptor.  A function
-+// descriptor refers to a function that takes a closure as its last
-+// argument.  In this case there will be no closure, but an indirect
-+// call will pass nil as the last argument.  We need to build a
-+// wrapper function that accepts and discards that last argument, so
-+// that cases like -mrtd will work correctly.  In most cases the
-+// wrapper function will simply be a jump.
-+
-+Named_object*
-+Function::make_descriptor_wrapper(Gogo* gogo, Named_object* no,
-+                                 Function_type* orig_fntype)
-+{
-+  Location loc = no->location();
-+
-+  Type* vt = Type::make_pointer_type(Type::make_void_type());
-+  Function_type* new_fntype = orig_fntype->copy_with_closure(vt);
-+
-+  std::string name = no->name() + "$descriptorfn";
-+  Named_object* dno = gogo->start_function(name, new_fntype, false, loc);
-+  dno->func_value()->is_descriptor_wrapper_ = true;
-+
-+  // Put the wrapper in a unique section so that it can be discarded
-+  // by the linker if it is not needed.  Every top-level function will
-+  // get a wrapper, in case there is a reference other than a call
-+  // from some other package, but most will not need one.
-+  dno->func_value()->set_in_unique_section();
-+
-+  gogo->start_block(loc);
-+
-+  Expression* fn = Expression::make_func_reference(no, NULL, loc);
-+
-+  // Call the function begin wrapped, passing all of the arguments
-+  // except for the last one (the last argument is the ignored
-+  // closure).
-+  const Typed_identifier_list* orig_params = orig_fntype->parameters();
-+  Expression_list* args;
-+  if (orig_params == NULL || orig_params->empty())
-+    args = NULL;
-+  else
-+    {
-+      const Typed_identifier_list* new_params = new_fntype->parameters();
-+      args = new Expression_list();
-+      for (Typed_identifier_list::const_iterator p = new_params->begin();
-+          p + 1 != new_params->end();
-+          ++p)
-+       {
-+         Named_object* p_no = gogo->lookup(p->name(), NULL);
-+         go_assert(p_no != NULL
-+                   && p_no->is_variable()
-+                   && p_no->var_value()->is_parameter());
-+         args->push_back(Expression::make_var_reference(p_no, loc));
-+       }
-+    }
-+
-+  Call_expression* call = Expression::make_call(fn, args,
-+                                               orig_fntype->is_varargs(),
-+                                               loc);
-+  call->set_varargs_are_lowered();
-+
-+  Statement* s = Statement::make_return_from_call(call, loc);
-+  gogo->add_statement(s);
-+  Block* b = gogo->finish_block(loc);
-+  gogo->add_block(b, loc);
-+  gogo->lower_block(dno, b);
-+  gogo->finish_function(loc);
-+
-+  return dno;
-+}
-+
 +// Return the function descriptor, the value you get when you refer to
 +// the function in Go code without calling it.
 +
 +Expression*
-+Function::descriptor(Gogo* gogo, Named_object* no)
++Function::descriptor(Gogo*, Named_object* no)
 +{
 +  go_assert(!this->is_method());
 +  go_assert(this->closure_var_ == NULL);
-+  go_assert(!this->is_descriptor_wrapper_);
 +  if (this->descriptor_ == NULL)
-+    {
-+      // Make and record the descriptor first, so that when we lower
-+      // the descriptor wrapper we don't try to make it again.
-+      Func_descriptor_expression* descriptor =
-+       Expression::make_func_descriptor(no);
-+      this->descriptor_ = descriptor;
-+      if (no->package() == NULL
-+         && !Linemap::is_predeclared_location(no->location()))
-+       {
-+         Named_object* dno = Function::make_descriptor_wrapper(gogo, no,
-+                                                               this->type_);
-+         descriptor->set_descriptor_wrapper(dno);
-+       }
-+    }
++    this->descriptor_ = Expression::make_func_descriptor(no);
 +  return this->descriptor_;
 +}
@@ -10746 +12090 @@
  // function, making it if necessary.  The value of the variable is set
  // by the runtime routines to true if the function is returning,
-@@ -3940,6 +4188,32 @@
+@@ -3940,6 +4151,19 @@
      }
  }
@@ -10755 +12099 @@
 +
 +Expression*
-+Function_declaration::descriptor(Gogo* gogo, Named_object* no)
++Function_declaration::descriptor(Gogo*, Named_object* no)
 +{
 +  go_assert(!this->fntype_->is_method());
 +  if (this->descriptor_ == NULL)
-+    {
-+      // Make and record the descriptor first, so that when we lower
-+      // the descriptor wrapper we don't try to make it again.
-+      Func_descriptor_expression* descriptor =
-+       Expression::make_func_descriptor(no);
-+      this->descriptor_ = descriptor;
-+      if (no->package() == NULL
-+         && !Linemap::is_predeclared_location(no->location()))
-+       {
-+         Named_object* dno = Function::make_descriptor_wrapper(gogo, no,
-+                                                               this->fntype_);
-+         descriptor->set_descriptor_wrapper(dno);
-+       }
-+    }
++    this->descriptor_ = Expression::make_func_descriptor(no);
 +  return this->descriptor_;
 +}
@@ -10779 +12110 @@
  
  Variable::Variable(Type* type, Expression* init, bool is_global,
-@@ -4755,6 +5029,12 @@
+@@ -4755,6 +4979,12 @@
  Named_object::set_function_value(Function* function)
  {
@@ -10794 +12125 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/gogo.h gcc-4.8.1/gcc/go/gofrontend/gogo.h
 --- gcc-4.8.1.orig/gcc/go/gofrontend/gogo.h     2012-12-21 22:23:23.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/gogo.h  2013-09-13 19:01:43.126531731 +0000
-@@ -476,6 +476,10 @@
++++ gcc-4.8.1/gcc/go/gofrontend/gogo.h  2013-10-01 16:06:43.988554285 +0000
+@@ -387,6 +387,16 @@
+   void
+   mark_locals_used();
+ 
++  // Return a name to use for an error case.  This should only be used
++  // after reporting an error, and is used to avoid useless knockon
++  // errors.
++  static std::string
++  erroneous_name();
++
++  // Return whether the name indicates an error.
++  static bool
++  is_erroneous_name(const std::string&);
++
+   // Return a name to use for a thunk function.  A thunk function is
+   // one we create during the compilation, for a go statement or a
+   // defer statement or a method expression.
+@@ -476,6 +486,10 @@
    void
    lower_constant(Named_object*);
@@ -10806 +12154 @@
    void
    finalize_methods();
-@@ -614,10 +618,6 @@
+@@ -614,10 +628,6 @@
    receive_from_channel(tree type_tree, tree type_descriptor_tree, tree channel,
                        Location);
@@ -10817 +12165 @@
    // During parsing, we keep a stack of functions.  Each function on
    // the stack is one that we are currently parsing.  For each
-@@ -669,10 +669,6 @@
+@@ -669,10 +679,6 @@
    tree
    ptr_go_string_constant_tree(const std::string&);
@@ -10828 +12176 @@
    typedef std::map<std::string, Package*> Imports;
  
-@@ -915,6 +911,14 @@
+@@ -915,6 +921,14 @@
    result_variables()
    { return this->results_; }
@@ -10843 +12191 @@
    bool
    results_are_named() const
-@@ -1046,6 +1050,12 @@
-   set_in_unique_section()
-   { this->in_unique_section_ = true; }
- 
-+  // Whether this function was created as a descriptor wrapper for
-+  // another function.
-+  bool
-+  is_descriptor_wrapper() const
-+  { return this->is_descriptor_wrapper_; }
-+
-   // Swap with another function.  Used only for the thunk which calls
-   // recover.
-   void
-@@ -1059,6 +1069,26 @@
+@@ -1059,6 +1073,22 @@
    void
    determine_types();
@@ -10876 +12211 @@
 +  }
 +
-+  // Build a descriptor wrapper function.
-+  static Named_object*
-+  make_descriptor_wrapper(Gogo*, Named_object*, Function_type*);
-+
    // Return the function's decl given an identifier.
    tree
    get_or_make_decl(Gogo*, Named_object*, tree id);
-@@ -1137,25 +1167,32 @@
+@@ -1137,22 +1167,26 @@
    Labels labels_;
    // The number of local types defined in this function.
@@ -10915 +12246 @@
    // turned on for field tracking.
    bool in_unique_section_ : 1;
-+  // True if this is a function wrapper created to put in a function
-+  // descriptor.
-+  bool is_descriptor_wrapper_ : 1;
- };
- 
- // A snapshot of the current binding state.
-@@ -1198,7 +1235,8 @@
+@@ -1198,7 +1232,8 @@
  {
   public:
@@ -10931 +12256 @@
  
    Function_type*
-@@ -1218,10 +1256,27 @@
+@@ -1218,10 +1253,27 @@
    set_asm_name(const std::string& asm_name)
    { this->asm_name_ = asm_name; }
@@ -10959 +12284 @@
    void
    export_func(Export* exp, const std::string& name) const
-@@ -1235,6 +1290,8 @@
+@@ -1235,6 +1287,8 @@
    // The assembler name: this is the name to use in references to the
    // function.  This is normally empty.
@@ -10968 +12293 @@
    tree fndecl_;
  };
-@@ -1630,7 +1687,7 @@
+@@ -1630,7 +1684,7 @@
    Named_constant(Type* type, Expression* expr, int iota_value,
                  Location location)
@@ -10977 +12302 @@
  
    Type*
-@@ -1664,6 +1721,14 @@
+@@ -1664,6 +1718,14 @@
    clear_lowering()
    { this->lowering_ = false; }
@@ -10992 +12317 @@
    int
    traverse_expression(Traverse*);
-@@ -1699,6 +1764,8 @@
+@@ -1699,6 +1761,8 @@
    Location location_;
    // Whether we are currently lowering this constant.
@@ -11003 +12328 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/parse.cc gcc-4.8.1/gcc/go/gofrontend/parse.cc
 --- gcc-4.8.1.orig/gcc/go/gofrontend/parse.cc   2012-12-13 22:20:23.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/parse.cc        2013-09-13 19:01:43.129865056 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/parse.cc        2013-10-01 16:06:43.992554285 +0000
+@@ -213,7 +213,7 @@
+   if (name == "_")
+     {
+       error_at(this->location(), "invalid use of %<_%>");
+-      name = "blank";
++      name = Gogo::erroneous_name();
+     }
+ 
+   if (package->name() == this->gogo_->package_name())
 @@ -1457,6 +1457,16 @@
  
@@ -11021 +12355 @@
    if (pe != expr_list->end())
      error_at(this->location(), "too many initializers");
-@@ -2627,7 +2637,11 @@
+@@ -1930,12 +1940,9 @@
+        {
+          if (this->gogo_->in_global_scope())
+            return this->create_dummy_global(type, init, location);
+-         else if (type == NULL)
+-           this->gogo_->add_statement(Statement::make_statement(init, true));
+          else
+            {
+-             // With both a type and an initializer, create a dummy
+-             // variable so that we will check whether the
++             // Create a dummy variable so that we will check whether the
+              // initializer can be assigned to the type.
+              Variable* var = new Variable(type, init, false, false, false,
+                                           location);
+@@ -2627,7 +2634,11 @@
    Named_object* this_function = this->gogo_->current_function();
    Named_object* closure = this_function->func_value()->closure_var();
@@ -11034 +12382 @@
      this->enclosing_vars_.insert(ev);
    if (ins.second)
-@@ -2882,8 +2896,9 @@
+@@ -2882,8 +2893,9 @@
  // Create a closure for the nested function FUNCTION.  This is based
  // on ENCLOSING_VARS, which is a list of all variables defined in
@@ -11046 +12394 @@
  Expression*
  Parse::create_closure(Named_object* function, Enclosing_vars* enclosing_vars,
-@@ -2899,16 +2914,25 @@
+@@ -2899,16 +2911,25 @@
    for (Enclosing_vars::const_iterator p = enclosing_vars->begin();
         p != enclosing_vars->end();
@@ -11074 +12422 @@
        Expression* ref;
        if (ev[i].in_function() == enclosing_function)
-@@ -3016,7 +3040,7 @@
+@@ -3016,7 +3037,7 @@
                   && t->array_type()->length()->is_nil_expression())
                 {
@@ -11083 +12431 @@
                 }
               else
-@@ -4499,9 +4523,12 @@
+@@ -3083,7 +3104,7 @@
+       if (token->identifier() == "_")
+        {
+          error_at(this->location(), "invalid use of %<_%>");
+-         name = this->gogo_->pack_hidden_name("blank", false);
++         name = Gogo::erroneous_name();
+        }
+       this->advance_token();
+       return Expression::make_selector(left, name, location);
+@@ -4499,9 +4520,12 @@
    bool is_fallthrough = false;
    if (this->peek_token()->is_keyword(KEYWORD_FALLTHROUGH))
@@ -11096 +12453 @@
  
    if (is_default)
-@@ -5239,7 +5266,8 @@
+@@ -4905,7 +4929,7 @@
+            {
+              error_at(recv_var_loc,
+                       "no new variables on left side of %<:=%>");
+-             recv_var = "blank";
++             recv_var = Gogo::erroneous_name();
+            }
+          *is_send = false;
+          *varname = gogo->pack_hidden_name(recv_var, is_rv_exported);
+@@ -4941,7 +4965,7 @@
+                    {
+                      error_at(recv_var_loc,
+                               "no new variables on left side of %<:=%>");
+-                     recv_var = "blank";
++                     recv_var = Gogo::erroneous_name();
+                    }
+                  *is_send = false;
+                  if (recv_var != "_")
+@@ -5239,7 +5263,8 @@
         no->var_value()->set_type_from_range_value();
        if (is_new)
@@ -11106 +12481 @@
  
    if (!any_new)
+@@ -5477,7 +5502,7 @@
+          if (name == "_")
+            {
+              error_at(this->location(), "invalid package name _");
+-             name = "blank";
++             name = Gogo::erroneous_name();
+            }
+          this->advance_token();
+        }
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/runtime.def gcc-4.8.1/gcc/go/gofrontend/runtime.def
 --- gcc-4.8.1.orig/gcc/go/gofrontend/runtime.def        2012-11-29 18:11:17.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/runtime.def     2013-09-13 19:01:43.129865056 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/runtime.def     2013-10-01 16:06:43.992554285 +0000
 @@ -224,11 +224,6 @@
  DEF_GO_RUNTIME(NEW_NOPOINTERS, "__go_new_nopointers", P1(UINTPTR), R1(POINTER))
@@ -11123 +12507 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/statements.cc gcc-4.8.1/gcc/go/gofrontend/statements.cc
 --- gcc-4.8.1.orig/gcc/go/gofrontend/statements.cc      2012-12-21 15:59:27.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/statements.cc   2013-09-13 19:01:43.133198380 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/statements.cc   2013-10-01 16:06:43.992554285 +0000
 @@ -569,7 +569,10 @@
  Assignment_statement::do_determine_types()
@@ -11136 +12520 @@
  }
  
-@@ -1707,8 +1710,8 @@
+@@ -591,6 +594,15 @@
+ 
+   Type* lhs_type = this->lhs_->type();
+   Type* rhs_type = this->rhs_->type();
++
++  // Invalid assignment of nil to the blank identifier.
++  if (lhs_type->is_sink_type()
++      && rhs_type->is_nil_type())
++    {
++      this->report_error(_("use of untyped nil"));
++      return;
++    }
++
+   std::string reason;
+   bool ok;
+   if (this->are_hidden_fields_ok_)
+@@ -972,7 +984,10 @@
+ 
+       if ((*plhs)->is_sink_expression())
+        {
+-         b->add_statement(Statement::make_statement(*prhs, true));
++          if ((*prhs)->type()->is_nil_type())
++            this->report_error(_("use of untyped nil"));
++          else
++            b->add_statement(Statement::make_statement(*prhs, true));
+          continue;
+        }
+ 
+@@ -1655,46 +1670,23 @@
+                                                   location);
+ }
+ 
+-// An expression statement.
+-
+-class Expression_statement : public Statement
+-{
+- public:
+-  Expression_statement(Expression* expr, bool is_ignored)
+-    : Statement(STATEMENT_EXPRESSION, expr->location()),
+-      expr_(expr), is_ignored_(is_ignored)
+-  { }
+-
+-  Expression*
+-  expr()
+-  { return this->expr_; }
+-
+- protected:
+-  int
+-  do_traverse(Traverse* traverse)
+-  { return this->traverse_expression(traverse, &this->expr_); }
+-
+-  void
+-  do_determine_types()
+-  { this->expr_->determine_type_no_context(); }
+-
+-  void
+-  do_check_types(Gogo*);
++// Class Expression_statement.
+ 
+-  bool
+-  do_may_fall_through() const;
++// Constructor.
+ 
+-  Bstatement*
+-  do_get_backend(Translate_context* context);
++Expression_statement::Expression_statement(Expression* expr, bool is_ignored)
++  : Statement(STATEMENT_EXPRESSION, expr->location()),
++    expr_(expr), is_ignored_(is_ignored)
++{
++}
+ 
+-  void
+-  do_dump_statement(Ast_dump_context*) const;
++// Determine types.
+ 
+- private:
+-  Expression* expr_;
+-  // Whether the value of this expression is being explicitly ignored.
+-  bool is_ignored_;
+-};
++void
++Expression_statement::do_determine_types()
++{
++  this->expr_->determine_type_no_context();
++}
+ 
+ // Check the types of an expression statement.  The only check we do
+ // is to possibly give an error about discarding the value of the
+@@ -1707,8 +1699,8 @@
      this->expr_->discarding_value();
  }
@@ -11147 +12619 @@
  bool
  Expression_statement::do_may_fall_through() const
-@@ -1717,22 +1720,28 @@
+@@ -1717,22 +1709,28 @@
    if (call != NULL)
      {
@@ -11158 +12630 @@
         {
 -         const Named_object* no = fe->named_object();
-+         Named_object* no = ue->named_object();
- 
+-
 -         Function_type* fntype;
 -         if (no->is_function())
@@ -11167 +12638 @@
 -         else
 -           fntype = NULL;
--
++         Named_object* no = ue->named_object();
+ 
 -         // The builtin function panic does not return.
 -         if (fntype != NULL && fntype->is_builtin() && no->name() == "panic")
@@ -11190 +12662 @@
      }
    return true;
-@@ -1953,10 +1962,15 @@
+@@ -1953,10 +1951,15 @@
               && results->begin()->type()->points_to() == NULL)))
      return false;
@@ -11208 +12680 @@
  
    return true;
-@@ -2496,7 +2510,11 @@
+@@ -2496,7 +2499,11 @@
  
    Call_expression* ce = this->call_->call_expression();
@@ -11221 +12693 @@
    const Expression_list* args = ce->args();
    if (args == NULL || args->empty())
-@@ -2800,6 +2818,28 @@
+@@ -2800,6 +2807,28 @@
    return new Return_statement(vals, location);
  }
@@ -11250 +12722 @@
  
  class Bc_statement : public Statement
-@@ -3700,9 +3740,6 @@
+@@ -3700,9 +3729,6 @@
    void
    do_check_types(Gogo*);
@@ -11260 +12732 @@
    do_get_backend(Translate_context*);
  
-@@ -3746,22 +3783,6 @@
+@@ -3746,22 +3772,6 @@
      this->set_is_error();
  }
@@ -11283 +12755 @@
  
  Bstatement*
-@@ -3911,6 +3932,22 @@
+@@ -3911,6 +3921,22 @@
    ast_dump_context->ostream() << std::endl;
  }
@@ -11306 +12778 @@
  
  Switch_statement*
-@@ -4050,6 +4087,27 @@
+@@ -4050,6 +4076,27 @@
      }
  }
@@ -11334 +12806 @@
  
  void
-@@ -4148,6 +4206,25 @@
+@@ -4148,6 +4195,25 @@
                         NULL);
  }
@@ -11360 +12832 @@
  
  void
-@@ -4237,6 +4314,22 @@
+@@ -4237,6 +4303,22 @@
    return Statement::make_block_statement(b, loc);
  }
@@ -11383 +12855 @@
  // if necessary.
  
-@@ -4954,6 +5047,19 @@
+@@ -4954,6 +5036,19 @@
    return Statement::make_block_statement(b, loc);
  }
@@ -11403 +12875 @@
  
  Bstatement*
-@@ -5114,6 +5220,20 @@
+@@ -5114,6 +5209,20 @@
    this->continue_label_ = continue_label;
  }
@@ -11426 +12898 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/statements.h gcc-4.8.1/gcc/go/gofrontend/statements.h
 --- gcc-4.8.1.orig/gcc/go/gofrontend/statements.h       2013-01-29 00:28:09.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/statements.h    2013-09-13 19:01:43.133198380 +0000
-@@ -207,6 +207,13 @@
++++ gcc-4.8.1/gcc/go/gofrontend/statements.h    2013-10-01 16:06:43.992554285 +0000
+@@ -17,6 +17,7 @@
+ class Unnamed_label;
+ class Temporary_statement;
+ class Variable_declaration_statement;
++class Expression_statement;
+ class Return_statement;
+ class Thunk_statement;
+ class Label_statement;
+@@ -207,6 +208,13 @@
    static Return_statement*
    make_return_statement(Expression_list*, Location);
@@ -11441 +12921 @@
    static Statement*
    make_break_statement(Unnamed_label* label, Location);
-@@ -894,8 +901,7 @@
+@@ -322,6 +330,14 @@
+                         STATEMENT_VARIABLE_DECLARATION>();
+   }
+ 
++  // If this is an expression statement, return it.  Otherwise return
++  // NULL.
++  Expression_statement*
++  expression_statement()
++  {
++    return this->convert<Expression_statement, STATEMENT_EXPRESSION>();
++  }
++
+   // If this is a return statement, return it.  Otherwise return NULL.
+   Return_statement*
+   return_statement()
+@@ -629,6 +645,43 @@
+   bool is_lowered_;
+ };
+ 
++// An expression statement.
++
++class Expression_statement : public Statement
++{
++ public:
++  Expression_statement(Expression* expr, bool is_ignored);
++
++  Expression*
++  expr()
++  { return this->expr_; }
++
++ protected:
++  int
++  do_traverse(Traverse* traverse)
++  { return this->traverse_expression(traverse, &this->expr_); }
++
++  void
++  do_determine_types();
++
++  void
++  do_check_types(Gogo*);
++
++  bool
++  do_may_fall_through() const;
++
++  Bstatement*
++  do_get_backend(Translate_context* context);
++
++  void
++  do_dump_statement(Ast_dump_context*) const;
++
++ private:
++  Expression* expr_;
++  // Whether the value of this expression is being explicitly ignored.
++  bool is_ignored_;
++};
++
+ // A send statement.
+ 
+ class Send_statement : public Statement
+@@ -894,8 +947,7 @@
    { this->clauses_->check_types(); }
  
@@ -11451 +12990 @@
    Bstatement*
    do_get_backend(Translate_context*);
-@@ -1086,6 +1092,9 @@
+@@ -1086,6 +1138,9 @@
    Statement*
    do_lower(Gogo*, Named_object*, Block*, Statement_inserter*);
@@ -11461 +13000 @@
    do_get_backend(Translate_context*)
    { go_unreachable(); }
-@@ -1399,6 +1408,9 @@
+@@ -1399,6 +1454,9 @@
    void
    do_dump_statement(Ast_dump_context*) const;
@@ -11471 +13010 @@
    // The value to switch on.  This may be NULL.
    Expression* val_;
-@@ -1449,6 +1461,11 @@
+@@ -1449,6 +1507,11 @@
    lower(Type*, Block*, Temporary_statement* descriptor_temp,
         Unnamed_label* break_label) const;
@@ -11483 +13022 @@
    void
    dump_clauses(Ast_dump_context*) const;
-@@ -1493,6 +1510,12 @@
+@@ -1493,6 +1556,12 @@
      lower(Type*, Block*, Temporary_statement* descriptor_temp,
           Unnamed_label* break_label, Unnamed_label** stmts_label) const;
@@ -11496 +13035 @@
      void
      dump_clause(Ast_dump_context*) const;
-@@ -1556,6 +1579,9 @@
+@@ -1556,6 +1625,9 @@
    void
    do_dump_statement(Ast_dump_context*) const;
@@ -11508 +13047 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/types.cc gcc-4.8.1/gcc/go/gofrontend/types.cc
 --- gcc-4.8.1.orig/gcc/go/gofrontend/types.cc   2013-02-01 00:23:22.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/types.cc        2013-09-13 19:01:43.136531705 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/types.cc        2013-10-01 16:06:43.992554285 +0000
 @@ -1298,8 +1298,8 @@
    // converting INITIALIZER.
@@ -11587 +13126 @@
    ++p;
    go_assert(p == fields->end());
-@@ -3407,6 +3387,19 @@
+@@ -2308,9 +2288,7 @@
+       }
+ 
+     case TYPE_NAMED:
+-      // Begin converting this type to the backend representation.
+-      // This will create a placeholder if necessary.
+-      this->get_backend(gogo);
++      this->named_type()->convert(gogo);
+       return this->named_type()->is_named_backend_type_size_known();
+ 
+     case TYPE_FORWARD:
+@@ -3407,6 +3385,16 @@
  Btype*
  Function_type::do_get_backend(Gogo* gogo)
@@ -11594 +13144 @@
 +  // is represented as a pointer to a struct whose first field is the
 +  // actual function.  So that is what we return as the type of a Go
-+  // function.  The function stored in the first field always that
-+  // takes one additional trailing argument: the closure pointer.  For
-+  // a top-level function, this additional argument will only be
-+  // passed when invoking the function indirectly, via the struct.
++  // function.
 +
 +  Location loc = this->location();
@@ -11607 +13154 @@
    if (this->receiver_ != NULL)
      {
-@@ -3422,9 +3415,15 @@
-     }
- 
-   std::vector<Backend::Btyped_identifier> bparameters;
--  if (this->parameters_ != NULL)
-+  size_t last;
-+  if (this->parameters_ == NULL)
-+    {
-+      bparameters.resize(1);
-+      last = 0;
-+    }
-+  else
-     {
--      bparameters.resize(this->parameters_->size());
-+      bparameters.resize(this->parameters_->size() + 1);
-       size_t i = 0;
-       for (Typed_identifier_list::const_iterator p = this->parameters_->begin();
-           p != this->parameters_->end();
-@@ -3434,8 +3433,12 @@
-          bparameters[i].btype = p->type()->get_backend(gogo);
-          bparameters[i].location = p->location();
-        }
--      go_assert(i == bparameters.size());
-+      last = i;
-     }
-+  go_assert(last + 1 == bparameters.size());
-+  bparameters[last].name = "$closure";
-+  bparameters[last].btype = ptr_struct_type;
-+  bparameters[last].location = loc;
- 
-   std::vector<Backend::Btyped_identifier> bresults;
-   if (this->results_ != NULL)
-@@ -3453,8 +3456,15 @@
+@@ -3453,8 +3441,15 @@
        go_assert(i == bresults.size());
      }
@@ -11657 +13172 @@
  
  // The type of a function type descriptor.
-@@ -3826,6 +3836,49 @@
+@@ -3826,6 +3821,47 @@
    return ret;
  }
@@ -11665 +13180 @@
 +
 +Function_type*
-+Function_type::copy_with_closure(Type* closure_type) const
++Function_type::copy_with_names() const
 +{
 +  Typed_identifier_list* new_params = new Typed_identifier_list();
@@ -11683 +13198 @@
 +       }
 +    }
-+  new_params->push_back(Typed_identifier("closure.0", closure_type,
-+                                        this->location_));
 +
 +  const Typed_identifier_list* orig_results = this->results_;
@@ -11707 +13220 @@
  
  Function_type*
-@@ -4168,6 +4221,22 @@
+@@ -4168,6 +4204,22 @@
      }
  }
@@ -11730 +13243 @@
  
  // A hash table used to find identical unnamed structs so that they
-@@ -4532,6 +4601,7 @@
+@@ -4175,6 +4227,11 @@
+ 
+ Struct_type::Identical_structs Struct_type::identical_structs;
+ 
++// A hash table used to merge method sets for identical unnamed
++// structs.
++
++Struct_type::Struct_method_tables Struct_type::struct_method_tables;
++
+ // Traversal.
+ 
+ int
+@@ -4532,6 +4589,7 @@
               go_assert(sub != NULL);
             }
@@ -11738 +13263 @@
        else if (subdepth > found_depth)
         delete sub;
-@@ -4781,11 +4851,16 @@
+@@ -4638,9 +4696,24 @@
+                                    const Interface_type* interface,
+                                    bool is_pointer)
+ {
++  std::pair<Struct_type*, Struct_type::Struct_method_table_pair*>
++    val(this, NULL);
++  std::pair<Struct_type::Struct_method_tables::iterator, bool> ins =
++    Struct_type::struct_method_tables.insert(val);
++
++  Struct_method_table_pair* smtp;
++  if (!ins.second)
++    smtp = ins.first->second;
++  else
++    {
++      smtp = new Struct_method_table_pair();
++      smtp->first = NULL;
++      smtp->second = NULL;
++      ins.first->second = smtp;
++    }
++
+   return Type::interface_method_table(gogo, this, interface, is_pointer,
+-                                     &this->interface_method_tables_,
+-                                     &this->pointer_interface_method_tables_);
++                                     &smtp->first, &smtp->second);
+ }
+ 
+ // Convert struct fields to the backend representation.  This is not
+@@ -4781,11 +4854,16 @@
  
        ++q;
@@ -11758 +13310 @@
           fvals->push_back(Expression::make_unary(OPERATOR_AND, s, bloc));
         }
-@@ -6227,7 +6302,8 @@
+@@ -6227,7 +6305,8 @@
  
    std::string mangled_name = "__go_map_" + this->mangled_name(gogo);
@@ -11768 +13320 @@
                                                       bloc);
  
-@@ -6235,7 +6311,7 @@
+@@ -6235,7 +6314,7 @@
    context.set_is_const();
    Bexpression* binitializer = tree_to_expr(initializer->get_tree(&context));
@@ -11777 +13329 @@
                                              binitializer);
  
-@@ -7569,7 +7645,7 @@
+@@ -7569,7 +7648,7 @@
        // the child class.
        return this->do_bind_method(expr, location);
@@ -11786 +13338 @@
  
  // Return the named object associated with a method.  This may only be
-@@ -7612,8 +7688,8 @@
+@@ -7612,8 +7691,8 @@
  Named_method::do_bind_method(Expression* expr, Location location) const
  {
@@ -11797 +13349 @@
    // the real method expects a different type.  We need to cast the
    // first argument.
-@@ -8991,28 +9067,16 @@
+@@ -8991,28 +9070,16 @@
    Call_expression* call = Expression::make_call(func, arguments, is_varargs,
                                                 location);
@@ -11831 +13383 @@
  
  // Apply FIELD_INDEXES to EXPR.  The field indexes have to be applied
-@@ -9353,13 +9417,18 @@
+@@ -9202,7 +9269,11 @@
+     }
+   else
+     {
+-      if (!ambig1.empty())
++      if (Gogo::is_erroneous_name(name))
++       {
++         // An error was already reported.
++       }
++      else if (!ambig1.empty())
+        error_at(location, "%qs is ambiguous via %qs and %qs",
+                 Gogo::message_name(name).c_str(), ambig1.c_str(),
+                 ambig2.c_str());
+@@ -9353,13 +9424,18 @@
         fnt = pf->type()->deref()->named_type();
        go_assert(fnt != NULL);
@@ -11853 +13418 @@
 diff -Naur gcc-4.8.1.orig/gcc/go/gofrontend/types.h gcc-4.8.1/gcc/go/gofrontend/types.h
 --- gcc-4.8.1.orig/gcc/go/gofrontend/types.h    2013-02-01 00:23:22.000000000 +0000
-+++ gcc-4.8.1/gcc/go/gofrontend/types.h 2013-09-13 19:01:43.139865030 +0000
++++ gcc-4.8.1/gcc/go/gofrontend/types.h 2013-10-01 16:06:43.992554285 +0000
 @@ -523,6 +523,14 @@
    static Type*
@@ -11888 +13453 @@
    copy_with_receiver(Type*) const;
  
-+  // Return a copy of this type ignoring any receiver and adding a
-+  // final closure parameter of type CLOSURE_TYPE.  This is used when
-+  // creating descriptors.
++  // Return a copy of this type ignoring any receiver and using dummy
++  // names for all parameters.  This is used for thunks for method
++  // values.
 +  Function_type*
-+  copy_with_closure(Type* closure_type) const;
++  copy_with_names() const;
 +
    static Type*
@@ -11917 +13482 @@
    Type*
    type() const
+@@ -2031,8 +2041,7 @@
+  public:
+   Struct_type(Struct_field_list* fields, Location location)
+     : Type(TYPE_STRUCT),
+-      fields_(fields), location_(location), all_methods_(NULL),
+-      interface_method_tables_(NULL), pointer_interface_method_tables_(NULL)
++      fields_(fields), location_(location), all_methods_(NULL)
+   { }
+ 
+   // Return the field NAME.  This only looks at local fields, not at
+@@ -2190,6 +2199,16 @@
+ 
+   static Identical_structs identical_structs;
+ 
++  // Used to manage method tables for identical unnamed structs.
++  typedef std::pair<Interface_method_tables*, Interface_method_tables*>
++    Struct_method_table_pair;
++
++  typedef Unordered_map_hash(Struct_type*, Struct_method_table_pair*,
++                            Type_hash_identical, Type_identical)
++    Struct_method_tables;
++
++  static Struct_method_tables struct_method_tables;
++
+   // Used to avoid infinite loops in field_reference_depth.
+   struct Saw_named_type
+   {
+@@ -2208,13 +2227,6 @@
+   Location location_;
+   // If this struct is unnamed, a list of methods.
+   Methods* all_methods_;
+-  // A mapping from interfaces to the associated interface method
+-  // tables for this type.  Only used if this struct is unnamed.
+-  Interface_method_tables* interface_method_tables_;
+-  // A mapping from interfaces to the associated interface method
+-  // tables for pointers to this type.  Only used if this struct is
+-  // unnamed.
+-  Interface_method_tables* pointer_interface_method_tables_;
+ };
+ 
+ // The type of an array.
 diff -Naur gcc-4.8.1.orig/gcc/graphite-clast-to-gimple.c gcc-4.8.1/gcc/graphite-clast-to-gimple.c
 --- gcc-4.8.1.orig/gcc/graphite-clast-to-gimple.c       2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/graphite-clast-to-gimple.c    2013-09-13 19:01:43.959862879 +0000
++++ gcc-4.8.1/gcc/graphite-clast-to-gimple.c    2013-10-01 16:07:00.564553809 +0000
 @@ -1170,8 +1170,11 @@
    redirect_edge_succ_nodup (next_e, after);
@@ -11935 +13541 @@
 diff -Naur gcc-4.8.1.orig/gcc/graphite-dependences.c gcc-4.8.1/gcc/graphite-dependences.c
 --- gcc-4.8.1.orig/gcc/graphite-dependences.c   2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/graphite-dependences.c        2013-09-13 19:01:43.963196204 +0000
++++ gcc-4.8.1/gcc/graphite-dependences.c        2013-10-01 16:07:00.564553809 +0000
 @@ -297,7 +297,7 @@
               int depth)
@@ -11964 +13570 @@
 diff -Naur gcc-4.8.1.orig/gcc/ipa-cp.c gcc-4.8.1/gcc/ipa-cp.c
 --- gcc-4.8.1.orig/gcc/ipa-cp.c 2013-05-09 11:56:32.000000000 +0000
-+++ gcc-4.8.1/gcc/ipa-cp.c      2013-09-13 19:01:43.166531626 +0000
++++ gcc-4.8.1/gcc/ipa-cp.c      2013-10-01 16:06:43.996554285 +0000
 @@ -1507,7 +1507,8 @@
    tree otr_type;
@@ -11987 +13593 @@
 diff -Naur gcc-4.8.1.orig/gcc/ipa-prop.c gcc-4.8.1/gcc/ipa-prop.c
 --- gcc-4.8.1.orig/gcc/ipa-prop.c       2013-05-23 13:25:23.000000000 +0000
-+++ gcc-4.8.1/gcc/ipa-prop.c    2013-09-13 19:01:43.169864951 +0000
++++ gcc-4.8.1/gcc/ipa-prop.c    2013-10-01 16:06:43.996554285 +0000
 @@ -678,13 +678,19 @@
    bool modified = false;
@@ -12014 +13620 @@
 diff -Naur gcc-4.8.1.orig/gcc/ira.c gcc-4.8.1/gcc/ira.c
 --- gcc-4.8.1.orig/gcc/ira.c    2013-05-23 10:36:55.000000000 +0000
-+++ gcc-4.8.1/gcc/ira.c 2013-09-13 19:01:43.169864951 +0000
++++ gcc-4.8.1/gcc/ira.c 2013-10-01 16:06:43.996554285 +0000
 @@ -2863,6 +2863,28 @@
      }
@@ -12112 +13718 @@
 diff -Naur gcc-4.8.1.orig/gcc/lra-assigns.c gcc-4.8.1/gcc/lra-assigns.c
 --- gcc-4.8.1.orig/gcc/lra-assigns.c    2013-02-15 19:17:02.000000000 +0000
-+++ gcc-4.8.1/gcc/lra-assigns.c 2013-09-13 19:01:43.173198275 +0000
++++ gcc-4.8.1/gcc/lra-assigns.c 2013-10-01 16:06:43.996554285 +0000
 @@ -116,6 +116,11 @@
  /* Map regno to the corresponding regno assignment info.  */
@@ -12160 +13766 @@
 diff -Naur gcc-4.8.1.orig/gcc/lra-constraints.c gcc-4.8.1/gcc/lra-constraints.c
 --- gcc-4.8.1.orig/gcc/lra-constraints.c        2013-05-02 19:16:29.000000000 +0000
-+++ gcc-4.8.1/gcc/lra-constraints.c     2013-09-13 19:01:43.173198275 +0000
++++ gcc-4.8.1/gcc/lra-constraints.c     2013-10-01 16:06:43.996554285 +0000
 @@ -1388,7 +1388,7 @@
    for (nalt = 0; nalt < n_alternatives; nalt++)
@@ -12181 +13787 @@
 diff -Naur gcc-4.8.1.orig/gcc/omp-low.c gcc-4.8.1/gcc/omp-low.c
 --- gcc-4.8.1.orig/gcc/omp-low.c        2013-05-16 10:45:55.000000000 +0000
-+++ gcc-4.8.1/gcc/omp-low.c     2013-09-13 19:01:43.179864925 +0000
++++ gcc-4.8.1/gcc/omp-low.c     2013-10-01 16:06:44.000554285 +0000
 @@ -836,6 +836,7 @@
    DECL_ARTIFICIAL (copy) = DECL_ARTIFICIAL (var);
@@ -12190 +13796 @@
    DECL_SEEN_IN_BIND_EXPR_P (copy) = 1;
  
+@@ -5009,8 +5010,7 @@
+     {
+       /* If we are not inside a combined parallel+sections region,
+         call GOMP_sections_start.  */
+-      t = build_int_cst (unsigned_type_node,
+-                        exit_reachable ? len - 1 : len);
++      t = build_int_cst (unsigned_type_node, len - 1);
+       u = builtin_decl_explicit (BUILT_IN_GOMP_SECTIONS_START);
+       stmt = gimple_build_call (u, 1, t);
+     }
 diff -Naur gcc-4.8.1.orig/gcc/passes.c gcc-4.8.1/gcc/passes.c
 --- gcc-4.8.1.orig/gcc/passes.c 2013-02-20 15:19:13.000000000 +0000
-+++ gcc-4.8.1/gcc/passes.c      2013-09-13 19:01:43.179864925 +0000
-@@ -1531,15 +1531,15 @@
++++ gcc-4.8.1/gcc/passes.c      2013-10-01 16:06:44.000554285 +0000
+@@ -1531,18 +1531,21 @@
        /* Perform simple scalar cleanup which is constant/copy propagation.  */
        NEXT_PASS (pass_ccp);
@@ -12213 +13829 @@
           need to adjust LIM to be more friendly towards preserving accurate
          debug information here.  */
++      /* Split critical edges before late uninit warning to reduce the
++         number of false positives from it.  */
++      NEXT_PASS (pass_split_crit_edges);
+       NEXT_PASS (pass_late_warn_uninitialized);
+       NEXT_PASS (pass_uncprop);
+       NEXT_PASS (pass_local_pure_const);
 diff -Naur gcc-4.8.1.orig/gcc/recog.c gcc-4.8.1/gcc/recog.c
 --- gcc-4.8.1.orig/gcc/recog.c  2013-01-10 20:38:27.000000000 +0000
-+++ gcc-4.8.1/gcc/recog.c       2013-09-13 19:01:43.183198249 +0000
++++ gcc-4.8.1/gcc/recog.c       2013-10-01 16:06:44.000554285 +0000
 @@ -1949,9 +1949,6 @@
      (strictp ? strict_memory_address_addr_space_p
@@ -12357 +13979 @@
         {
           add_to_hard_reg_set (reg_set, mode, regno);
+diff -Naur gcc-4.8.1.orig/gcc/recog.h gcc-4.8.1/gcc/recog.h
+--- gcc-4.8.1.orig/gcc/recog.h  2013-01-10 20:38:27.000000000 +0000
++++ gcc-4.8.1/gcc/recog.h       2013-10-01 16:06:44.000554285 +0000
+@@ -256,7 +256,57 @@
+ 
+ typedef int (*insn_operand_predicate_fn) (rtx, enum machine_mode);
+ typedef const char * (*insn_output_fn) (rtx *, rtx);
+-typedef rtx (*insn_gen_fn) (rtx, ...);
++
++struct insn_gen_fn
++{
++  typedef rtx (*f0) (void);
++  typedef rtx (*f1) (rtx);
++  typedef rtx (*f2) (rtx, rtx);
++  typedef rtx (*f3) (rtx, rtx, rtx);
++  typedef rtx (*f4) (rtx, rtx, rtx, rtx);
++  typedef rtx (*f5) (rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f6) (rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f7) (rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f8) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f9) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f10) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f11) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f12) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f13) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f14) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f15) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++  typedef rtx (*f16) (rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx, rtx);
++
++  typedef f0 stored_funcptr;
++
++  rtx operator () (void) const { return ((f0)func) (); }
++  rtx operator () (rtx a0) const { return ((f1)func) (a0); }
++  rtx operator () (rtx a0, rtx a1) const { return ((f2)func) (a0, a1); }
++  rtx operator () (rtx a0, rtx a1, rtx a2) const { return ((f3)func) (a0, a1, a2); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3) const { return ((f4)func) (a0, a1, a2, a3); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4) const { return ((f5)func) (a0, a1, a2, a3, a4); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5) const { return ((f6)func) (a0, a1, a2, a3, a4, a5); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6) const { return ((f7)func) (a0, a1, a2, a3, a4, a5, a6); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7) const { return ((f8)func) (a0, a1, a2, a3, a4, a5, a6, a7); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7, rtx a8) const { return ((f9)func) (a0, a1, a2, a3, a4, a5, a6, a7, a8); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7, rtx a8, rtx a9) const { return ((f10)func) (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7, rtx a8, rtx a9, rtx a10) const { return ((f11)func) (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7, rtx a8, rtx a9, rtx a10, rtx a11) const { return ((f12)func) (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7, rtx a8, rtx a9, rtx a10, rtx a11, rtx a12) const { return ((f13)func) (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7, rtx a8, rtx a9, rtx a10, rtx a11, rtx a12, rtx a13) const { return ((f14)func) (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7, rtx a8, rtx a9, rtx a10, rtx a11, rtx a12, rtx a13, rtx a14) const { return ((f15)func) (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); }
++  rtx operator () (rtx a0, rtx a1, rtx a2, rtx a3, rtx a4, rtx a5, rtx a6, rtx a7, rtx a8, rtx a9, rtx a10, rtx a11, rtx a12, rtx a13, rtx a14, rtx a15) const { return ((f16)func) (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); }
++
++  // This is for compatibility of code that invokes functions like
++  //   (*funcptr) (arg)
++  insn_gen_fn operator * (void) const { return *this; }
++
++  // The wrapped function pointer must be public and there must not be any
++  // constructors.  Otherwise the insn_data_d struct initializers generated
++  // by genoutput.c will result in static initializer functions, which defeats
++  // the purpose of the generated insn_data_d array.
++  stored_funcptr func;
++};
+ 
+ struct insn_operand_data
+ {
 diff -Naur gcc-4.8.1.orig/gcc/simplify-rtx.c gcc-4.8.1/gcc/simplify-rtx.c
 --- gcc-4.8.1.orig/gcc/simplify-rtx.c   2013-03-05 06:04:14.000000000 +0000
-+++ gcc-4.8.1/gcc/simplify-rtx.c        2013-09-13 19:01:43.183198249 +0000
++++ gcc-4.8.1/gcc/simplify-rtx.c        2013-10-01 16:06:44.000554285 +0000
 @@ -2784,6 +2784,7 @@
            HOST_WIDE_INT mask = INTVAL (trueop1) << count;
@@ -12370 +14054 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/c-c++-common/gomp/pr58257.c gcc-4.8.1/gcc/testsuite/c-c++-common/gomp/pr58257.c
 --- gcc-4.8.1.orig/gcc/testsuite/c-c++-common/gomp/pr58257.c    1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/c-c++-common/gomp/pr58257.c 2013-09-13 19:01:43.186531574 +0000
++++ gcc-4.8.1/gcc/testsuite/c-c++-common/gomp/pr58257.c 2013-10-01 16:06:44.000554285 +0000
 @@ -0,0 +1,15 @@
 +/* PR middle-end/58257 */
@@ -12389 +14073 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/constexpr-value4.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/constexpr-value4.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/constexpr-value4.C        1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/constexpr-value4.C     2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/constexpr-value4.C     2013-10-01 16:06:44.008554285 +0000
 @@ -0,0 +1,16 @@
 +// PR c++/57901
@@ -12409 +14093 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/decltype55.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/decltype55.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/decltype55.C      1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/decltype55.C   2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/decltype55.C   2013-10-01 16:06:44.008554285 +0000
 @@ -0,0 +1,20 @@
 +// PR c++/53211
@@ -12433 +14117 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/defaulted44.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/defaulted44.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/defaulted44.C     1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/defaulted44.C  2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/defaulted44.C  2013-10-01 16:06:44.008554285 +0000
 @@ -0,0 +1,24 @@
 +// PR c++/57319
@@ -12461 +14145 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/defaulted45.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/defaulted45.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/defaulted45.C     1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/defaulted45.C  2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/defaulted45.C  2013-10-01 16:06:44.008554285 +0000
 @@ -0,0 +1,20 @@
 +// { dg-do run }
@@ -12485 +14169 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/initlist71.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/initlist71.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/initlist71.C      1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/initlist71.C   2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/initlist71.C   2013-10-01 16:06:44.008554285 +0000
 @@ -0,0 +1,9 @@
 +// PR c++/56930
@@ -12498 +14182 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto3.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto3.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto3.C     1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto3.C  2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto3.C  2013-10-01 16:06:44.008554285 +0000
 @@ -0,0 +1,24 @@
 +// PR c++/57526
@@ -12526 +14210 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg5.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg5.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg5.C   1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg5.C        2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg5.C        2013-10-01 16:06:44.008554285 +0000
 @@ -0,0 +1,30 @@
 +// PR c++/58083
@@ -12560 +14244 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-return1.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-return1.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-return1.C   1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-return1.C        2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-return1.C        2013-10-01 16:06:44.008554285 +0000
 @@ -0,0 +1,26 @@
 +// PR c++/57437
@@ -12590 +14274 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/noexcept21.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/noexcept21.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/noexcept21.C      1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/noexcept21.C   2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/noexcept21.C   2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,87 @@
 +// PR c++/57645
@@ -12681 +14365 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/pr57981.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/pr57981.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/pr57981.C 1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/pr57981.C      2013-09-13 19:01:43.196531548 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/pr57981.C      2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,17 @@
 +// { dg-options "-std=c++11 -Wall -Wextra" }
@@ -12702 +14386 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/ref-qual14.C gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/ref-qual14.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/cpp0x/ref-qual14.C      1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/ref-qual14.C   2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/cpp0x/ref-qual14.C   2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,18 @@
 +// PR c++/57825
@@ -12724 +14408 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/debug/template2.C gcc-4.8.1/gcc/testsuite/g++.dg/debug/template2.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/debug/template2.C       1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/debug/template2.C    2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/debug/template2.C    2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,14 @@
 +// PR c++/57545
@@ -12742 +14426 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/expr/const1.C gcc-4.8.1/gcc/testsuite/g++.dg/expr/const1.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/expr/const1.C   1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/expr/const1.C        2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/expr/const1.C        2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,9 @@
 +// PR c++/57551
@@ -12755 +14439 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/ext/pr57362.C gcc-4.8.1/gcc/testsuite/g++.dg/ext/pr57362.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/ext/pr57362.C   1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/ext/pr57362.C        2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/ext/pr57362.C        2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,199 @@
 +/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
@@ -12956 +14640 @@
 +/* { dg-prune-output "int foo.* previously defined here" } */
 +/* { dg-prune-output "No dispatcher found for" } */
+diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/ext/pr57735.C gcc-4.8.1/gcc/testsuite/g++.dg/ext/pr57735.C
+--- gcc-4.8.1.orig/gcc/testsuite/g++.dg/ext/pr57735.C   1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/ext/pr57735.C        2013-10-01 16:06:44.012554285 +0000
+@@ -0,0 +1,145 @@
++/* { dg-do compile { target arm*-*-* } } */
++/* { dg-options "-march=armv5te -marm  -mtune=xscale -mfloat-abi=soft -O1" } */
++
++typedef unsigned int size_t;
++__extension__
++typedef long long int int64_t;
++namespace WTF {
++    template<typename T> class RefPtr {
++    public:
++        inline T* operator->() const { return m_ptr; }
++        T* m_ptr;
++    };
++}
++using WTF::RefPtr;
++namespace JSC {
++    class ExecState;
++    class JSString;
++    typedef int64_t EncodedJSValue;
++    class JSValue {
++    public:
++        static EncodedJSValue encode(JSValue);
++        JSString* toString(ExecState*) const;
++    };
++}
++typedef unsigned char LChar;
++    typedef short unsigned int UChar;
++namespace WTF {
++    template<typename T, size_t inlineCapacity = 0>
++    class Vector {
++    public:
++        template<typename U> bool tryAppend(const U*, size_t);
++    };
++}
++using WTF::Vector;
++namespace WTF {
++template<typename CharType> inline bool isASCIIDigit(CharType c)
++{
++}
++template<typename CharType> inline bool isASCIIHexDigit(CharType c)
++{
++    return isASCIIDigit(c) || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f');
++}
++    class StringImpl;
++}
++using WTF::StringImpl;
++namespace WTF {
++class StringImpl {
++public:
++    unsigned length() const { return m_length; }
++    unsigned m_length;
++};
++}
++namespace JSC {
++    class Register {
++    };
++class UString {
++public:
++    unsigned length() const
++    {
++        return m_impl->length();
++    }
++    const LChar* characters8() const
++    {
++    }
++    RefPtr<StringImpl> m_impl;
++};
++    class ExecState : private Register {
++    public:
++        JSValue argument(size_t argument)
++        {
++        }
++    };
++    class JSCell {
++    };
++    class JSString : public JSCell {
++    public:
++        const UString& value(ExecState*) const;
++    };
++class JSStringBuilder {
++public:
++    void append(const UChar u)
++    {
++        m_okay &= buffer16.tryAppend(&u, 1);
++    }
++    Vector<UChar, 64> buffer16;
++    bool m_okay;
++};
++template <typename T>
++class Lexer {
++public:
++    static unsigned char convertHex(int c1, int c2);
++};
++}
++namespace WTF {
++namespace Unicode {
++    int UTF8SequenceLength(char);
++    int decodeUTF8Sequence(const char*);
++}
++}
++using namespace WTF;
++using namespace Unicode;
++namespace JSC {
++template <typename CharType>
++static JSValue decode(ExecState* exec, const CharType* characters, int length, const char* doNotUnescape, bool strict)
++{
++    JSStringBuilder builder;
++    int k = 0;
++    UChar u = 0;
++    while (k < length) {
++        const CharType* p = characters + k;
++        CharType c = *p;
++        if (c == '%') {
++            int charLen = 0;
++            if (k <= length - 3 && isASCIIHexDigit(p[1]) && isASCIIHexDigit(p[2])) {
++                const char b0 = Lexer<CharType>::convertHex(p[1], p[2]);
++                const int sequenceLen = UTF8SequenceLength(b0);
++                if (sequenceLen && k <= length - sequenceLen * 3) {
++                    charLen = sequenceLen * 3;
++                    char sequence[5];
++                    if (charLen != 0) {
++                        const int character = decodeUTF8Sequence(sequence);
++                        if (character < 0 || character >= 0x110000)
++                            charLen = 0;
++                        else if (character >= 0x10000) {
++                            builder.append(static_cast<UChar>(0xD800 | ((character - 0x10000) >> 10)));
++                        } else
++                            u = static_cast<UChar>(character);
++                    }
++                }
++            }
++        }
++    }
++}
++static JSValue decode(ExecState* exec, const char* doNotUnescape, bool strict)
++{
++    UString str = exec->argument(0).toString(exec)->value(exec);
++        return decode(exec, str.characters8(), str.length(), doNotUnescape, strict);
++}
++EncodedJSValue globalFuncDecodeURI(ExecState* exec)
++{
++    static const char do_not_unescape_when_decoding_URI[] =
++        "#$&+,/:;=?@";
++    return JSValue::encode(decode(exec, do_not_unescape_when_decoding_URI, true));
++}
++}
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/opt/pr58006.C gcc-4.8.1/gcc/testsuite/g++.dg/opt/pr58006.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/opt/pr58006.C   1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/opt/pr58006.C        2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/opt/pr58006.C        2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,22 @@
 +// PR tree-optimization/58006
@@ -12984 +14817 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/opt/pr58165.C gcc-4.8.1/gcc/testsuite/g++.dg/opt/pr58165.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/opt/pr58165.C   1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/opt/pr58165.C        2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/opt/pr58165.C        2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,14 @@
 +// PR tree-optimization/58165
@@ -13002 +14835 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/parse/ref-qual2.C gcc-4.8.1/gcc/testsuite/g++.dg/parse/ref-qual2.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/parse/ref-qual2.C       1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/parse/ref-qual2.C    2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/parse/ref-qual2.C    2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,6 @@
 +// PR c++/57532
@@ -13010 +14843 @@
 +    return (int() & int());
 +}
+diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/parse/using4.C gcc-4.8.1/gcc/testsuite/g++.dg/parse/using4.C
+--- gcc-4.8.1.orig/gcc/testsuite/g++.dg/parse/using4.C  1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/parse/using4.C       2013-10-01 16:06:44.012554285 +0000
+@@ -0,0 +1,20 @@
++// PR c++/58457
++
++struct allocator
++{
++  void operator delete (void*);
++  void* operator new (__SIZE_TYPE__, void*);
++};
++
++struct type : public allocator
++{
++  type() {}
++  using allocator::operator new;
++  using allocator::operator delete;
++};
++
++int main()
++{
++  new (0) type;
++  return 0;
++}
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/pr57878.C gcc-4.8.1/gcc/testsuite/g++.dg/pr57878.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/pr57878.C       1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/pr57878.C    2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/pr57878.C    2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,226 @@
 +/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
@@ -13242 +15099 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/abstract1.C gcc-4.8.1/gcc/testsuite/g++.dg/template/abstract1.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/abstract1.C    1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/template/abstract1.C 2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/template/abstract1.C 2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,12 @@
 +// PR c++/58022
@@ -13258 +15115 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/access27.C gcc-4.8.1/gcc/testsuite/g++.dg/template/access27.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/access27.C     1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/template/access27.C  2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/template/access27.C  2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,17 @@
 +// PR c++/57550
@@ -13279 +15136 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/arg9.C gcc-4.8.1/gcc/testsuite/g++.dg/template/arg9.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/arg9.C 1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/template/arg9.C      2013-09-13 19:01:43.199864872 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/template/arg9.C      2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,8 @@
 +// PR c++/57771
@@ -13291 +15148 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/delete2.C gcc-4.8.1/gcc/testsuite/g++.dg/template/delete2.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/delete2.C      1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/template/delete2.C   2013-09-13 19:01:43.203198197 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/template/delete2.C   2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,26 @@
 +// PR c++/58119
@@ -13319 +15176 @@
 +  delete b;                    // { dg-error "template|delete" }
 +}
+diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/inherit9.C gcc-4.8.1/gcc/testsuite/g++.dg/template/inherit9.C
+--- gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/inherit9.C     1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/template/inherit9.C  2013-10-01 16:06:44.012554285 +0000
+@@ -0,0 +1,15 @@
++// PR c++/58273
++
++class A {};
++class B
++{
++  int goo(A);
++};
++template<typename E>
++class D : public B
++{
++  void foo(A t)
++  {
++    int const i(B::goo(t));
++  }
++};
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/using23.C gcc-4.8.1/gcc/testsuite/g++.dg/template/using23.C
 --- gcc-4.8.1.orig/gcc/testsuite/g++.dg/template/using23.C      1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/g++.dg/template/using23.C   2013-09-13 19:01:43.203198197 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/template/using23.C   2013-10-01 16:06:44.012554285 +0000
 @@ -0,0 +1,15 @@
 +// PR c++/57831
@@ -13338 +15214 @@
 +};
 +template struct B< A >;
+diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/uninit-pred-4.C gcc-4.8.1/gcc/testsuite/g++.dg/uninit-pred-4.C
+--- gcc-4.8.1.orig/gcc/testsuite/g++.dg/uninit-pred-4.C 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/uninit-pred-4.C      2013-10-01 16:06:44.012554285 +0000
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-options "-Wuninitialized -Og" } */
++
++int pop ();
++int pop_first_bucket;
++
++int my_pop ()
++{
++  int out;  // { dg-bogus "uninitialized" "uninitialized variable warning" }
++
++  while (pop_first_bucket)
++    if (pop_first_bucket && (out = pop()))
++      return out;
++
++  return 0;
++}
+diff -Naur gcc-4.8.1.orig/gcc/testsuite/g++.dg/warn/Wunused-var-21.C gcc-4.8.1/gcc/testsuite/g++.dg/warn/Wunused-var-21.C
+--- gcc-4.8.1.orig/gcc/testsuite/g++.dg/warn/Wunused-var-21.C   1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.8.1/gcc/testsuite/g++.dg/warn/Wunused-var-21.C        2013-10-01 16:06:44.012554285 +0000
+@@ -0,0 +1,31 @@
++// PR c++/58325
++// { dg-do compile }
++// { dg-options "-Wunused" }
++
++void
++f1 ()
++{
++  int *volatile a = new int[1];
++  delete[] a;
++}
++
++void
++f2 ()
++{
++  int *b = new int[1];
++  delete[] b;
++}
++
++void
++f3 ()
++{
++  int *volatile c = new int;
++  delete c;
++}
++
++void
++f4 ()
++{
++  int *d = new int;
++  delete d;
++}
+diff -Naur gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/compile/pr58088.c gcc-4.8.1/gcc/testsuite/gcc.c-torture/compile/pr58088.c
+--- gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/compile/pr58088.c        1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/compile/pr58088.c     2013-10-01 16:06:44.000554285 +0000
+@@ -0,0 +1,5 @@
++int
++bar (int i)
++{
++  return 1 | ((i * 2) & 254);
++}
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/compile/pr58164.c gcc-4.8.1/gcc/testsuite/gcc.c-torture/compile/pr58164.c
 --- gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/compile/pr58164.c        1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/compile/pr58164.c     2013-09-13 19:01:43.186531574 +0000
++++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/compile/pr58164.c     2013-10-01 16:06:44.000554285 +0000
 @@ -0,0 +1,8 @@
 +/* PR tree-optimization/58164 */
@@ -13352 +15292 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/nest-align-1.x gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/nest-align-1.x
 --- gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/nest-align-1.x   1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/nest-align-1.x        2013-09-13 19:01:43.186531574 +0000
++++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/nest-align-1.x        2013-10-01 16:06:44.000554285 +0000
 @@ -0,0 +1,5 @@
 +# Force bigger stack alignment for PowerPC EABI targets.
@@ -13361 +15301 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr57568.c gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr57568.c
 --- gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr57568.c        1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr57568.c     2013-09-13 19:01:43.186531574 +0000
++++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr57568.c     2013-10-01 16:06:44.000554285 +0000
 @@ -0,0 +1,12 @@
 +/* PR target/57568 */
@@ -13377 +15317 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr57829.c gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr57829.c
 --- gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr57829.c        1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr57829.c     2013-09-13 19:01:43.186531574 +0000
++++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr57829.c     2013-10-01 16:06:44.000554285 +0000
 @@ -0,0 +1,31 @@
 +/* PR rtl-optimization/57829 */
@@ -13412 +15352 @@
 diff -Naur gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr58209.c gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr58209.c
 --- gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr58209.c        1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr58209.c     2013-09-13 19:01:43.186531574 +0000
++++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr58209.c     2013-10-01 16:06:44.000554285 +0000
 @@ -0,0 +1,32 @@
 +/* PR tree-optimization/58209 */
@@ -13446 +15386 @@
 +  return 0;
 +}
+diff -Naur gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr58277-1.c gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr58277-1.c
+--- gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr58277-1.c      1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr58277-1.c   2013-10-01 16:06:44.000554285 +0000
+@@ -0,0 +1,102 @@
++/* PR tree-optimization/58277 */
++
++extern void abort (void);
++static int a[2];
++int b, c, d, *e, f, g, h, **i = &e, k, l = 1, n, o, p;
++static int **volatile j = &e;
++const int m;
++char u;
++
++int
++bar ()
++{
++  u = 0;
++  return m;
++}
++
++__attribute__((noinline, noclone)) void
++baz ()
++{
++  asm ("");
++}
++
++static int
++foo ()
++{
++  int t1;
++  g = bar ();
++  if (l)
++    ;
++  else
++    for (;; h++)
++      {
++       *i = 0;
++       o = *e = 0;
++       if (p)
++         {
++           f = 0;
++           return 0;
++         }
++       for (;; k++)
++         {
++           int *t2 = 0;
++           int *const *t3[] = {
++             0, 0, 0, 0, 0, 0, 0, 0, 0, &t2, 0, 0, &t2, &t2, &t2,
++             &t2, &t2, 0, 0, 0, 0, 0, 0, 0, &t2, 0, 0, 0, 0, 0, 0,
++             0, 0, 0, 0, &t2, 0, 0, 0, 0, 0, 0, 0, &t2, &t2,
++             &t2, &t2, &t2, 0, 0, 0, 0, 0, 0, 0, &t2, 0, 0, 0,
++             &t2, 0, 0, 0, &t2, 0, &t2, 0, 0, &t2, 0, 0, 0, 0,
++             0, &t2, 0, 0, 0, 0, &t2, &t2, 0, 0, 0, 0, &t2, 0,
++             0, 0, 0, 0, 0, 0, &t2, 0, 0, 0, 0, 0, &t2, 0, 0, 0,
++             &t2, &t2
++           };
++           int *const **t4[] = {&t3[0]};
++           **i = 0;
++           if (**j)
++             break;
++           u = 0;
++         }
++       *i = *j;
++       t1 = 0;
++       for (; t1 < 5; t1++)
++         *i = *j;
++      }
++  *j = 0;
++  return 1;
++}
++
++int
++main ()
++{
++  int t5;
++  a[0] = 1;
++  {
++    int *t6[6] = {&d, &d};
++    for (n = 1; n; n--)
++      if (foo())
++       {
++         int *t7[] = {0};
++         d = 0;
++         for (; u < 1; u++)
++           *i = *j;
++         *i = 0;
++         *i = 0;
++         int t8[5] = {0};
++         *i = &t8[0];
++         int *const *t9 = &t6[0];
++         int *const **t10 = &t9;
++         *t10 = &t7[0];
++       }
++  }
++  u = 0;
++  for (; b; b++)
++    for (t5 = 0; t5 < 10; t5++)
++      c = a[a[a[a[a[a[a[a[c]]]]]]]];
++
++  baz ();
++
++  if (!a[a[a[a[a[a[a[a[a[a[a[a[a[a[a[u]]]]]]]]]]]]]]])
++    abort ();
++
++  return 0;
++}
+diff -Naur gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr58277-2.c gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr58277-2.c
+--- gcc-4.8.1.orig/gcc/testsuite/gcc.c-torture/execute/pr58277-2.c      1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.8.1/gcc/testsuite/gcc.c-torture/execute/pr58277-2.c   2013-10-01 16:06:44.000554285 +0000
+@@ -0,0 +1,98 @@
++/* PR tree-optimization/58277 */
++
++extern void abort (void);
++static int a[1], b, c, e, i, j, k, m, q[] = { 1, 1 }, t;
++int volatile d;
++int **r;
++static int ***volatile s = &r;
++int f, g, o, x;
++static int *volatile h = &f, *p;
++char n;
++
++static void
++fn1 ()
++{
++  b = a[a[a[a[a[a[a[a[b]]]]]]]];
++  b = a[a[a[a[a[a[a[a[b]]]]]]]];
++  b = a[a[b]];
++  b = a[a[a[a[a[a[a[a[b]]]]]]]];
++  b = a[a[a[a[a[a[a[a[b]]]]]]]];
++}
++
++static int
++fn2 ()
++{
++  n = 0;
++  for (; g; t++)
++    {
++      for (;; m++)
++       {
++         d;
++         int *u;
++         int **v[] = {
++           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++&n