Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>

26 files changed, 232 insertions, 294 deletions

diff --git a/packages/gcc-linaro/4.8-2015.06/001_gcc_bug_62231.patch b/packages/gcc-linaro/4.8-2015.06/0000-gcc_bug_62231.patch
index e7c9cf9..603e1c2 100644
--- a/packages/gcc-linaro/4.8-2015.06/001_gcc_bug_62231.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0000-gcc_bug_62231.patch
@@ -4,9 +4,14 @@ https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
+---
+ gcc/defaults.h      |    5 +++
+ gcc/dwarf2cfi.c     |   76 +++++++++++++++++++++++++++++++++++-----------------
+ libgcc/unwind-dw2.c |    4 --
+ 3 files changed, 57 insertions(+), 28 deletions(-)
+
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
 @@ -438,6 +438,11 @@
  #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
  #endif
@@ -19,9 +24,8 @@ diff -durN a/gcc/defaults.h b/gcc/defaults.h
  /* Map register numbers held in the call frame info that gcc has
     collected using DWARF_FRAME_REGNUM to those that should be output in
     .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
+--- a/gcc/dwarf2cfi.c
++++ b/gcc/dwarf2cfi.c
 @@ -225,7 +225,44 @@
    emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
  }
@@ -74,7 +78,9 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
      {
 -      unsigned int dnum = DWARF_FRAME_REGNUM (i);
 -      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
++      enum machine_mode save_mode = reg_raw_mode[i];
++      rtx span;
+ 
 -      if (rnum < DWARF_FRAME_REGISTERS)
 -	{
 -	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
@@ -92,9 +98,7 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
 -	  size = GET_MODE_SIZE (save_mode);
 -	  if (offset < 0)
 -	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
+-
 -	  emit_move_insn (adjust_address (mem, mode, offset),
 -			  gen_int_mode (size, mode));
 -	}
@@ -113,9 +117,8 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
      }
  
    if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
+--- a/libgcc/unwind-dw2.c
++++ b/libgcc/unwind-dw2.c
 @@ -55,10 +55,6 @@
  #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
  #endif
diff --git a/packages/gcc-linaro/4.8-2015.06/002_gcc_bug_62231.patch b/packages/gcc-linaro/4.8-2015.06/0001-gcc_bug_62231.patch
index b970ebc..0fed72d 100644
--- a/packages/gcc-linaro/4.8-2015.06/002_gcc_bug_62231.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0001-gcc_bug_62231.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
+---
+ gcc/config/rs6000/rs6000.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -1677,7 +1677,7 @@
       SCmode so as to pass the value correctly in a pair of
       registers.  */
    else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
diff --git a/packages/gcc-linaro/4.8-2015.06/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/4.8-2015.06/0002-libtool-leave-framework-alone.patch
index 525592e..e67e0e8 100644
--- a/packages/gcc-linaro/4.8-2015.06/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0002-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc-linaro/4.8-2015.06/100-uclibc-conf.patch b/packages/gcc-linaro/4.8-2015.06/0003-uclibc-conf.patch
index d56bf0a..aef750a 100644
--- a/packages/gcc-linaro/4.8-2015.06/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0003-uclibc-conf.patch
@@ -1,7 +1,9 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
 @@ -106,6 +106,10 @@
   then
    make all-gdb all-dejagnu all-ld || exit 1
diff --git a/packages/gcc-linaro/4.8-2015.06/111-pr65730.patch b/packages/gcc-linaro/4.8-2015.06/0004-pr65730.patch
index f195e30..3cea1a1 100644
--- a/packages/gcc-linaro/4.8-2015.06/111-pr65730.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0004-pr65730.patch
@@ -13,14 +13,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
 Changes to ChangeLog are dropped.
 
- gcc/config/xtensa/xtensa.c | 5 +++--
+ gcc/config/xtensa/xtensa.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..7296e36 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem)
+@@ -1423,8 +1423,9 @@
    if (ac->shift != NULL_RTX)
      {
        /* Shift is the byte count, but we need the bitcount.  */
@@ -32,6 +30,3 @@ index eb039ba..7296e36 100644
  				       NULL_RTX, 1, OPTAB_DIRECT);
        ac->modemask = expand_simple_binop (SImode, ASHIFT,
  					  GEN_INT (GET_MODE_MASK (mode)),
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/130-pr43538.patch b/packages/gcc-linaro/4.8-2015.06/0005-pr43538.patch
index 19e57bb..c2a2046 100644
--- a/packages/gcc-linaro/4.8-2015.06/130-pr43538.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0005-pr43538.patch
@@ -10,16 +10,11 @@ Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-gnu    | 2 +-
+ config/mt-gnu |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
 --- a/config/mt-gnu
 +++ b/config/mt-gnu
 @@ -1 +1 @@
 -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
 +CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/packages/gcc-linaro/4.8-2015.06/0006-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
index 1c49fb0..d866661 100644
--- a/packages/gcc-linaro/4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0006-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
@@ -10,11 +10,9 @@ Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-ospace | 4 ++--
+ config/mt-ospace |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
 --- a/config/mt-ospace
 +++ b/config/mt-ospace
 @@ -1,3 +1,3 @@
@@ -23,6 +21,3 @@ index 7f09104..ce29ff4 100644
 - CXXFLAGS_FOR_TARGET = -g -Os
 + CFLAGS_FOR_TARGET += -g -Os
 + CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/132-build_gcc-5_with_gcc-6.patch b/packages/gcc-linaro/4.8-2015.06/0007-build_gcc-5_with_gcc-6.patch
index ac1d846..b49d7da 100644
--- a/packages/gcc-linaro/4.8-2015.06/132-build_gcc-5_with_gcc-6.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0007-build_gcc-5_with_gcc-6.patch
@@ -15,16 +15,22 @@ Subject: [PATCH 1/1] 2016-02-25  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4
-diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
---- a/gcc/cp/cfns.gperf	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.gperf	2016-12-05 13:55:20.331616274 -0800
+---
+ gcc/cp/Make-lang.in |    2 +-
+ gcc/cp/cfns.gperf   |   10 ++--------
+ gcc/cp/cfns.h       |   41 ++++++++++++++---------------------------
+ gcc/cp/except.c     |    3 ++-
+ 4 files changed, 19 insertions(+), 37 deletions(-)
+
+--- a/gcc/cp/cfns.gperf
++++ b/gcc/cp/cfns.gperf
 @@ -1,3 +1,5 @@
 +%language=C++
 +%define class-name libc_name
  %{
  /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
  
-@@ -16,14 +18,6 @@ for more details.
+@@ -16,14 +18,6 @@
  You should have received a copy of the GNU General Public License
  along with GCC; see the file COPYING3.  If not see
  <http://www.gnu.org/licenses/>.  */
@@ -39,9 +45,8 @@ diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
  %}
  %%
  # The standard C library functions, for feeding to gperf; the result is used
-diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
---- a/gcc/cp/cfns.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.h	2016-12-05 13:55:20.331616274 -0800
+--- a/gcc/cp/cfns.h
++++ b/gcc/cp/cfns.h
 @@ -1,5 +1,5 @@
 -/* ANSI-C code produced by gperf version 3.0.3 */
 -/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf  */
@@ -59,7 +64,7 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  
  /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
  
-@@ -47,25 +47,18 @@ for more details.
+@@ -47,25 +47,18 @@
  You should have received a copy of the GNU General Public License
  along with GCC; see the file COPYING3.  If not see
  <http://www.gnu.org/licenses/>.  */
@@ -95,7 +100,7 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  {
    static const unsigned short asso_values[] =
      {
-@@ -122,14 +115,8 @@ hash (register const char *str, register
+@@ -122,14 +115,8 @@
    return hval + asso_values[(unsigned char)str[len - 1]];
  }
  
@@ -111,10 +116,9 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  {
    enum
      {
-diff -urpN a/gcc/cp/except.c b/gcc/cp/except.c
---- a/gcc/cp/except.c	2013-10-25 06:49:48.000000000 -0700
-+++ b/gcc/cp/except.c	2016-12-05 13:55:20.331616274 -0800
-@@ -1025,7 +1025,8 @@ nothrow_libfn_p (const_tree fn)
+--- a/gcc/cp/except.c
++++ b/gcc/cp/except.c
+@@ -1025,7 +1025,8 @@
       unless the system headers are playing rename tricks, and if
       they are, we don't want to be confused by them.  */
    id = DECL_NAME (fn);
@@ -124,10 +128,9 @@ diff -urpN a/gcc/cp/except.c b/gcc/cp/except.c
  }
  
  /* Returns nonzero if an exception of type FROM will be caught by a
-diff -urpN a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
---- a/gcc/cp/Make-lang.in	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/Make-lang.in	2016-12-05 13:55:20.331616274 -0800
-@@ -115,7 +115,7 @@ else
+--- a/gcc/cp/Make-lang.in
++++ b/gcc/cp/Make-lang.in
+@@ -115,7 +115,7 @@
  # deleting the $(srcdir)/cp/cfns.h file.
  $(srcdir)/cp/cfns.h:
  endif
diff --git a/packages/gcc-linaro/4.8-2015.06/301-missing-execinfo_h.patch b/packages/gcc-linaro/4.8-2015.06/0008-missing-execinfo_h.patch
index 00efda2..c90222a 100644
--- a/packages/gcc-linaro/4.8-2015.06/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0008-missing-execinfo_h.patch
@@ -1,7 +1,9 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/boehm-gc/include/gc.h
++++ b/boehm-gc/include/gc.h
 @@ -503,7 +503,7 @@
  #if defined(__linux__) || defined(__GLIBC__)
  # include <features.h>
diff --git a/packages/gcc-linaro/4.8-2015.06/305-libmudflap-susv3-legacy.patch b/packages/gcc-linaro/4.8-2015.06/0009-libmudflap-susv3-legacy.patch
index 35d5f50..c63f911 100644
--- a/packages/gcc-linaro/4.8-2015.06/305-libmudflap-susv3-legacy.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0009-libmudflap-susv3-legacy.patch
@@ -1,7 +1,9 @@
-Index: gcc-4.8.0/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c	2013-02-03 18:48:05.000000000 +0100
-+++ gcc-4.8.0/libmudflap/mf-hooks2.c	2013-03-23 17:39:43.000000000 +0100
+---
+ libmudflap/mf-hooks2.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/libmudflap/mf-hooks2.c
++++ b/libmudflap/mf-hooks2.c
 @@ -424,7 +424,7 @@
  {
    TRACE ("%s\n", __PRETTY_FUNCTION__);
diff --git a/packages/gcc-linaro/4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/4.8-2015.06/0010-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index 3cf66b2..f29c5a2 100644
--- a/packages/gcc-linaro/4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0010-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,7 +1,11 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc/configure
---- gcc-4.8.5.orig/gcc/configure	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure	2017-02-11 16:57:27.424807994 -0800
-@@ -27364,6 +27364,9 @@ fi
+---
+ gcc/configure    |   22 +++++++++++++++-------
+ gcc/configure.ac |   18 +++++++++++++-----
+ 2 files changed, 28 insertions(+), 12 deletions(-)
+
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -27366,6 +27366,9 @@
  
  
  pluginlibs=
@@ -11,7 +15,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
  
  case "${host}" in
    *-*-darwin*)
-@@ -27375,6 +27378,11 @@ case "${host}" in
+@@ -27377,6 +27380,11 @@
        export_sym_check=
      fi
    ;;
@@ -23,7 +27,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -27487,23 +27495,23 @@ fi
+@@ -27489,23 +27497,23 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -54,10 +58,9 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
    ;
    return 0;
  }
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/gcc/configure.ac
---- gcc-4.8.5.orig/gcc/configure.ac	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure.ac	2017-02-11 16:57:27.424807994 -0800
-@@ -5243,6 +5243,9 @@ enable_plugin=$enableval,
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -5244,6 +5244,9 @@
  enable_plugin=yes; default_plugin=yes)
  
  pluginlibs=
@@ -67,7 +70,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/
  
  case "${host}" in
    *-*-darwin*)
-@@ -5254,6 +5257,11 @@ case "${host}" in
+@@ -5255,6 +5258,11 @@
        export_sym_check=
      fi
    ;;
@@ -79,7 +82,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -5305,17 +5313,17 @@ if test x"$enable_plugin" = x"yes"; then
+@@ -5306,17 +5314,17 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/4.8-2015.06/0011-arm-softfloat-libgcc.patch
index c8cb377..7b0265a 100644
--- a/packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0011-arm-softfloat-libgcc.patch
@@ -1,7 +1,10 @@
-Index: gcc-4.8.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.0/gcc/config/arm/linux-elf.h	2013-03-23 17:40:00.000000000 +0100
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
 @@ -55,7 +55,7 @@
     %{shared:-lc} \
     %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
@@ -11,10 +14,8 @@ Index: gcc-4.8.0/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: gcc-4.8.0/libgcc/config/arm/t-linux
-===================================================================
---- gcc-4.8.0.orig/libgcc/config/arm/t-linux	2012-03-22 16:14:46.000000000 +0100
-+++ gcc-4.8.0/libgcc/config/arm/t-linux	2013-03-23 17:40:54.000000000 +0100
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
  LIB1ASMSRC = arm/lib1funcs.S
  LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
diff --git a/packages/gcc-linaro/4.8-2015.06/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/4.8-2015.06/0012-arm_unbreak_armv4t.patch
index 37f8f2a..7c37445 100644
--- a/packages/gcc-linaro/4.8-2015.06/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0012-arm_unbreak_armv4t.patch
@@ -1,5 +1,9 @@
 http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
 
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -45,7 +45,7 @@
diff --git a/packages/gcc-linaro/4.8-2015.06/841-PR57717-E500v2.patch b/packages/gcc-linaro/4.8-2015.06/0013-PR57717-E500v2.patch
index a011e24..079a0f2 100644
--- a/packages/gcc-linaro/4.8-2015.06/841-PR57717-E500v2.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0013-PR57717-E500v2.patch
@@ -7,10 +7,13 @@ Signed-off-by: Julian Brown <Julian_Brown@mentor.com>
 fix for PR57717 (PowerPC E500v2)
 http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html
 
-diff -Nura gcc-4.8.3/gcc/config/rs6000/rs6000.c gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c
---- gcc-4.8.3/gcc/config/rs6000/rs6000.c	2014-05-04 23:18:35.000000000 -0300
-+++ gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c	2014-05-22 15:20:12.554270919 -0300
-@@ -7343,9 +7343,7 @@
+---
+ gcc/config/rs6000/rs6000.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -7479,9 +7479,7 @@
        && GET_CODE (XEXP (x, 1)) == CONST_INT
        && reg_offset_p
        && !SPE_VECTOR_MODE (mode)
diff --git a/packages/gcc-linaro/4.8-2015.06/842-PR60155.patch b/packages/gcc-linaro/4.8-2015.06/0014-PR60155.patch
index 7bc2122..f9603c8 100644
--- a/packages/gcc-linaro/4.8-2015.06/842-PR60155.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0014-PR60155.patch
@@ -3,9 +3,13 @@ Upstream status: in trunk.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
---- trunk/gcc/gcse.c	2014/02/12 14:50:06	207726
-+++ trunk/gcc/gcse.c	2014/04/04 22:25:51	209134
-@@ -2502,6 +2502,65 @@
+---
+ gcc/gcse.c |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 64 insertions(+), 7 deletions(-)
+
+--- a/gcc/gcse.c
++++ b/gcc/gcse.c
+@@ -2479,6 +2479,65 @@
        }
  }
  
@@ -71,7 +75,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  /* Emit move from SRC to DEST noting the equivalence with expression computed
     in INSN.  */
  
-@@ -2509,7 +2568,8 @@
+@@ -2486,7 +2545,8 @@
  gcse_emit_move_after (rtx dest, rtx src, rtx insn)
  {
    rtx new_rtx;
@@ -81,7 +85,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
    rtx note;
    rtx eqv = NULL_RTX;
  
-@@ -3369,13 +3429,12 @@
+@@ -3345,13 +3405,12 @@
  	      FOR_EACH_VEC_ELT (occrs_to_hoist, j, occr)
  		{
  		  rtx insn;
@@ -97,7 +101,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  
  		  /* Create a pseudo-reg to store the result of reaching
  		     expressions into.  Get the mode for the new pseudo
-@@ -3456,10 +3515,8 @@
+@@ -3432,10 +3491,8 @@
  {
    rtx reg;
    enum reg_class pressure_class;
diff --git a/packages/gcc-linaro/4.8-2015.06/843-aarch64-vmlaq_lane_s32-typo.patch b/packages/gcc-linaro/4.8-2015.06/0015-aarch64-vmlaq_lane_s32-typo.patch
index afa650c..d9ecb51 100644
--- a/packages/gcc-linaro/4.8-2015.06/843-aarch64-vmlaq_lane_s32-typo.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0015-aarch64-vmlaq_lane_s32-typo.patch
@@ -9,11 +9,13 @@ Change-Id: I4e35a764d369d378808dab29beefe34d1f93249b
 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 
-diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
-index 73c7e7d..92b0119 100644
+---
+ gcc/config/aarch64/arm_neon.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/aarch64/arm_neon.h
 +++ b/gcc/config/aarch64/arm_neon.h
-@@ -9984,7 +9984,7 @@
+@@ -8303,7 +8303,7 @@
  #define vmlaq_lane_s32(a, b, c, d)                                      \
    __extension__                                                         \
      ({                                                                  \
diff --git a/packages/gcc-linaro/4.8-2015.06/850-libstdcxx-uclibc-c99.patch b/packages/gcc-linaro/4.8-2015.06/0016-libstdcxx-uclibc-c99.patch
index 792976f..21df8cf 100644
--- a/packages/gcc-linaro/4.8-2015.06/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0016-libstdcxx-uclibc-c99.patch
@@ -15,8 +15,28 @@ that uClibc defines the __UCLIBC__ definition.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
+---
+ libstdc++-v3/config/locale/generic/c_locale.h     |    2 +-
+ libstdc++-v3/config/locale/gnu/c_locale.h         |    2 +-
+ libstdc++-v3/include/bits/basic_string.h          |    2 +-
+ libstdc++-v3/include/bits/locale_facets.tcc       |    2 +-
+ libstdc++-v3/include/bits/locale_facets_nonio.tcc |    2 +-
+ libstdc++-v3/include/c_compatibility/math.h       |    2 +-
+ libstdc++-v3/include/c_compatibility/wchar.h      |    2 +-
+ libstdc++-v3/include/c_global/cstdio              |    2 +-
+ libstdc++-v3/include/c_global/cstdlib             |    2 +-
+ libstdc++-v3/include/c_global/cwchar              |    4 ++--
+ libstdc++-v3/include/c_std/cstdio                 |    2 +-
+ libstdc++-v3/include/c_std/cstdlib                |    2 +-
+ libstdc++-v3/include/c_std/cwchar                 |    2 +-
+ libstdc++-v3/include/ext/vstring.h                |    2 +-
+ libstdc++-v3/include/tr1/cstdio                   |    2 +-
+ libstdc++-v3/include/tr1/cstdlib                  |    2 +-
+ libstdc++-v3/include/tr1/cwchar                   |    2 +-
+ libstdc++-v3/include/tr1/stdlib.h                 |    2 +-
+ libstdc++-v3/src/c++11/debug.cc                   |    2 +-
+ 19 files changed, 20 insertions(+), 20 deletions(-)
+
 --- a/libstdc++-v3/config/locale/generic/c_locale.h
 +++ b/libstdc++-v3/config/locale/generic/c_locale.h
 @@ -70,7 +70,7 @@
@@ -28,8 +48,6 @@ Index: b/libstdc++-v3/config/locale/generic/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
 --- a/libstdc++-v3/config/locale/gnu/c_locale.h
 +++ b/libstdc++-v3/config/locale/gnu/c_locale.h
 @@ -88,7 +88,7 @@
@@ -41,8 +59,6 @@ Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
 --- a/libstdc++-v3/include/bits/basic_string.h
 +++ b/libstdc++-v3/include/bits/basic_string.h
 @@ -2809,7 +2809,7 @@
@@ -54,8 +70,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
       && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
  
  #include <ext/string_conversions.h>
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets.tcc
 @@ -987,7 +987,7 @@
@@ -67,8 +81,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets.tcc
  	// First try a buffer perhaps big enough (most probably sufficient
  	// for non-ios_base::fixed outputs)
  	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 @@ -572,7 +572,7 @@
@@ -80,8 +92,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
        // First try a buffer perhaps big enough.
        int __cs_size = 64;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/math.h
 +++ b/libstdc++-v3/include/c_compatibility/math.h
 @@ -56,7 +56,7 @@
@@ -93,8 +103,6 @@ Index: b/libstdc++-v3/include/c_compatibility/math.h
  using std::fpclassify;
  using std::isfinite;
  using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/wchar.h
 +++ b/libstdc++-v3/include/c_compatibility/wchar.h
 @@ -103,7 +103,7 @@
@@ -106,8 +114,6 @@ Index: b/libstdc++-v3/include/c_compatibility/wchar.h
  using std::wcstold;
  using std::wcstoll;
  using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdlib
 +++ b/libstdc++-v3/include/c_global/cstdlib
 @@ -182,7 +182,7 @@
@@ -119,8 +125,6 @@ Index: b/libstdc++-v3/include/c_global/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_global/cwchar
 +++ b/libstdc++-v3/include/c_global/cwchar
 @@ -232,7 +232,7 @@
@@ -141,8 +145,6 @@ Index: b/libstdc++-v3/include/c_global/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdio
 +++ b/libstdc++-v3/include/c_std/cstdio
 @@ -139,7 +139,7 @@
@@ -154,8 +156,6 @@ Index: b/libstdc++-v3/include/c_std/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdlib
 +++ b/libstdc++-v3/include/c_std/cstdlib
 @@ -180,7 +180,7 @@
@@ -167,8 +167,6 @@ Index: b/libstdc++-v3/include/c_std/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_std/cwchar
 +++ b/libstdc++-v3/include/c_std/cwchar
 @@ -228,7 +228,7 @@
@@ -180,8 +178,6 @@ Index: b/libstdc++-v3/include/c_std/cwchar
  
  #undef wcstold
  #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
 --- a/libstdc++-v3/include/ext/vstring.h
 +++ b/libstdc++-v3/include/ext/vstring.h
 @@ -2571,7 +2571,7 @@
@@ -193,8 +189,6 @@ Index: b/libstdc++-v3/include/ext/vstring.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdio
 +++ b/libstdc++-v3/include/tr1/cstdio
 @@ -33,7 +33,7 @@
@@ -206,8 +200,6 @@ Index: b/libstdc++-v3/include/tr1/cstdio
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdlib
 +++ b/libstdc++-v3/include/tr1/cstdlib
 @@ -35,7 +35,7 @@
@@ -219,8 +211,6 @@ Index: b/libstdc++-v3/include/tr1/cstdlib
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
 --- a/libstdc++-v3/include/tr1/cwchar
 +++ b/libstdc++-v3/include/tr1/cwchar
 @@ -52,7 +52,7 @@
@@ -232,8 +222,6 @@ Index: b/libstdc++-v3/include/tr1/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
 --- a/libstdc++-v3/include/tr1/stdlib.h
 +++ b/libstdc++-v3/include/tr1/stdlib.h
 @@ -33,7 +33,7 @@
@@ -245,8 +233,6 @@ Index: b/libstdc++-v3/include/tr1/stdlib.h
  
  using std::tr1::atoll;
  using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
 --- a/libstdc++-v3/src/c++11/debug.cc
 +++ b/libstdc++-v3/src/c++11/debug.cc
 @@ -787,7 +787,7 @@
@@ -258,8 +244,6 @@ Index: b/libstdc++-v3/src/c++11/debug.cc
        std::snprintf(__buf, __n, __fmt, __s);
  #else
        std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdio
 +++ b/libstdc++-v3/include/c_global/cstdio
 @@ -139,7 +139,7 @@
diff --git a/packages/gcc-linaro/4.8-2015.06/851-PR-other-56780.patch b/packages/gcc-linaro/4.8-2015.06/0017-PR-other-56780.patch
index feb4339..e393ec3 100644
--- a/packages/gcc-linaro/4.8-2015.06/851-PR-other-56780.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0017-PR-other-56780.patch
@@ -28,16 +28,14 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-8
   Remove the ChangeLog]
 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
 ---
- libiberty/Makefile.in  | 24 ++++++++++-----------
- libiberty/configure    | 57 +++++++++++++++++++++++++++-----------------------
- libiberty/configure.ac | 47 ++++++++++++++++++++++-------------------
+ libiberty/Makefile.in  |   24 ++++++++++----------
+ libiberty/configure    |   57 ++++++++++++++++++++++++++-----------------------
+ libiberty/configure.ac |   47 +++++++++++++++++++++-------------------
  3 files changed, 68 insertions(+), 60 deletions(-)
 
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index f6a3ebd..75ff82d 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
-@@ -355,19 +355,19 @@ install-strip: install
+@@ -355,19 +355,19 @@
  # since it will be passed the multilib flags.
  MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
  install_to_libdir: all
@@ -69,11 +67,9 @@ index f6a3ebd..75ff82d 100644
  	fi
  	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
  
-diff --git a/libiberty/configure b/libiberty/configure
-index 5367027..4feb95a 100755
 --- a/libiberty/configure
 +++ b/libiberty/configure
-@@ -675,8 +675,8 @@ with_cross_host
+@@ -675,8 +675,8 @@
  with_newlib
  enable_maintainer_mode
  enable_multilib
@@ -83,7 +79,7 @@ index 5367027..4feb95a 100755
  '
        ac_precious_vars='build_alias
  host_alias
-@@ -1303,8 +1303,8 @@ Optional Features:
+@@ -1303,8 +1303,8 @@
                            enable make rules and dependencies not useful
                            (and sometimes confusing) to the casual installer
    --enable-multilib       build many library versions (default)
@@ -93,7 +89,7 @@ index 5367027..4feb95a 100755
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
+@@ -2784,6 +2784,35 @@
     cross_compiling=maybe
  fi
  
@@ -129,7 +125,7 @@ index 5367027..4feb95a 100755
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -5476,7 +5505,6 @@ fi
+@@ -5476,7 +5505,6 @@
  
  setobjs=
  CHECK=
@@ -137,7 +133,7 @@ index 5367027..4feb95a 100755
  if test -n "${with_target_subdir}"; then
  
    # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -5759,29 +5787,6 @@ _ACEOF
+@@ -5759,29 +5787,6 @@
  
    esac
  
@@ -167,11 +163,9 @@ index 5367027..4feb95a 100755
  else
  
     # Not a target library, so we set things up to run the test suite.
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index c763894..f17e6b6 100644
 --- a/libiberty/configure.ac
 +++ b/libiberty/configure.ac
-@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \
+@@ -128,6 +128,31 @@
     cross_compiling=maybe
  fi
  
@@ -203,7 +197,7 @@ index c763894..f17e6b6 100644
  GCC_NO_EXECUTABLES
  AC_PROG_CC
  AC_SYS_LARGEFILE
-@@ -380,7 +405,6 @@ fi
+@@ -380,7 +405,6 @@
  
  setobjs=
  CHECK=
@@ -211,7 +205,7 @@ index c763894..f17e6b6 100644
  if test -n "${with_target_subdir}"; then
  
    # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -492,27 +516,6 @@ if test -n "${with_target_subdir}"; then
+@@ -492,27 +516,6 @@
  
    esac
  
@@ -239,6 +233,3 @@ index c763894..f17e6b6 100644
  else
  
     # Not a target library, so we set things up to run the test suite.
--- 
-1.9.3
-
diff --git a/packages/gcc-linaro/4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc-linaro/4.8-2015.06/0018-xtensa-add-mauto-litpools-option.patch
index aa1376c..6a22717 100644
--- a/packages/gcc-linaro/4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0018-xtensa-add-mauto-litpools-option.patch
@@ -39,17 +39,15 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: r226828
 Changes to ChangeLogs and documentation are dropped.
 
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
+ gcc/config/xtensa/constraints.md |    5 +++++
+ gcc/config/xtensa/elf.h          |    4 +++-
+ gcc/config/xtensa/linux.h        |    4 +++-
+ gcc/config/xtensa/predicates.md  |    3 ++-
+ gcc/config/xtensa/xtensa.c       |   19 ++++++++++++++++++-
+ gcc/config/xtensa/xtensa.md      |   35 +++++++++++++++++++----------------
+ gcc/config/xtensa/xtensa.opt     |    4 ++++
  7 files changed, 54 insertions(+), 20 deletions(-)
 
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
 --- a/gcc/config/xtensa/constraints.md
 +++ b/gcc/config/xtensa/constraints.md
 @@ -111,6 +111,11 @@
@@ -64,11 +62,9 @@ index 30f4c1f..773d4f9 100644
  ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
  ;; causes reload to force some constants into the constant pool, but since
  ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
 --- a/gcc/config/xtensa/elf.h
 +++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
+@@ -48,7 +48,9 @@
    %{mtarget-align:--target-align} \
    %{mno-target-align:--no-target-align} \
    %{mlongcalls:--longcalls} \
@@ -79,11 +75,9 @@ index e59bede..12056f7 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
 --- a/gcc/config/xtensa/linux.h
 +++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
+@@ -42,7 +42,9 @@
    %{mtarget-align:--target-align} \
    %{mno-target-align:--no-target-align} \
    %{mlongcalls:--longcalls} \
@@ -94,8 +88,6 @@ index 675aacf..5b0243a 100644
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
  
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
 --- a/gcc/config/xtensa/predicates.md
 +++ b/gcc/config/xtensa/predicates.md
 @@ -142,7 +142,8 @@
@@ -108,11 +100,9 @@ index e02209e..d7dfa11 100644
  			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
  
  ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
+@@ -464,6 +464,9 @@
      {
        int dst_regnum = xt_true_regnum (operands[0]);
  
@@ -121,8 +111,8 @@ index eb039ba..206ff80 100644
 +
        /* The stack pointer can only be assigned with a MOVSP opcode.  */
        if (dst_regnum == STACK_POINTER_REGNUM)
- 	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
+ 	return (mode == SImode
+@@ -1031,7 +1034,7 @@
  	  return 1;
  	}
  
@@ -131,7 +121,7 @@ index eb039ba..206ff80 100644
  	{
  	  src = force_const_mem (SImode, src);
  	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2415,6 +2418,20 @@
  	}
        break;
  
@@ -152,11 +142,9 @@ index eb039ba..206ff80 100644
      default:
        if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
  	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
-@@ -761,8 +761,8 @@
+@@ -799,8 +799,8 @@
  })
  
  (define_insn "movsi_internal"
@@ -167,7 +155,7 @@ index 6d84384..0e673a3 100644
    "xtensa_valid_move (SImode, operands)"
    "@
     movi.n\t%0, %x1
-@@ -774,15 +774,16 @@
+@@ -812,15 +812,16 @@
     mov\t%0, %1
     movsp\t%0, %1
     movi\t%0, %x1
@@ -186,7 +174,7 @@ index 6d84384..0e673a3 100644
  
  ;; 16-bit Integer moves
  
-@@ -796,21 +797,22 @@
+@@ -834,21 +835,22 @@
  })
  
  (define_insn "movhi_internal"
@@ -213,7 +201,7 @@ index 6d84384..0e673a3 100644
  
  ;; 8-bit Integer moves
  
-@@ -881,7 +883,7 @@
+@@ -919,7 +921,7 @@
  	(match_operand:SF 1 "general_operand" ""))]
    ""
  {
@@ -222,7 +210,7 @@ index 6d84384..0e673a3 100644
      operands[1] = force_const_mem (SFmode, operands[1]);
  
    if ((!register_operand (operands[0], SFmode)
-@@ -896,8 +898,8 @@
+@@ -934,8 +936,8 @@
  })
  
  (define_insn "movsf_internal"
@@ -233,7 +221,7 @@ index 6d84384..0e673a3 100644
    "((register_operand (operands[0], SFmode)
       || register_operand (operands[1], SFmode))
      && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -912,13 +914,14 @@
+@@ -950,13 +952,14 @@
     mov\t%0, %1
     wfr\t%0, %1
     rfr\t%0, %1
@@ -250,7 +238,7 @@ index 6d84384..0e673a3 100644
  
  (define_insn "*lsiu"
    [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -991,7 +994,7 @@
+@@ -997,7 +1000,7 @@
  	(match_operand:DF 1 "general_operand" ""))]
    ""
  {
@@ -259,7 +247,7 @@ index 6d84384..0e673a3 100644
      operands[1] = force_const_mem (DFmode, operands[1]);
  
    if (!register_operand (operands[0], DFmode)
-@@ -1002,8 +1005,8 @@
+@@ -1008,8 +1011,8 @@
  })
  
  (define_insn_and_split "movdf_internal"
@@ -270,11 +258,9 @@ index 6d84384..0e673a3 100644
    "register_operand (operands[0], DFmode)
     || register_operand (operands[1], DFmode)"
    "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
 --- a/gcc/config/xtensa/xtensa.opt
 +++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
+@@ -38,6 +38,10 @@
  Target
  Intersperse literal pools with code in the text section
  
@@ -285,6 +271,3 @@ index 2fd6cee..21c6e96 100644
  mserialize-volatile
  Target Report Mask(SERIALIZE_VOLATILE)
  -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/871-xtensa-reimplement-register-spilling.patch b/packages/gcc-linaro/4.8-2015.06/0019-xtensa-reimplement-register-spilling.patch
index abc7a08..776914d 100644
--- a/packages/gcc-linaro/4.8-2015.06/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0019-xtensa-reimplement-register-spilling.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226962
 
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
+ libgcc/config/xtensa/lib2funcs.S |   30 +++++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
 
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
 --- a/libgcc/config/xtensa/lib2funcs.S
 +++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,10 +33,29 @@
  	.global	__xtensa_libgcc_window_spill
  	.type	__xtensa_libgcc_window_spill,@function
  __xtensa_libgcc_window_spill:
@@ -59,7 +57,7 @@ index 3ac8c1d..2e678af 100644
  	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
  
  
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
+@@ -58,10 +77,7 @@
  	entry	sp, 32
  
  	/* Flush registers.  */
@@ -71,6 +69,3 @@ index 3ac8c1d..2e678af 100644
  
  	/* Because the save area for a0-a3 is stored one frame below
  	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/packages/gcc-linaro/4.8-2015.06/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
index f23a5c0..ef753c1 100644
--- a/packages/gcc-linaro/4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
@@ -15,19 +15,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226963
 
- libgcc/config/xtensa/t-xtensa | 2 +-
+ libgcc/config/xtensa/t-xtensa |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
 --- a/libgcc/config/xtensa/t-xtensa
 +++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
+@@ -13,4 +13,4 @@
  LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
  
  LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
 -   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
 +   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch b/packages/gcc-linaro/4.8-2015.06/0021-xtensa-fix-_Unwind_GetCFA.patch
index dc40513..0fbaeec 100644
--- a/packages/gcc-linaro/4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0021-xtensa-fix-_Unwind_GetCFA.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226964
 
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
+ libgcc/config/xtensa/unwind-dw2-xtensa.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
 --- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
 +++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
+@@ -130,7 +130,7 @@
  _Unwind_Word
  _Unwind_GetCFA (struct _Unwind_Context *context)
  {
@@ -35,6 +33,3 @@ index 35f7797..ef6b900 100644
  }
  
  /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/874-gcc-xtensa-fix-fprintf-format-specifiers.patch b/packages/gcc-linaro/4.8-2015.06/0022-gcc-xtensa-fix-fprintf-format-specifiers.patch
index 6013fef..52d0ee5 100644
--- a/packages/gcc-linaro/4.8-2015.06/874-gcc-xtensa-fix-fprintf-format-specifiers.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0022-gcc-xtensa-fix-fprintf-format-specifiers.patch
@@ -17,14 +17,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 10 +++++-----
+ gcc/config/xtensa/xtensa.c |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index dbc5bd3..466adb5 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1772,7 +1772,7 @@ xtensa_emit_call (int callop, rtx *operands)
+@@ -1773,7 +1773,7 @@
    rtx tgt = operands[callop];
  
    if (GET_CODE (tgt) == CONST_INT)
@@ -33,7 +31,7 @@ index dbc5bd3..466adb5 100644
    else if (register_operand (tgt, VOIDmode))
      sprintf (result, "callx8\t%%%d", callop);
    else
-@@ -2347,14 +2347,14 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2348,14 +2348,14 @@
  
      case 'L':
        if (GET_CODE (x) == CONST_INT)
@@ -50,7 +48,7 @@ index dbc5bd3..466adb5 100644
        else
  	output_operand_lossage ("invalid %%R value");
        break;
-@@ -2368,7 +2368,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2369,7 +2369,7 @@
  
      case 'd':
        if (GET_CODE (x) == CONST_INT)
@@ -59,7 +57,7 @@ index dbc5bd3..466adb5 100644
        else
  	output_operand_lossage ("invalid %%d value");
        break;
-@@ -2437,7 +2437,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2438,7 +2438,7 @@
        else if (GET_CODE (x) == MEM)
  	output_address (XEXP (x, 0));
        else if (GET_CODE (x) == CONST_INT)
@@ -68,6 +66,3 @@ index dbc5bd3..466adb5 100644
        else
  	output_addr_const (file, x);
      }
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/875-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/4.8-2015.06/0023-xtensa-fix-PR-target-82181.patch
index 0a011a6..7476071 100644
--- a/packages/gcc-linaro/4.8-2015.06/875-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0023-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 466adb5103ca..3ba2965ecf5e 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -599,6 +599,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
+@@ -599,6 +599,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 466adb5103ca..3ba2965ecf5e 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/900-musl-support.patch b/packages/gcc-linaro/4.8-2015.06/0024-musl-support.patch
index 6743a88..8e36bfb 100644
--- a/packages/gcc-linaro/4.8-2015.06/900-musl-support.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0024-musl-support.patch
@@ -22,8 +22,32 @@ https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [Gustavo: Update for gcc 4.8.3]
 
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
+---
+ fixincludes/mkfixinc.sh            |    3 -
+ gcc/config.gcc                     |    9 ++-
+ gcc/config/aarch64/aarch64-linux.h |    5 +
+ gcc/config/arm/linux-eabi.h        |   17 +++++
+ gcc/config/i386/linux.h            |    2 
+ gcc/config/i386/linux64.h          |    7 ++
+ gcc/config/linux.h                 |  111 ++++++++++++++++++++++++++++++++-----
+ gcc/config/linux.opt               |    4 +
+ gcc/config/microblaze/linux.h      |   18 +++++-
+ gcc/config/mips/linux.h            |    8 ++
+ gcc/config/mips/linux64.h          |    2 
+ gcc/config/rs6000/linux64.h        |   14 +++-
+ gcc/config/rs6000/secureplt.h      |    1 
+ gcc/config/rs6000/sysv4.h          |   16 ++++-
+ gcc/config/sh/linux.h              |    8 ++
+ gcc/configure                      |    3 +
+ gcc/configure.ac                   |    3 +
+ gcc/ginclude/stddef.h              |    3 +
+ libgcc/unwind-dw2-fde-dip.c        |    7 ++
+ libgomp/config/posix/time.c        |    2 
+ libitm/config/arm/hwcap.cc         |    4 +
+ libitm/config/linux/x86/tls.h      |    8 ++
+ libstdc++-v3/configure.host        |   10 +++
+ 23 files changed, 238 insertions(+), 27 deletions(-)
+
 --- a/fixincludes/mkfixinc.sh
 +++ b/fixincludes/mkfixinc.sh
 @@ -19,7 +19,8 @@
@@ -36,8 +60,6 @@ Index: b/fixincludes/mkfixinc.sh
  	#  IF there is no include fixing,
  	#  THEN create a no-op fixer and exit
  	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,12 @@
@@ -53,8 +75,6 @@ Index: b/gcc/config/aarch64/aarch64-linux.h
  
  #define CPP_SPEC "%{pthread:-D_REENTRANT}"
  
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -77,6 +77,23 @@
@@ -81,8 +101,6 @@ Index: b/gcc/config/arm/linux-eabi.h
  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
     use the GNU/Linux version, not the generic BPABI version.  */
  #undef  LINK_SPEC
-Index: b/gcc/config/i386/linux64.h
-===================================================================
 --- a/gcc/config/i386/linux64.h
 +++ b/gcc/config/i386/linux64.h
 @@ -30,3 +30,10 @@
@@ -96,8 +114,6 @@ Index: b/gcc/config/i386/linux64.h
 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
 +#undef MUSL_DYNAMIC_LINKERX32
 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/i386/linux.h
-===================================================================
 --- a/gcc/config/i386/linux.h
 +++ b/gcc/config/i386/linux.h
 @@ -21,3 +21,5 @@
@@ -106,8 +122,6 @@ Index: b/gcc/config/i386/linux.h
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
 @@ -32,10 +32,12 @@
@@ -266,8 +280,6 @@ Index: b/gcc/config/linux.h
 +    { 0, 0, 0, 0, 0, 0 }				\
 +  }
 +#endif
-Index: b/gcc/config/linux.opt
-===================================================================
 --- a/gcc/config/linux.opt
 +++ b/gcc/config/linux.opt
 @@ -30,3 +30,7 @@
@@ -278,11 +290,9 @@ Index: b/gcc/config/linux.opt
 +mmusl
 +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
 +Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
 --- a/gcc/config/microblaze/linux.h
 +++ b/gcc/config/microblaze/linux.h
-@@ -25,7 +25,23 @@
+@@ -28,7 +28,23 @@
  #undef TLS_NEEDS_GOT
  #define TLS_NEEDS_GOT 1
  
@@ -307,8 +317,6 @@ Index: b/gcc/config/microblaze/linux.h
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
    { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/mips/linux64.h
-===================================================================
 --- a/gcc/config/mips/linux64.h
 +++ b/gcc/config/mips/linux64.h
 @@ -29,4 +29,4 @@
@@ -317,8 +325,6 @@ Index: b/gcc/config/mips/linux64.h
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_DYNAMIC_LINKERN32)
 +			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
 --- a/gcc/config/mips/linux.h
 +++ b/gcc/config/mips/linux.h
 @@ -18,3 +18,11 @@
@@ -333,11 +339,9 @@ Index: b/gcc/config/mips/linux.h
 +#endif
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -374,17 +374,23 @@
+@@ -370,17 +370,23 @@
  #endif
  #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
  #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
@@ -365,8 +369,6 @@ Index: b/gcc/config/rs6000/linux64.h
  
  #undef  DEFAULT_ASM_ENDIAN
  #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
 --- a/gcc/config/rs6000/secureplt.h
 +++ b/gcc/config/rs6000/secureplt.h
 @@ -18,3 +18,4 @@
@@ -374,8 +376,6 @@ Index: b/gcc/config/rs6000/secureplt.h
  
  #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
 +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
 @@ -537,6 +537,9 @@
@@ -428,8 +428,6 @@ Index: b/gcc/config/rs6000/sysv4.h
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-Index: b/gcc/config/sh/linux.h
-===================================================================
 --- a/gcc/config/sh/linux.h
 +++ b/gcc/config/sh/linux.h
 @@ -43,7 +43,15 @@
@@ -448,11 +446,9 @@ Index: b/gcc/config/sh/linux.h
  
  #undef SUBTARGET_LINK_EMUL_SUFFIX
  #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -550,7 +550,7 @@
+@@ -559,7 +559,7 @@
  esac
  
  # Common C libraries.
@@ -461,7 +457,7 @@ Index: b/gcc/config.gcc
  
  # Common parts for widely ported systems.
  case ${target} in
-@@ -653,6 +653,9 @@
+@@ -662,6 +662,9 @@
      *-*-*uclibc*)
        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
        ;;
@@ -471,7 +467,7 @@ Index: b/gcc/config.gcc
      *)
        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
        ;;
-@@ -2135,6 +2138,10 @@
+@@ -2142,6 +2145,10 @@
  	    powerpc*-*-linux*paired*)
  		tm_file="${tm_file} rs6000/750cl.h" ;;
  	esac
@@ -482,11 +478,9 @@ Index: b/gcc/config.gcc
  	if test x${enable_secureplt} = xyes; then
  		tm_file="rs6000/secureplt.h ${tm_file}"
  	fi
-Index: b/gcc/configure
-===================================================================
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -26936,6 +26940,9 @@
+@@ -26969,6 +26969,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -496,11 +490,9 @@ Index: b/gcc/configure
  esac
  
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4848,6 +4852,9 @@
+@@ -4875,6 +4875,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -510,8 +502,6 @@ Index: b/gcc/configure.ac
  esac
  GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
 --- a/gcc/ginclude/stddef.h
 +++ b/gcc/ginclude/stddef.h
 @@ -181,6 +181,7 @@
@@ -538,8 +528,6 @@ Index: b/gcc/ginclude/stddef.h
  #endif /* __size_t */
  #endif /* _SIZET_ */
  #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
 @@ -75,6 +75,13 @@
@@ -556,8 +544,6 @@ Index: b/libgcc/unwind-dw2-fde-dip.c
  #if defined(USE_PT_GNU_EH_FRAME)
  
  #include <link.h>
-Index: b/libgomp/config/posix/time.c
-===================================================================
 --- a/libgomp/config/posix/time.c
 +++ b/libgomp/config/posix/time.c
 @@ -28,6 +28,8 @@
@@ -569,8 +555,6 @@ Index: b/libgomp/config/posix/time.c
  #include "libgomp.h"
  #include <unistd.h>
  #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
 --- a/libitm/config/arm/hwcap.cc
 +++ b/libitm/config/arm/hwcap.cc
 @@ -40,7 +40,11 @@
@@ -585,8 +569,6 @@ Index: b/libitm/config/arm/hwcap.cc
  #include <elf.h>
  
  static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
 --- a/libitm/config/linux/x86/tls.h
 +++ b/libitm/config/linux/x86/tls.h
 @@ -25,16 +25,19 @@
@@ -618,11 +600,9 @@ Index: b/libitm/config/linux/x86/tls.h
 +#endif
  
  #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
 --- a/libstdc++-v3/configure.host
 +++ b/libstdc++-v3/configure.host
-@@ -264,6 +264,13 @@
+@@ -263,6 +263,13 @@
      os_include_dir="os/bsd/freebsd"
      ;;
    gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
@@ -636,7 +616,7 @@ Index: b/libstdc++-v3/configure.host
      if [ "$uclibc" = "yes" ]; then
        os_include_dir="os/uclibc"
      elif [ "$bionic" = "yes" ]; then
-@@ -272,6 +279,9 @@
+@@ -271,6 +278,9 @@
        os_include_dir="os/gnu-linux"
      fi
      ;;
diff --git a/packages/gcc-linaro/4.8-2015.06/950-cygwin64.patch b/packages/gcc-linaro/4.8-2015.06/0025-cygwin64.patch
index 67182ee..d39236a 100644
--- a/packages/gcc-linaro/4.8-2015.06/950-cygwin64.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0025-cygwin64.patch
@@ -1,5 +1,9 @@
---- gcc-4.8.5/gcc/config.host.orig	2017-02-10 20:45:10.425515700 -0800
-+++ gcc-4.8.5/gcc/config.host	2017-02-10 20:47:33.935525500 -0800
+---
+ gcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config.host
++++ b/gcc/config.host
 @@ -214,7 +214,7 @@
          ;;
      esac