Run all patches through renumbering and update

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

143 files changed, 1089 insertions, 1348 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 e7c9cf97..603e1c25 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 b970ebc8..0fed72dd 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.9-2017.01/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/4.8-2015.06/0002-libtool-leave-framework-alone.patch
index 525592e6..e67e0e88 100644
--- a/packages/gcc-linaro/4.9-2017.01/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/5.4-2017.05/100-uclibc-conf.patch b/packages/gcc-linaro/4.8-2015.06/0003-uclibc-conf.patch
index 73d1f0d3..aef750af 100644
--- a/packages/gcc-linaro/5.4-2017.05/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0003-uclibc-conf.patch
@@ -1,5 +1,7 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
+---
+ 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 @@
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 f195e308..3cea1a11 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 19e57bb0..c2a20462 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.9-2017.01/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 1c49fb0a..d8666619 100644
--- a/packages/gcc-linaro/4.9-2017.01/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 ac1d8461..b49d7dab 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/5.4-2017.05/301-missing-execinfo_h.patch b/packages/gcc-linaro/4.8-2015.06/0008-missing-execinfo_h.patch
index 2d0e7baa..c90222a1 100644
--- a/packages/gcc-linaro/5.4-2017.05/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0008-missing-execinfo_h.patch
@@ -1,5 +1,7 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
+---
+ 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 @@
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 35d5f502..c63f9116 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.9-2017.01/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 c3bab158..f29c5a21 100644
--- a/packages/gcc-linaro/4.9-2017.01/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.9.4.orig/gcc/configure gcc-4.9.4/gcc/configure
---- gcc-4.9.4.orig/gcc/configure	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure	2017-02-11 16:54:52.879474293 -0800
-@@ -28058,6 +28058,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.9.4.orig/gcc/configure gcc-4.9.4/gcc
  
  case "${host}" in
    *-*-darwin*)
-@@ -28069,6 +28072,11 @@ case "${host}" in
+@@ -27377,6 +27380,11 @@
        export_sym_check=
      fi
    ;;
@@ -23,7 +27,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -28181,23 +28189,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.9.4.orig/gcc/configure gcc-4.9.4/gcc
    ;
    return 0;
  }
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/gcc/configure.ac
---- gcc-4.9.4.orig/gcc/configure.ac	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure.ac	2017-02-11 16:49:59.820965424 -0800
-@@ -5583,6 +5583,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.9.4.orig/gcc/configure.ac gcc-4.9.4/
  
  case "${host}" in
    *-*-darwin*)
-@@ -5594,6 +5597,11 @@ case "${host}" in
+@@ -5255,6 +5258,11 @@
        export_sym_check=
      fi
    ;;
@@ -79,7 +82,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -5645,17 +5653,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/6.4-2017.08/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/4.8-2015.06/0011-arm-softfloat-libgcc.patch
index 5efa7fd1..7b0265a9 100644
--- a/packages/gcc-linaro/6.4-2017.08/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0011-arm-softfloat-libgcc.patch
@@ -1,8 +1,11 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ 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
-@@ -60,7 +60,7 @@
+@@ -55,7 +55,7 @@
     %{shared:-lc} \
     %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
  
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/4.8-2015.06/0012-arm_unbreak_armv4t.patch
index 37f8f2a5..7c374453 100644
--- a/packages/gcc-linaro/4.9-2017.01/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 a011e241..079a0f23 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 7bc2122f..f9603c82 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 afa650c8..d9ecb51f 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 792976fd..21df8cf3 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 feb43392..e393ec36 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 aa1376c4..6a22717c 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.9-2017.01/871-xtensa-reimplement-register-spilling.patch b/packages/gcc-linaro/4.8-2015.06/0019-xtensa-reimplement-register-spilling.patch
index abc7a08e..776914d1 100644
--- a/packages/gcc-linaro/4.9-2017.01/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.9-2017.01/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 f23a5c07..ef753c1a 100644
--- a/packages/gcc-linaro/4.9-2017.01/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 dc405132..0fbaeec3 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 6013fef7..52d0ee56 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 0a011a6b..7476071a 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 6743a88b..8e36bfbd 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 67182eec..d39236a5 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
diff --git a/packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index c8cb377d..00000000
--- a/packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-@@ -55,7 +55,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #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
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/packages/gcc-linaro/4.9-2017.01/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/packages/gcc-linaro/4.9-2017.01/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
index 1a6f7e5f..4629c90e 100644
--- a/packages/gcc-linaro/4.9-2017.01/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
@@ -32,23 +32,21 @@ build-many-glibcs.py.
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
- libgcc/config/aarch64/linux-unwind.h | 2 +-
- libgcc/config/alpha/linux-unwind.h   | 2 +-
- libgcc/config/bfin/linux-unwind.h    | 2 +-
- libgcc/config/i386/linux-unwind.h    | 4 ++--
- libgcc/config/m68k/linux-unwind.h    | 2 +-
- libgcc/config/nios2/linux-unwind.h   | 2 +-
- libgcc/config/pa/linux-unwind.h      | 2 +-
- libgcc/config/sh/linux-unwind.h      | 2 +-
- libgcc/config/tilepro/linux-unwind.h | 2 +-
- libgcc/config/xtensa/linux-unwind.h  | 2 +-
+ libgcc/config/aarch64/linux-unwind.h |    2 +-
+ libgcc/config/alpha/linux-unwind.h   |    2 +-
+ libgcc/config/bfin/linux-unwind.h    |    2 +-
+ libgcc/config/i386/linux-unwind.h    |    4 ++--
+ libgcc/config/m68k/linux-unwind.h    |    2 +-
+ libgcc/config/nios2/linux-unwind.h   |    2 +-
+ libgcc/config/pa/linux-unwind.h      |    2 +-
+ libgcc/config/sh/linux-unwind.h      |    2 +-
+ libgcc/config/tilepro/linux-unwind.h |    2 +-
+ libgcc/config/xtensa/linux-unwind.h  |    2 +-
  10 files changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
-index 86d17b1c798..909f68f7311 100644
 --- a/libgcc/config/aarch64/linux-unwind.h
 +++ b/libgcc/config/aarch64/linux-unwind.h
-@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
    struct rt_sigframe
    {
      siginfo_t info;
@@ -57,11 +55,9 @@ index 86d17b1c798..909f68f7311 100644
    };
  
    struct rt_sigframe *rt_;
-diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
-index d65474fec12..9a226b195b5 100644
 --- a/libgcc/config/alpha/linux-unwind.h
 +++ b/libgcc/config/alpha/linux-unwind.h
-@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+@@ -51,7 +51,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -70,11 +66,9 @@ index d65474fec12..9a226b195b5 100644
        } *rt_ = context->cfa;
        sc = &rt_->uc.uc_mcontext;
      }
-diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
-index 0c270e435c7..7fa95d2dc96 100644
 --- a/libgcc/config/bfin/linux-unwind.h
 +++ b/libgcc/config/bfin/linux-unwind.h
-@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
  	void *puc;
  	char retcode[8];
  	siginfo_t info;
@@ -83,11 +77,9 @@ index 0c270e435c7..7fa95d2dc96 100644
        } *rt_ = context->cfa;
  
        /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
-index e54bf73b1fd..d35fc4566ce 100644
 --- a/libgcc/config/i386/linux-unwind.h
 +++ b/libgcc/config/i386/linux-unwind.h
-@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -58,7 +58,7 @@
    if (*(unsigned char *)(pc+0) == 0x48
        && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
      {
@@ -96,7 +88,7 @@ index e54bf73b1fd..d35fc4566ce 100644
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
           because it does not alias anything.  */
-@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+@@ -138,7 +138,7 @@
  	siginfo_t *pinfo;
  	void *puc;
  	siginfo_t info;
@@ -105,11 +97,9 @@ index e54bf73b1fd..d35fc4566ce 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
-index fb79a4d63cd..b2f5ea4cd7c 100644
 --- a/libgcc/config/m68k/linux-unwind.h
 +++ b/libgcc/config/m68k/linux-unwind.h
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,7 +33,7 @@
  /* <sys/ucontext.h> is unfortunately broken right now.  */
  struct uw_ucontext {
  	unsigned long	  uc_flags;
@@ -118,11 +108,9 @@ index fb79a4d63cd..b2f5ea4cd7c 100644
  	stack_t		  uc_stack;
  	mcontext_t	  uc_mcontext;
  	unsigned long	  uc_filler[80];
-diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
-index dff1c20076e..1d88afecb12 100644
 --- a/libgcc/config/nios2/linux-unwind.h
 +++ b/libgcc/config/nios2/linux-unwind.h
-@@ -38,7 +38,7 @@ struct nios2_mcontext {
+@@ -38,7 +38,7 @@
  
  struct nios2_ucontext {
    unsigned long uc_flags;
@@ -131,11 +119,9 @@ index dff1c20076e..1d88afecb12 100644
    stack_t uc_stack;
    struct nios2_mcontext uc_mcontext;
    sigset_t uc_sigmask;	/* mask last for extensibility */
-diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
-index 01494685ea4..91575356803 100644
 --- a/libgcc/config/pa/linux-unwind.h
 +++ b/libgcc/config/pa/linux-unwind.h
-@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+@@ -80,7 +80,7 @@
    struct sigcontext *sc;
    struct rt_sigframe {
      siginfo_t info;
@@ -144,11 +130,9 @@ index 01494685ea4..91575356803 100644
    } *frame;
  
    /* rt_sigreturn trampoline:
-diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
-index e63091f287c..67033f06b4b 100644
 --- a/libgcc/config/sh/linux-unwind.h
 +++ b/libgcc/config/sh/linux-unwind.h
-@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+@@ -180,7 +180,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -157,11 +141,9 @@ index e63091f287c..67033f06b4b 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
-index fd83ba7c275..e3c9ef0840d 100644
 --- a/libgcc/config/tilepro/linux-unwind.h
 +++ b/libgcc/config/tilepro/linux-unwind.h
-@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+@@ -61,7 +61,7 @@
    struct rt_sigframe {
      unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
      siginfo_t info;
@@ -170,11 +152,9 @@ index fd83ba7c275..e3c9ef0840d 100644
    } *rt_;
  
    /* Return if this is not a signal handler.  */
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738ff57..ff6b66373a9 100644
 --- a/libgcc/config/xtensa/linux-unwind.h
 +++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -64,7 +64,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -63,7 +63,7 @@
  
    struct rt_sigframe {
      siginfo_t info;
@@ -183,6 +163,3 @@ index 9daf738ff57..ff6b66373a9 100644
    } *rt_;
  
    /* movi a2, __NR_rt_sigreturn; syscall */
--- 
-2.14.1
-
diff --git a/packages/gcc-linaro/4.9-2017.01/001-gcc_bug_62231.patch b/packages/gcc-linaro/4.9-2017.01/0001-gcc_bug_62231.patch
index e7c9cf97..3256f804 100644
--- a/packages/gcc-linaro/4.9-2017.01/001-gcc_bug_62231.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0001-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,11 +24,10 @@ 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
-@@ -225,7 +225,44 @@
-   emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
+--- a/gcc/dwarf2cfi.c
++++ b/gcc/dwarf2cfi.c
+@@ -252,7 +252,44 @@
+ 		  gen_int_mode (size, mode));
  }
  
 -/* Generate code to initialize the register size table.  */
@@ -68,13 +72,15 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
  
  void
  expand_builtin_init_dwarf_reg_sizes (tree address)
-@@ -238,30 +275,21 @@
+@@ -265,30 +302,21 @@
  
    for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
      {
 -      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.9-2017.01/002-gcc_bug_62231.patch b/packages/gcc-linaro/4.9-2017.01/0002-gcc_bug_62231.patch
index b970ebc8..953af509 100644
--- a/packages/gcc-linaro/4.9-2017.01/002-gcc_bug_62231.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0002-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
+@@ -1707,7 +1707,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.9-2017.01/0003-libtool-leave-framework-alone.patch
index 525592e6..e67e0e88 100644
--- a/packages/gcc-linaro/4.8-2015.06/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0003-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/7.1-2017.08/100-uclibc-conf.patch b/packages/gcc-linaro/4.9-2017.01/0004-uclibc-conf.patch
index 73d1f0d3..aef750af 100644
--- a/packages/gcc-linaro/7.1-2017.08/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0004-uclibc-conf.patch
@@ -1,5 +1,7 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
+---
+ 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 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/1100-msp430-string-literals.patch b/packages/gcc-linaro/4.9-2017.01/0005-msp430-string-literals.patch
index 346842e8..c65911f7 100644
--- a/packages/gcc-linaro/4.9-2017.01/1100-msp430-string-literals.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0005-msp430-string-literals.patch
@@ -12,11 +12,13 @@ Date:   Wed May 13 01:11:13 2015 +0000
     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223106 138bc75d-0d04-0410-961f-82ee72b054a4
 
 [4.9 change: remove non-applicable parts of the patch]
-diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
-index bec168ca2ae..58d0efea1de 100644
+---
+ gcc/config/msp430/msp430.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/msp430/msp430.c
 +++ b/gcc/config/msp430/msp430.c
-@@ -2248,7 +2248,7 @@ static struct
+@@ -1629,7 +1629,7 @@
  }
    const_shift_helpers[] =
  {
diff --git a/packages/gcc-linaro/4.9-2017.01/111-pr65730.patch b/packages/gcc-linaro/4.9-2017.01/0006-pr65730.patch
index 8a41fd2a..6bcab27e 100644
--- a/packages/gcc-linaro/4.9-2017.01/111-pr65730.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0006-pr65730.patch
@@ -13,11 +13,9 @@ 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(-)
 
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
 @@ -1436,8 +1436,9 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/packages/gcc-linaro/4.9-2017.01/0007-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
index bb77c4b9..6c048479 100644
--- a/packages/gcc-linaro/4.9-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0007-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
@@ -8,14 +8,12 @@ Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
 
 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 ---
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ gcc/config.gcc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -441,7 +441,7 @@
+@@ -442,7 +442,7 @@
  	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
  	need_64bit_hwint=yes
  	case x$with_cpu in
diff --git a/packages/gcc-linaro/4.9-2017.01/130-pr43538.patch b/packages/gcc-linaro/4.9-2017.01/0008-pr43538.patch
index 19e57bb0..c2a20462 100644
--- a/packages/gcc-linaro/4.9-2017.01/130-pr43538.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0008-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.9-2017.01/0009-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
index 1c49fb0a..d8666619 100644
--- a/packages/gcc-linaro/4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0009-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.9-2017.01/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch b/packages/gcc-linaro/4.9-2017.01/0010-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
index 55f32288..28ced14a 100644
--- a/packages/gcc-linaro/4.9-2017.01/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0010-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
@@ -9,14 +9,12 @@ but this one file must be built with 32-bit off_t. More details in the code.
 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220328 91177308-0d34-0410-b5e6-96231b3b80d8
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 8 ++++++++
+ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index bbc1108..fc09522 100644
 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
 +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -13,7 +13,15 @@
+@@ -13,6 +13,14 @@
  
  #include "sanitizer_platform.h"
  #if SANITIZER_LINUX || SANITIZER_MAC
@@ -31,7 +29,3 @@ index bbc1108..fc09522 100644
  
  #include "sanitizer_internal_defs.h"
  #include "sanitizer_platform_limits_posix.h"
- 
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/6.4-2017.08/301-missing-execinfo_h.patch b/packages/gcc-linaro/4.9-2017.01/0011-missing-execinfo_h.patch
index 2d0e7baa..c90222a1 100644
--- a/packages/gcc-linaro/6.4-2017.08/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0011-missing-execinfo_h.patch
@@ -1,5 +1,7 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
+---
+ 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 @@
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.9-2017.01/0012-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index 3cf66b25..0e7c80f1 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.9-2017.01/0012-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
+@@ -28059,6 +28059,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
+@@ -28070,6 +28073,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
+@@ -28182,23 +28190,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
+@@ -5583,6 +5583,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
+@@ -5594,6 +5597,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
+@@ -5645,17 +5653,17 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/7.1-2017.08/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/4.9-2017.01/0013-arm-softfloat-libgcc.patch
index 5efa7fd1..350857dd 100644
--- a/packages/gcc-linaro/7.1-2017.08/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0013-arm-softfloat-libgcc.patch
@@ -1,5 +1,8 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ 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
 @@ -60,7 +60,7 @@
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc-linaro/4.8-2015.06/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/4.9-2017.01/0014-arm_unbreak_armv4t.patch
index 37f8f2a5..7c374453 100644
--- a/packages/gcc-linaro/4.8-2015.06/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0014-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.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch b/packages/gcc-linaro/4.9-2017.01/0015-microblaze-enable-dwarf-eh-support.patch
index 03fc47f1..68b839a7 100644
--- a/packages/gcc-linaro/4.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0015-microblaze-enable-dwarf-eh-support.patch
@@ -26,15 +26,13 @@ Changelog
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 ---
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
+ gcc/common/config/microblaze/microblaze-common.c |    3 --
+ gcc/config/microblaze/microblaze-protos.h        |    1 
+ gcc/config/microblaze/microblaze.c               |   29 +++++++++++++++++++----
+ gcc/config/microblaze/microblaze.h               |   15 +++++++++++
+ gcc/config/microblaze/microblaze.md              |   11 ++++++++
  5 files changed, 52 insertions(+), 7 deletions(-)
 
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
 --- a/gcc/common/config/microblaze/microblaze-common.c
 +++ b/gcc/common/config/microblaze/microblaze-common.c
 @@ -37,7 +37,4 @@
@@ -45,8 +43,6 @@ Index: b/gcc/common/config/microblaze/microblaze-common.c
 -#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
 -
  struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze-protos.h
 +++ b/gcc/config/microblaze/microblaze-protos.h
 @@ -54,6 +54,7 @@
@@ -57,8 +53,6 @@ Index: b/gcc/config/microblaze/microblaze-protos.h
  #endif  /* RTX_CODE */
  
  /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
 --- a/gcc/config/microblaze/microblaze.c
 +++ b/gcc/config/microblaze/microblaze.c
 @@ -1906,6 +1906,11 @@
@@ -118,8 +112,6 @@ Index: b/gcc/config/microblaze/microblaze.c
  }
  
  /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze.h
 +++ b/gcc/config/microblaze/microblaze.h
 @@ -184,6 +184,21 @@
@@ -144,8 +136,6 @@ Index: b/gcc/config/microblaze/microblaze.h
  /* Use DWARF 2 debugging information by default.  */
  #define DWARF2_DEBUGGING_INFO
  #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
 --- a/gcc/config/microblaze/microblaze.md
 +++ b/gcc/config/microblaze/microblaze.md
 @@ -2261,4 +2261,15 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/850-libstdcxx-uclibc-c99.patch b/packages/gcc-linaro/4.9-2017.01/0016-libstdcxx-uclibc-c99.patch
index 533d01fa..5a765de1 100644
--- a/packages/gcc-linaro/4.9-2017.01/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0016-libstdcxx-uclibc-c99.patch
@@ -16,8 +16,28 @@ that uClibc defines the __UCLIBC__ definition.
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [Gustavo: update for 4.9.3]
 
-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 @@
@@ -29,8 +49,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 @@
@@ -42,8 +60,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
 @@ -2843,7 +2843,7 @@
@@ -55,8 +71,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
  
  #include <ext/string_conversions.h>
  
-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 @@
@@ -68,8 +82,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/bits/locale_facets.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets.tcc
 @@ -987,7 +987,7 @@
@@ -81,8 +93,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/c_compatibility/math.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/math.h
 +++ b/libstdc++-v3/include/c_compatibility/math.h
 @@ -56,7 +56,7 @@
@@ -94,8 +104,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 @@
@@ -107,8 +115,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/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdio
 +++ b/libstdc++-v3/include/c_global/cstdio
 @@ -146,7 +146,7 @@
@@ -120,8 +126,6 @@ Index: b/libstdc++-v3/include/c_global/cstdio
  
  #undef snprintf
  #undef vfscanf
-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 @@
@@ -133,8 +137,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 @@
@@ -155,8 +157,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
 @@ -144,7 +144,7 @@
@@ -168,8 +168,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 @@
@@ -181,8 +179,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 @@
@@ -194,8 +190,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
 @@ -2680,7 +2680,7 @@
@@ -207,8 +201,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 @@
@@ -220,8 +212,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 @@
@@ -233,8 +223,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 @@
@@ -246,8 +234,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 @@
@@ -259,8 +245,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
 @@ -788,7 +788,7 @@
diff --git a/packages/gcc-linaro/7.1-2017.08/860-cilk-wchar.patch b/packages/gcc-linaro/4.9-2017.01/0017-cilk-wchar.patch
index 1d9916f5..300837f0 100644
--- a/packages/gcc-linaro/7.1-2017.08/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0017-cilk-wchar.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
 --- a/libcilkrts/include/cilk/reducer_min_max.h
 +++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3154,7 +3154,9 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc-linaro/4.9-2017.01/0018-xtensa-add-mauto-litpools-option.patch
index 98c7b3f3..6cfa5215 100644
--- a/packages/gcc-linaro/4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch
+++ b/packages/gcc-linaro/4.9-2017.01/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(-)
 
-Index: b/gcc/config/xtensa/constraints.md
-===================================================================
 --- a/gcc/config/xtensa/constraints.md
 +++ b/gcc/config/xtensa/constraints.md
 @@ -111,6 +111,11 @@
@@ -64,8 +62,6 @@ Index: b/gcc/config/xtensa/constraints.md
  ;; 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
-Index: b/gcc/config/xtensa/elf.h
-===================================================================
 --- a/gcc/config/xtensa/elf.h
 +++ b/gcc/config/xtensa/elf.h
 @@ -48,7 +48,9 @@
@@ -79,8 +75,6 @@ Index: b/gcc/config/xtensa/elf.h
  
  #undef LIB_SPEC
  #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-Index: b/gcc/config/xtensa/linux.h
-===================================================================
 --- a/gcc/config/xtensa/linux.h
 +++ b/gcc/config/xtensa/linux.h
 @@ -42,7 +42,9 @@
@@ -94,8 +88,6 @@ Index: b/gcc/config/xtensa/linux.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
  
-Index: b/gcc/config/xtensa/predicates.md
-===================================================================
 --- a/gcc/config/xtensa/predicates.md
 +++ b/gcc/config/xtensa/predicates.md
 @@ -142,7 +142,8 @@
@@ -108,8 +100,6 @@ Index: b/gcc/config/xtensa/predicates.md
  			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
  
  ;; Accept the floating point constant 1 in the appropriate mode.
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
 @@ -477,6 +477,9 @@
@@ -152,8 +142,6 @@ Index: b/gcc/config/xtensa/xtensa.c
      default:
        if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
  	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-Index: b/gcc/config/xtensa/xtensa.md
-===================================================================
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -799,8 +799,8 @@
@@ -270,8 +258,6 @@ Index: b/gcc/config/xtensa/xtensa.md
    "register_operand (operands[0], DFmode)
     || register_operand (operands[1], DFmode)"
    "#"
-Index: b/gcc/config/xtensa/xtensa.opt
-===================================================================
 --- a/gcc/config/xtensa/xtensa.opt
 +++ b/gcc/config/xtensa/xtensa.opt
 @@ -38,6 +38,10 @@
diff --git a/packages/gcc-linaro/4.8-2015.06/871-xtensa-reimplement-register-spilling.patch b/packages/gcc-linaro/4.9-2017.01/0019-xtensa-reimplement-register-spilling.patch
index abc7a08e..776914d1 100644
--- a/packages/gcc-linaro/4.8-2015.06/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc-linaro/4.9-2017.01/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.9-2017.01/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
index f23a5c07..ef753c1a 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.9-2017.01/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.9-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch b/packages/gcc-linaro/4.9-2017.01/0021-xtensa-fix-_Unwind_GetCFA.patch
index dc405132..0fbaeec3 100644
--- a/packages/gcc-linaro/4.9-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch
+++ b/packages/gcc-linaro/4.9-2017.01/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.9-2017.01/874-xtensa-add-uclinux-support.patch b/packages/gcc-linaro/4.9-2017.01/0022-xtensa-add-uclinux-support.patch
index 881aec09..50bbaeb7 100644
--- a/packages/gcc-linaro/4.9-2017.01/874-xtensa-add-uclinux-support.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0022-xtensa-add-uclinux-support.patch
@@ -16,19 +16,17 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r228450
 
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
+ gcc/config.gcc                |    5 +++
+ gcc/config/xtensa/uclinux.h   |   69 ++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/uclinux.opt |   32 +++++++++++++++++++
+ libgcc/config.host            |    5 +++
  4 files changed, 111 insertions(+)
  create mode 100644 gcc/config/xtensa/uclinux.h
  create mode 100644 gcc/config/xtensa/uclinux.opt
 
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2871,6 +2871,11 @@
+@@ -2872,6 +2872,11 @@
  	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
  	tmake_file="${tmake_file} xtensa/t-xtensa"
  	;;
@@ -40,8 +38,6 @@ Index: b/gcc/config.gcc
  am33_2.0-*-linux*)
  	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
  	gas=yes gnu_ld=yes
-Index: b/gcc/config/xtensa/uclinux.h
-===================================================================
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.h
 @@ -0,0 +1,69 @@
@@ -114,8 +110,6 @@ Index: b/gcc/config/xtensa/uclinux.h
 +
 +#undef DBX_REGISTER_NUMBER
 +
-Index: b/gcc/config/xtensa/uclinux.opt
-===================================================================
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.opt
 @@ -0,0 +1,32 @@
@@ -151,11 +145,9 @@ Index: b/gcc/config/xtensa/uclinux.opt
 +Driver JoinedOrMissing
 +
 +; This comment is to ensure we retain the blank line above.
-Index: b/libgcc/config.host
-===================================================================
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -1213,6 +1213,11 @@
+@@ -1215,6 +1215,11 @@
  	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
  	md_unwind_header=xtensa/linux-unwind.h
  	;;
diff --git a/packages/gcc-linaro/4.9-2017.01/875-gcc-xtensa-fix-fprintf-format-specifiers.patch b/packages/gcc-linaro/4.9-2017.01/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
index 052ffc3d..b8b6f740 100644
--- a/packages/gcc-linaro/4.9-2017.01/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0023-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 d8c8298..3c00961 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1785,7 +1785,7 @@ xtensa_emit_call (int callop, rtx *operands)
+@@ -1786,7 +1786,7 @@
    rtx tgt = operands[callop];
  
    if (GET_CODE (tgt) == CONST_INT)
@@ -33,7 +31,7 @@ index d8c8298..3c00961 100644
    else if (register_operand (tgt, VOIDmode))
      sprintf (result, "callx8\t%%%d", callop);
    else
-@@ -2360,14 +2360,14 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2361,14 +2361,14 @@
  
      case 'L':
        if (GET_CODE (x) == CONST_INT)
@@ -50,7 +48,7 @@ index d8c8298..3c00961 100644
        else
  	output_operand_lossage ("invalid %%R value");
        break;
-@@ -2381,7 +2381,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2382,7 +2382,7 @@
  
      case 'd':
        if (GET_CODE (x) == CONST_INT)
@@ -59,7 +57,7 @@ index d8c8298..3c00961 100644
        else
  	output_operand_lossage ("invalid %%d value");
        break;
-@@ -2450,7 +2450,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2451,7 +2451,7 @@
        else if (GET_CODE (x) == MEM)
  	output_address (XEXP (x, 0));
        else if (GET_CODE (x) == CONST_INT)
@@ -68,6 +66,3 @@ index d8c8298..3c00961 100644
        else
  	output_addr_const (file, x);
      }
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/876-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/4.9-2017.01/0024-xtensa-fix-PR-target-82181.patch
index a613bb38..fbdcf1ed 100644
--- a/packages/gcc-linaro/4.9-2017.01/876-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0024-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 3c0096113775..3eb4db85b971 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -612,6 +612,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
+@@ -612,6 +612,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 3c0096113775..3eb4db85b971 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/880-nios2_legitimize_address.patch b/packages/gcc-linaro/4.9-2017.01/0025-nios2_legitimize_address.patch
index 4623f295..5caeb207 100644
--- a/packages/gcc-linaro/4.9-2017.01/880-nios2_legitimize_address.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0025-nios2_legitimize_address.patch
@@ -19,14 +19,12 @@ http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0cc
 [backported to 4.9.3]
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
 ---
- gcc/config/nios2/nios2.c | 4 ++--
+ gcc/config/nios2/nios2.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
-index 047b615..41dd6f9 100644
 --- a/gcc/config/nios2/nios2.c
 +++ b/gcc/config/nios2/nios2.c
-@@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
+@@ -1786,15 +1786,15 @@
  
       Which will be output as '%tls_le(var+48)(r23)' in assembly.  */
    if (GET_CODE (x) == PLUS
@@ -44,6 +42,3 @@ index 047b615..41dd6f9 100644
  	  unspec = copy_rtx (unspec);
  	  XVECEXP (unspec, 0, 0)
  	    = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset));
--- 
-2.5.0
-
diff --git a/packages/gcc-linaro/6.4-2017.08/890-fix-m68k-compile.patch b/packages/gcc-linaro/4.9-2017.01/0026-fix-m68k-compile.patch
index 6e63de0c..9437f252 100644
--- a/packages/gcc-linaro/6.4-2017.08/890-fix-m68k-compile.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0026-fix-m68k-compile.patch
@@ -2,9 +2,12 @@ remove unused header, which breaks the toolchain building
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
 @@ -33,7 +33,6 @@
     using the kernel helper defined below.  There is no support for
     64-bit operations yet.  */
diff --git a/packages/gcc-linaro/5.4-2017.05/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/4.9-2017.01/0027-fix-m68k-uclinux.patch
index 4e186bd3..80f76d32 100644
--- a/packages/gcc-linaro/5.4-2017.05/891-fix-m68k-uclinux.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0027-fix-m68k-uclinux.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -752,7 +752,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc-linaro/4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc-linaro/4.9-2017.01/0028-libgcc-disable-split-stack-nothreads.patch
index 670cf8da..df91a9ff 100644
--- a/packages/gcc-linaro/4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0028-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-4.9.3.orig/libgcc/config/t-stack gcc-4.9.3/libgcc/config/t-stack
---- gcc-4.9.3.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-4.9.3/libgcc/config/t-stack	2016-03-07 01:34:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc-linaro/4.9-2017.01/940-uclinux-enable-threads.patch b/packages/gcc-linaro/4.9-2017.01/0029-uclinux-enable-threads.patch
index 51081476..e427eb39 100644
--- a/packages/gcc-linaro/4.9-2017.01/940-uclinux-enable-threads.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0029-uclinux-enable-threads.patch
@@ -4,11 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-Index: b/gcc/config.gcc
-===================================================================
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -810,6 +810,9 @@
+@@ -808,6 +808,9 @@
  *-*-uclinux*)
    extra_options="$extra_options gnu-user.opt"
    use_gcc_stdint=wrap
diff --git a/packages/gcc-linaro/4.9-2017.01/100-uclibc-conf.patch b/packages/gcc-linaro/4.9-2017.01/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a1..00000000
--- a/packages/gcc-linaro/4.9-2017.01/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/gcc-linaro/5.4-2017.05/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/packages/gcc-linaro/5.4-2017.05/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
index 1a6f7e5f..71625347 100644
--- a/packages/gcc-linaro/5.4-2017.05/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
@@ -32,23 +32,21 @@ build-many-glibcs.py.
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
- libgcc/config/aarch64/linux-unwind.h | 2 +-
- libgcc/config/alpha/linux-unwind.h   | 2 +-
- libgcc/config/bfin/linux-unwind.h    | 2 +-
- libgcc/config/i386/linux-unwind.h    | 4 ++--
- libgcc/config/m68k/linux-unwind.h    | 2 +-
- libgcc/config/nios2/linux-unwind.h   | 2 +-
- libgcc/config/pa/linux-unwind.h      | 2 +-
- libgcc/config/sh/linux-unwind.h      | 2 +-
- libgcc/config/tilepro/linux-unwind.h | 2 +-
- libgcc/config/xtensa/linux-unwind.h  | 2 +-
+ libgcc/config/aarch64/linux-unwind.h |    2 +-
+ libgcc/config/alpha/linux-unwind.h   |    2 +-
+ libgcc/config/bfin/linux-unwind.h    |    2 +-
+ libgcc/config/i386/linux-unwind.h    |    4 ++--
+ libgcc/config/m68k/linux-unwind.h    |    2 +-
+ libgcc/config/nios2/linux-unwind.h   |    2 +-
+ libgcc/config/pa/linux-unwind.h      |    2 +-
+ libgcc/config/sh/linux-unwind.h      |    2 +-
+ libgcc/config/tilepro/linux-unwind.h |    2 +-
+ libgcc/config/xtensa/linux-unwind.h  |    2 +-
  10 files changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
-index 86d17b1c798..909f68f7311 100644
 --- a/libgcc/config/aarch64/linux-unwind.h
 +++ b/libgcc/config/aarch64/linux-unwind.h
-@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
    struct rt_sigframe
    {
      siginfo_t info;
@@ -57,11 +55,9 @@ index 86d17b1c798..909f68f7311 100644
    };
  
    struct rt_sigframe *rt_;
-diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
-index d65474fec12..9a226b195b5 100644
 --- a/libgcc/config/alpha/linux-unwind.h
 +++ b/libgcc/config/alpha/linux-unwind.h
-@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+@@ -51,7 +51,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -70,11 +66,9 @@ index d65474fec12..9a226b195b5 100644
        } *rt_ = context->cfa;
        sc = &rt_->uc.uc_mcontext;
      }
-diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
-index 0c270e435c7..7fa95d2dc96 100644
 --- a/libgcc/config/bfin/linux-unwind.h
 +++ b/libgcc/config/bfin/linux-unwind.h
-@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
  	void *puc;
  	char retcode[8];
  	siginfo_t info;
@@ -83,11 +77,9 @@ index 0c270e435c7..7fa95d2dc96 100644
        } *rt_ = context->cfa;
  
        /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
-index e54bf73b1fd..d35fc4566ce 100644
 --- a/libgcc/config/i386/linux-unwind.h
 +++ b/libgcc/config/i386/linux-unwind.h
-@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -58,7 +58,7 @@
    if (*(unsigned char *)(pc+0) == 0x48
        && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
      {
@@ -96,7 +88,7 @@ index e54bf73b1fd..d35fc4566ce 100644
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
           because it does not alias anything.  */
-@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+@@ -138,7 +138,7 @@
  	siginfo_t *pinfo;
  	void *puc;
  	siginfo_t info;
@@ -105,11 +97,9 @@ index e54bf73b1fd..d35fc4566ce 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
-index fb79a4d63cd..b2f5ea4cd7c 100644
 --- a/libgcc/config/m68k/linux-unwind.h
 +++ b/libgcc/config/m68k/linux-unwind.h
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,7 +33,7 @@
  /* <sys/ucontext.h> is unfortunately broken right now.  */
  struct uw_ucontext {
  	unsigned long	  uc_flags;
@@ -118,11 +108,9 @@ index fb79a4d63cd..b2f5ea4cd7c 100644
  	stack_t		  uc_stack;
  	mcontext_t	  uc_mcontext;
  	unsigned long	  uc_filler[80];
-diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
-index dff1c20076e..1d88afecb12 100644
 --- a/libgcc/config/nios2/linux-unwind.h
 +++ b/libgcc/config/nios2/linux-unwind.h
-@@ -38,7 +38,7 @@ struct nios2_mcontext {
+@@ -38,7 +38,7 @@
  
  struct nios2_ucontext {
    unsigned long uc_flags;
@@ -131,11 +119,9 @@ index dff1c20076e..1d88afecb12 100644
    stack_t uc_stack;
    struct nios2_mcontext uc_mcontext;
    sigset_t uc_sigmask;	/* mask last for extensibility */
-diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
-index 01494685ea4..91575356803 100644
 --- a/libgcc/config/pa/linux-unwind.h
 +++ b/libgcc/config/pa/linux-unwind.h
-@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+@@ -80,7 +80,7 @@
    struct sigcontext *sc;
    struct rt_sigframe {
      siginfo_t info;
@@ -144,11 +130,9 @@ index 01494685ea4..91575356803 100644
    } *frame;
  
    /* rt_sigreturn trampoline:
-diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
-index e63091f287c..67033f06b4b 100644
 --- a/libgcc/config/sh/linux-unwind.h
 +++ b/libgcc/config/sh/linux-unwind.h
-@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+@@ -180,7 +180,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -157,11 +141,9 @@ index e63091f287c..67033f06b4b 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
-index fd83ba7c275..e3c9ef0840d 100644
 --- a/libgcc/config/tilepro/linux-unwind.h
 +++ b/libgcc/config/tilepro/linux-unwind.h
-@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+@@ -61,7 +61,7 @@
    struct rt_sigframe {
      unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
      siginfo_t info;
@@ -170,11 +152,9 @@ index fd83ba7c275..e3c9ef0840d 100644
    } *rt_;
  
    /* Return if this is not a signal handler.  */
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738ff57..ff6b66373a9 100644
 --- a/libgcc/config/xtensa/linux-unwind.h
 +++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -64,7 +64,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -64,7 +64,7 @@
  
    struct rt_sigframe {
      siginfo_t info;
@@ -183,6 +163,3 @@ index 9daf738ff57..ff6b66373a9 100644
    } *rt_;
  
    /* movi a2, __NR_rt_sigreturn; syscall */
--- 
-2.14.1
-
diff --git a/packages/gcc-linaro/5.4-2017.05/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/5.4-2017.05/0001-libtool-leave-framework-alone.patch
index 0f4912a8..1a86e415 100644
--- a/packages/gcc-linaro/5.4-2017.05/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0001-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-5.4.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-5.4.0/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/6.4-2017.08/100-uclibc-conf.patch b/packages/gcc-linaro/5.4-2017.05/0002-uclibc-conf.patch
index 73d1f0d3..aef750af 100644
--- a/packages/gcc-linaro/6.4-2017.08/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0002-uclibc-conf.patch
@@ -1,5 +1,7 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
+---
+ 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 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/1100-msp430-string-literals.patch b/packages/gcc-linaro/5.4-2017.05/0003-msp430-string-literals.patch
index 819d6d22..24f421f9 100644
--- a/packages/gcc-linaro/5.4-2017.05/1100-msp430-string-literals.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0003-msp430-string-literals.patch
@@ -11,11 +11,15 @@ Date:   Wed May 13 01:11:13 2015 +0000
     
     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223106 138bc75d-0d04-0410-961f-82ee72b054a4
 
-diff --git a/gcc/ada/sigtramp-vxworks.c b/gcc/ada/sigtramp-vxworks.c
-index 2119296dc1d..c697626a03e 100644
+---
+ gcc/ada/sigtramp-vxworks.c |    6 +++---
+ gcc/config/mmix/mmix.c     |    6 +++---
+ gcc/config/msp430/msp430.c |    2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
 --- a/gcc/ada/sigtramp-vxworks.c
 +++ b/gcc/ada/sigtramp-vxworks.c
-@@ -342,16 +342,16 @@ CR("") \
+@@ -342,16 +342,16 @@
  TCR("# Allocate frame and save the non-volatile") \
  TCR("# registers we're going to modify") \
  TCR("mov	ip, sp") \
@@ -35,11 +39,9 @@ index 2119296dc1d..c697626a03e 100644
  
  #else
  Not_implemented;
-diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
-index 6e991207dbc..e0699854e25 100644
 --- a/gcc/config/mmix/mmix.c
 +++ b/gcc/config/mmix/mmix.c
-@@ -2520,7 +2520,7 @@ mmix_output_shiftvalue_op_from_str (FILE *stream,
+@@ -2521,7 +2521,7 @@
    if (! mmix_shiftable_wyde_value (value))
      {
        char s[sizeof ("0xffffffffffffffff")];
@@ -48,7 +50,7 @@ index 6e991207dbc..e0699854e25 100644
        internal_error ("MMIX Internal: %s is not a shiftable int", s);
      }
  
-@@ -2562,7 +2562,7 @@ mmix_output_octa (FILE *stream, int64_t value, int do_begin_end)
+@@ -2563,7 +2563,7 @@
      fprintf (stream, "#" HOST_WIDE_INT_PRINT_HEX_PURE,
  	     (HOST_WIDE_INT) value);
    else /* Need to avoid the hex output; there's no ...WIDEST...HEX_PURE.  */
@@ -57,7 +59,7 @@ index 6e991207dbc..e0699854e25 100644
  
    if (do_begin_end)
      fprintf (stream, "\n");
-@@ -2579,7 +2579,7 @@ mmix_output_shifted_value (FILE *stream, int64_t value)
+@@ -2580,7 +2580,7 @@
    if (! mmix_shiftable_wyde_value (value))
      {
        char s[16+2+1];
@@ -66,11 +68,9 @@ index 6e991207dbc..e0699854e25 100644
        internal_error ("MMIX Internal: %s is not a shiftable int", s);
      }
  
-diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
-index bec168ca2ae..58d0efea1de 100644
 --- a/gcc/config/msp430/msp430.c
 +++ b/gcc/config/msp430/msp430.c
-@@ -2248,7 +2248,7 @@ static struct
+@@ -1902,7 +1902,7 @@
  }
    const_shift_helpers[] =
  {
diff --git a/packages/gcc-linaro/5.4-2017.05/110-xtensa-implement-trap-pattern.patch b/packages/gcc-linaro/5.4-2017.05/0004-xtensa-implement-trap-pattern.patch
index 33045322..b25bbda6 100644
--- a/packages/gcc-linaro/5.4-2017.05/110-xtensa-implement-trap-pattern.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0004-xtensa-implement-trap-pattern.patch
@@ -10,15 +10,13 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.h  |  1 +
- gcc/config/xtensa/xtensa.md | 15 ++++++++++++++-
+ gcc/config/xtensa/xtensa.h  |    1 +
+ gcc/config/xtensa/xtensa.md |   15 ++++++++++++++-
  2 files changed, 15 insertions(+), 1 deletion(-)
 
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 011411c..584080b 100644
 --- a/gcc/config/xtensa/xtensa.h
 +++ b/gcc/config/xtensa/xtensa.h
-@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size;
+@@ -67,6 +67,7 @@
  #define TARGET_THREADPTR	XCHAL_HAVE_THREADPTR
  #define TARGET_LOOPS	        XCHAL_HAVE_LOOPS
  #define TARGET_WINDOWED_ABI	(XSHAL_ABI == XTHAL_ABI_WINDOWED)
@@ -26,8 +24,6 @@ index 011411c..584080b 100644
  
  #define TARGET_DEFAULT \
    ((XCHAL_HAVE_L32R	? 0 : MASK_CONST16) |				\
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..a577aa3 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -86,7 +86,7 @@
@@ -59,6 +55,3 @@ index 6d84384..a577aa3 100644
  ;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't
  ;; know if a frame pointer is required until the reload pass, and
  ;; because there may be an incoming argument value in the hard frame
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/packages/gcc-linaro/5.4-2017.05/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
index c11ad35a..cf529506 100644
--- a/packages/gcc-linaro/5.4-2017.05/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
@@ -8,14 +8,12 @@ Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
 
 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 ---
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ gcc/config.gcc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 4a7cbd2..9cc765e 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -439,7 +439,7 @@ powerpc*-*-*)
+@@ -435,7 +435,7 @@
  	cpu_type=rs6000
  	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
  	case x$with_cpu in
@@ -24,6 +22,3 @@ index 4a7cbd2..9cc765e 100644
  		cpu_is_64bit=yes
  		;;
  	esac
--- 
-2.6.2
-
diff --git a/packages/gcc-linaro/4.9-2017.01/301-missing-execinfo_h.patch b/packages/gcc-linaro/5.4-2017.05/0006-missing-execinfo_h.patch
index 00efda24..c90222a1 100644
--- a/packages/gcc-linaro/4.9-2017.01/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0006-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/6.4-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/5.4-2017.05/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5f..74f6f3f4 100644
--- a/packages/gcc-linaro/6.4-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,10 +51,9 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
         [AC_MSG_RESULT([yes]); have_pic_shared=yes],
         [AC_MSG_RESULT([no]); have_pic_shared=no])
       if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -28465,6 +28465,9 @@
  
     pluginlibs=
  
@@ -59,7 +63,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
+@@ -28475,6 +28478,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -71,7 +75,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
+@@ -28587,23 +28595,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -102,9 +106,8 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
    ;
    return 0;
  }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
+--- a/libcc1/configure
++++ b/libcc1/configure
 @@ -14500,6 +14500,9 @@
  
     pluginlibs=
diff --git a/packages/gcc-linaro/5.4-2017.05/0008-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/5.4-2017.05/0008-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc-linaro/5.4-2017.05/0008-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc-linaro/5.4-2017.05/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/5.4-2017.05/0009-arm-softfloat-libgcc.patch
index 5efa7fd1..350857dd 100644
--- a/packages/gcc-linaro/5.4-2017.05/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0009-arm-softfloat-libgcc.patch
@@ -1,5 +1,8 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ 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
 @@ -60,7 +60,7 @@
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/5.4-2017.05/0010-arm_unbreak_armv4t.patch
index b7300591..7c374453 100644
--- a/packages/gcc-linaro/5.4-2017.05/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0010-arm_unbreak_armv4t.patch
@@ -1,7 +1,9 @@
 http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
 
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
+---
+ 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/5.4-2017.05/840-microblaze-enable-dwarf-eh-support.patch b/packages/gcc-linaro/5.4-2017.05/0011-microblaze-enable-dwarf-eh-support.patch
index 9d29090a..67a322a4 100644
--- a/packages/gcc-linaro/5.4-2017.05/840-microblaze-enable-dwarf-eh-support.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0011-microblaze-enable-dwarf-eh-support.patch
@@ -26,15 +26,13 @@ Changelog
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 ---
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
+ gcc/common/config/microblaze/microblaze-common.c |    3 --
+ gcc/config/microblaze/microblaze-protos.h        |    1 
+ gcc/config/microblaze/microblaze.c               |   29 +++++++++++++++++++----
+ gcc/config/microblaze/microblaze.h               |   15 +++++++++++
+ gcc/config/microblaze/microblaze.md              |   11 ++++++++
  5 files changed, 52 insertions(+), 7 deletions(-)
 
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
 --- a/gcc/common/config/microblaze/microblaze-common.c
 +++ b/gcc/common/config/microblaze/microblaze-common.c
 @@ -37,7 +37,4 @@
@@ -45,8 +43,6 @@ Index: b/gcc/common/config/microblaze/microblaze-common.c
 -#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
 -
  struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze-protos.h
 +++ b/gcc/config/microblaze/microblaze-protos.h
 @@ -56,6 +56,7 @@
@@ -57,8 +53,6 @@ Index: b/gcc/config/microblaze/microblaze-protos.h
  #endif  /* RTX_CODE */
  
  /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
 --- a/gcc/config/microblaze/microblaze.c
 +++ b/gcc/config/microblaze/microblaze.c
 @@ -1959,6 +1959,11 @@
@@ -118,8 +112,6 @@ Index: b/gcc/config/microblaze/microblaze.c
  }
  
  /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze.h
 +++ b/gcc/config/microblaze/microblaze.h
 @@ -184,6 +184,21 @@
@@ -144,8 +136,6 @@ Index: b/gcc/config/microblaze/microblaze.h
  /* Use DWARF 2 debugging information by default.  */
  #define DWARF2_DEBUGGING_INFO
  #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
 --- a/gcc/config/microblaze/microblaze.md
 +++ b/gcc/config/microblaze/microblaze.md
 @@ -2272,4 +2272,15 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/850-libstdcxx-uclibc-c99.patch b/packages/gcc-linaro/5.4-2017.05/0012-libstdcxx-uclibc-c99.patch
index 9e97d945..0b211b9d 100644
--- a/packages/gcc-linaro/5.4-2017.05/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0012-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,11 +59,9 @@ 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
-@@ -5239,7 +5239,7 @@
+@@ -5344,7 +5344,7 @@
  _GLIBCXX_END_NAMESPACE_VERSION
  } // namespace
  
@@ -54,8 +70,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
  
  #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
 @@ -992,7 +992,7 @@
@@ -67,8 +81,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets.tcc
  	// Precision is always used except for hexfloat format.
  	const bool __use_prec =
  	  (__io.flags() & ios_base::floatfield) != ios_base::floatfield;
-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
 @@ -578,7 +578,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
 @@ -195,7 +195,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
 @@ -144,7 +144,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
 @@ -192,7 +192,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
 @@ -2680,7 +2680,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
 @@ -788,7 +788,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
 @@ -146,7 +146,7 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/860-cilk-wchar.patch b/packages/gcc-linaro/5.4-2017.05/0013-cilk-wchar.patch
index 1d9916f5..300837f0 100644
--- a/packages/gcc-linaro/5.4-2017.05/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0013-cilk-wchar.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
 --- a/libcilkrts/include/cilk/reducer_min_max.h
 +++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3154,7 +3154,9 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc-linaro/5.4-2017.05/0014-xtensa-add-mauto-litpools-option.patch
index aa1376c4..3db8ec8e 100644
--- a/packages/gcc-linaro/5.4-2017.05/870-xtensa-add-mauto-litpools-option.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0014-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)
+@@ -501,6 +501,9 @@
      {
        int dst_regnum = xt_true_regnum (operands[0]);
  
@@ -122,7 +112,7 @@ 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)
+@@ -1069,7 +1072,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)
+@@ -2449,6 +2452,20 @@
  	}
        break;
  
@@ -152,8 +142,6 @@ 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 @@
@@ -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/5.4-2017.05/871-xtensa-reimplement-register-spilling.patch b/packages/gcc-linaro/5.4-2017.05/0015-xtensa-reimplement-register-spilling.patch
index 4056f8b8..b85ecb96 100644
--- a/packages/gcc-linaro/5.4-2017.05/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0015-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 4d451c8..ef0703f 100644
 --- a/libgcc/config/xtensa/lib2funcs.S
 +++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -34,10 +34,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -34,10 +34,29 @@
  	.global	__xtensa_libgcc_window_spill
  	.type	__xtensa_libgcc_window_spill,@function
  __xtensa_libgcc_window_spill:
@@ -51,15 +49,15 @@ index 4d451c8..ef0703f 100644
 +#elif XCHAL_NUM_AREGS % 12 == 8
 +	mov	a12, a12
 +#endif
- 	retw
++	retw
 +#else
 +	mov	a8, a8
-+	retw
+ 	retw
 +#endif
  	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
  #endif
  
-@@ -61,10 +80,7 @@ __xtensa_nonlocal_goto:
+@@ -61,10 +80,7 @@
  	entry	sp, 32
  
  	/* Flush registers.  */
@@ -71,6 +69,3 @@ index 4d451c8..ef0703f 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/5.4-2017.05/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/packages/gcc-linaro/5.4-2017.05/0016-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
index 9707f688..96b89e32 100644
--- a/packages/gcc-linaro/5.4-2017.05/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0016-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
@@ -15,17 +15,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226963
 
- libgcc/config/xtensa/t-windowed | 2 +-
+ libgcc/config/xtensa/t-windowed |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index 7d9e9db..a99156c 100644
 --- a/libgcc/config/xtensa/t-windowed
 +++ b/libgcc/config/xtensa/t-windowed
 @@ -1,2 +1,2 @@
  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/5.4-2017.05/873-xtensa-fix-_Unwind_GetCFA.patch b/packages/gcc-linaro/5.4-2017.05/0017-xtensa-fix-_Unwind_GetCFA.patch
index 2d8eb7c7..2222fdbf 100644
--- a/packages/gcc-linaro/5.4-2017.05/873-xtensa-fix-_Unwind_GetCFA.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0017-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 82b0e63..8e579c7 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 82b0e63..8e579c7 100644
  }
  
  /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/874-xtensa-add-uclinux-support.patch b/packages/gcc-linaro/5.4-2017.05/0018-xtensa-add-uclinux-support.patch
index 23db3d86..643eff14 100644
--- a/packages/gcc-linaro/5.4-2017.05/874-xtensa-add-uclinux-support.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0018-xtensa-add-uclinux-support.patch
@@ -16,19 +16,17 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r228450
 
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
+ gcc/config.gcc                |    5 +++
+ gcc/config/xtensa/uclinux.h   |   69 ++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/uclinux.opt |   32 +++++++++++++++++++
+ libgcc/config.host            |    5 +++
  4 files changed, 111 insertions(+)
  create mode 100644 gcc/config/xtensa/uclinux.h
  create mode 100644 gcc/config/xtensa/uclinux.opt
 
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index c52f5a8..56797bd 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2995,6 +2995,11 @@ xtensa*-*-linux*)
+@@ -2976,6 +2976,11 @@
  	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
  	tmake_file="${tmake_file} xtensa/t-xtensa"
  	;;
@@ -40,9 +38,6 @@ index c52f5a8..56797bd 100644
  am33_2.0-*-linux*)
  	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
  	gas=yes gnu_ld=yes
-diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
-new file mode 100644
-index 0000000..4606020
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.h
 @@ -0,0 +1,69 @@
@@ -115,9 +110,6 @@ index 0000000..4606020
 +
 +#undef DBX_REGISTER_NUMBER
 +
-diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt
-new file mode 100644
-index 0000000..95ef777
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.opt
 @@ -0,0 +1,32 @@
@@ -153,11 +145,9 @@ index 0000000..95ef777
 +Driver JoinedOrMissing
 +
 +; This comment is to ensure we retain the blank line above.
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 2c64756..2ee92c1 100644
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -1295,6 +1295,11 @@ xtensa*-*-linux*)
+@@ -1289,6 +1289,11 @@
  	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
  	md_unwind_header=xtensa/linux-unwind.h
  	;;
@@ -169,6 +159,3 @@ index 2c64756..2ee92c1 100644
  am33_2.0-*-linux*)
  	# Don't need crtbeginT.o from *-*-linux* default.
  	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch b/packages/gcc-linaro/5.4-2017.05/0019-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
index d128596d..2b46a29d 100644
--- a/packages/gcc-linaro/5.4-2017.05/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0019-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
@@ -18,15 +18,13 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227809 138bc75d-0d04-0410-961f-8
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.h          |  4 +++-
- libgcc/config/xtensa/linux-unwind.h | 30 ++++++++++++++++++++++++++++--
+ gcc/config/xtensa/xtensa.h          |    4 +++-
+ libgcc/config/xtensa/linux-unwind.h |   30 ++++++++++++++++++++++++++++--
  2 files changed, 31 insertions(+), 3 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 584080b..e165def 100644
 --- a/gcc/config/xtensa/xtensa.h
 +++ b/gcc/config/xtensa/xtensa.h
-@@ -813,7 +813,9 @@ typedef struct xtensa_args
+@@ -813,7 +813,9 @@
     for debugging.  */
  #define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, 0)
  #define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM (0)
@@ -37,11 +35,9 @@ index 584080b..e165def 100644
  #define EH_RETURN_DATA_REGNO(N) ((N) < 2 ? (N) + 2 : INVALID_REGNUM)
  #define ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL)			\
    (flag_pic								\
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738..9a67b5d 100644
 --- a/libgcc/config/xtensa/linux-unwind.h
 +++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -52,7 +52,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -52,7 +52,6 @@
  #define ENTRY_BYTE 0x36
  #endif
  
@@ -49,7 +45,7 @@ index 9daf738..9a67b5d 100644
  #define MD_FALLBACK_FRAME_STATE_FOR xtensa_fallback_frame_state
  
  static _Unwind_Reason_Code
-@@ -61,6 +60,10 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -61,6 +60,10 @@
  {
    unsigned char *pc = context->ra;
    struct sigcontext *sc;
@@ -60,7 +56,7 @@ index 9daf738..9a67b5d 100644
  
    struct rt_sigframe {
      siginfo_t info;
-@@ -76,6 +79,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -76,6 +79,7 @@
        || pc[5] != SYSC_BYTE2)
      return _URC_END_OF_STACK;
  
@@ -68,7 +64,7 @@ index 9daf738..9a67b5d 100644
    rt_ = context->sp;
    sc = &rt_->uc.uc_mcontext;
    fs->signal_regs = (_Unwind_Word *) sc->sc_a;
-@@ -90,11 +94,33 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -90,11 +94,33 @@
     }
    else
      fs->signal_ra = sc->sc_pc;
@@ -103,6 +99,3 @@ index 9daf738..9a67b5d 100644
 -#endif /* __XTENSA_WINDOWED_ABI__ */
  
  #endif /* ifdef inhibit_libc  */
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/876-xtensa-fix-libgcc-build-with-text-section-literals.patch b/packages/gcc-linaro/5.4-2017.05/0020-xtensa-fix-libgcc-build-with-text-section-literals.patch
index 4b2334a7..6ccede3e 100644
--- a/packages/gcc-linaro/5.4-2017.05/876-xtensa-fix-libgcc-build-with-text-section-literals.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0020-xtensa-fix-libgcc-build-with-text-section-literals.patch
@@ -18,15 +18,13 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233505 138bc75d-0d04-0410-961f-8
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- libgcc/config/xtensa/ieee754-df.S | 2 ++
- libgcc/config/xtensa/ieee754-sf.S | 2 ++
+ libgcc/config/xtensa/ieee754-df.S |    2 ++
+ libgcc/config/xtensa/ieee754-sf.S |    2 ++
  2 files changed, 4 insertions(+)
 
-diff --git a/libgcc/config/xtensa/ieee754-df.S b/libgcc/config/xtensa/ieee754-df.S
-index a7ae209..26f2abd 100644
 --- a/libgcc/config/xtensa/ieee754-df.S
 +++ b/libgcc/config/xtensa/ieee754-df.S
-@@ -606,6 +606,7 @@ __subdf3:
+@@ -606,6 +606,7 @@
  #define XCHAL_NO_MUL 1
  #endif
  
@@ -34,7 +32,7 @@ index a7ae209..26f2abd 100644
  __muldf3_aux:
  
  	/* Handle unusual cases (zeros, subnormals, NaNs and Infinities).
-@@ -1216,6 +1217,7 @@ __muldf3:
+@@ -1216,6 +1217,7 @@
  
  #ifdef L_divdf3
  
@@ -42,11 +40,9 @@ index a7ae209..26f2abd 100644
  	/* Division */
  __divdf3_aux:
  
-diff --git a/libgcc/config/xtensa/ieee754-sf.S b/libgcc/config/xtensa/ieee754-sf.S
-index 7e397dc..a5e6e3c 100644
 --- a/libgcc/config/xtensa/ieee754-sf.S
 +++ b/libgcc/config/xtensa/ieee754-sf.S
-@@ -487,6 +487,7 @@ __subsf3:
+@@ -487,6 +487,7 @@
  #define XCHAL_NO_MUL 1
  #endif
  
@@ -54,7 +50,7 @@ index 7e397dc..a5e6e3c 100644
  __mulsf3_aux:
  
  	/* Handle unusual cases (zeros, subnormals, NaNs and Infinities).
-@@ -884,6 +885,7 @@ __mulsf3:
+@@ -884,6 +885,7 @@
  
  #ifdef L_divsf3
  
@@ -62,6 +58,3 @@ index 7e397dc..a5e6e3c 100644
  	/* Division */
  __divsf3_aux:
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch b/packages/gcc-linaro/5.4-2017.05/0021-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
index 6e0ce6e3..97927797 100644
--- a/packages/gcc-linaro/5.4-2017.05/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0021-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
@@ -26,37 +26,28 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241313 138bc75d-0d04-0410-961f-8
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- libgcc/config/xtensa/t-elf      | 2 ++
- libgcc/config/xtensa/t-linux    | 2 ++
- libgcc/config/xtensa/t-windowed | 2 +-
+ libgcc/config/xtensa/t-elf      |    2 ++
+ libgcc/config/xtensa/t-linux    |    2 ++
+ libgcc/config/xtensa/t-windowed |    2 +-
  3 files changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-elf b/libgcc/config/xtensa/t-elf
-index 59d5121..967cf9b 100644
 --- a/libgcc/config/xtensa/t-elf
 +++ b/libgcc/config/xtensa/t-elf
-@@ -3,3 +3,5 @@ CRTSTUFF_T_CFLAGS += -mlongcalls
+@@ -3,3 +3,5 @@
  CRTSTUFF_T_CFLAGS_S += -mlongcalls
  
  HOST_LIBGCC2_CFLAGS += -mlongcalls
 +
 +LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde.c
-diff --git a/libgcc/config/xtensa/t-linux b/libgcc/config/xtensa/t-linux
-index 6f4ae89..412ecca 100644
 --- a/libgcc/config/xtensa/t-linux
 +++ b/libgcc/config/xtensa/t-linux
 @@ -1 +1,3 @@
  SHLIB_MAPFILES += $(srcdir)/config/xtensa/libgcc-glibc.ver
 +
 +LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde-dip.c
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index a99156c..f140136 100644
 --- a/libgcc/config/xtensa/t-windowed
 +++ b/libgcc/config/xtensa/t-windowed
 @@ -1,2 +1,2 @@
  LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
 -   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
 +   $(LIB2ADDEH_XTENSA_UNWIND_DW2_FDE) $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/878-xtensa-Fix-PR-target-78603.patch b/packages/gcc-linaro/5.4-2017.05/0022-xtensa-Fix-PR-target-78603.patch
index 4646d3c6..cd840f83 100644
--- a/packages/gcc-linaro/5.4-2017.05/878-xtensa-Fix-PR-target-78603.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0022-xtensa-Fix-PR-target-78603.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 5 ++++-
+ gcc/config/xtensa/xtensa.c |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 206ff80..36ab1e3 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -4182,7 +4182,10 @@ hwloop_optimize (hwloop_info loop)
+@@ -4182,7 +4182,10 @@
        entry_after = BB_END (entry_bb);
        while (DEBUG_INSN_P (entry_after)
               || (NOTE_P (entry_after)
@@ -30,6 +28,3 @@ index 206ff80..36ab1e3 100644
          entry_after = PREV_INSN (entry_after);
  
        emit_insn_after (seq, entry_after);
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/879-gcc-xtensa-fix-fprintf-format-specifiers.patch b/packages/gcc-linaro/5.4-2017.05/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
index e75e2587..a14b3cf5 100644
--- a/packages/gcc-linaro/5.4-2017.05/879-gcc-xtensa-fix-fprintf-format-specifiers.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0023-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 | 11 ++++++-----
+ gcc/config/xtensa/xtensa.c |   11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 36ab1e3..8e62d63 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1811,7 +1811,8 @@ xtensa_emit_call (int callop, rtx *operands)
+@@ -1811,7 +1811,8 @@
    rtx tgt = operands[callop];
  
    if (GET_CODE (tgt) == CONST_INT)
@@ -34,7 +32,7 @@ index 36ab1e3..8e62d63 100644
    else if (register_operand (tgt, VOIDmode))
      sprintf (result, "callx%d\t%%%d", WINDOW_SIZE, callop);
    else
-@@ -2382,14 +2383,14 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2382,14 +2383,14 @@
  
      case 'L':
        if (GET_CODE (x) == CONST_INT)
@@ -51,7 +49,7 @@ index 36ab1e3..8e62d63 100644
        else
  	output_operand_lossage ("invalid %%R value");
        break;
-@@ -2403,7 +2404,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2403,7 +2404,7 @@
  
      case 'd':
        if (GET_CODE (x) == CONST_INT)
@@ -60,7 +58,7 @@ index 36ab1e3..8e62d63 100644
        else
  	output_operand_lossage ("invalid %%d value");
        break;
-@@ -2472,7 +2473,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2472,7 +2473,7 @@
        else if (GET_CODE (x) == MEM)
  	output_address (XEXP (x, 0));
        else if (GET_CODE (x) == CONST_INT)
@@ -69,6 +67,3 @@ index 36ab1e3..8e62d63 100644
        else
  	output_addr_const (file, x);
      }
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/880-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/5.4-2017.05/0024-xtensa-fix-PR-target-82181.patch
index b8c2263e..0717f35d 100644
--- a/packages/gcc-linaro/5.4-2017.05/880-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0024-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 8e62d631bce0..a30aa1bcfc33 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -637,6 +637,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -637,6 +637,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 8e62d631bce0..a30aa1bcfc33 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/890-fix-m68k-compile.patch b/packages/gcc-linaro/5.4-2017.05/0025-fix-m68k-compile.patch
index 140977b3..9437f252 100644
--- a/packages/gcc-linaro/4.9-2017.01/890-fix-m68k-compile.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0025-fix-m68k-compile.patch
@@ -2,9 +2,12 @@ remove unused header, which breaks the toolchain building
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c
---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c	2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c	2016-03-18 22:24:40.000000000 +0100
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
 @@ -33,7 +33,6 @@
     using the kernel helper defined below.  There is no support for
     64-bit operations yet.  */
diff --git a/packages/gcc-linaro/6.4-2017.08/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/5.4-2017.05/0026-fix-m68k-uclinux.patch
index 4e186bd3..8a6309e9 100644
--- a/packages/gcc-linaro/6.4-2017.08/891-fix-m68k-uclinux.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0026-fix-m68k-uclinux.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -808,7 +808,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc-linaro/5.4-2017.05/892-microblaze-uclibc.patch b/packages/gcc-linaro/5.4-2017.05/0027-microblaze-uclibc.patch
index a8eb5a69..91d0aa48 100644
--- a/packages/gcc-linaro/5.4-2017.05/892-microblaze-uclibc.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0027-microblaze-uclibc.patch
@@ -2,9 +2,12 @@ Add dynamic linker support for uClibc
 
 Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
 
-diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h
---- gcc-5.3.0.orig/gcc/config/microblaze/linux.h	2015-05-28 16:08:19.000000000 +0200
-+++ gcc-5.3.0/gcc/config/microblaze/linux.h	2016-05-13 09:21:01.579262885 +0200
+---
+ gcc/config/microblaze/linux.h |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/gcc/config/microblaze/linux.h
++++ b/gcc/config/microblaze/linux.h
 @@ -28,7 +28,15 @@
  #undef TLS_NEEDS_GOT
  #define TLS_NEEDS_GOT 1
diff --git a/packages/gcc-linaro/5.4-2017.05/902-unwind-fix-for-musl.patch b/packages/gcc-linaro/5.4-2017.05/0028-unwind-fix-for-musl.patch
index ef470540..d6c63a0d 100644
--- a/packages/gcc-linaro/5.4-2017.05/902-unwind-fix-for-musl.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0028-unwind-fix-for-musl.patch
@@ -17,11 +17,13 @@ On behalf of szabolcs.nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
+---
+ libgcc/unwind-dw2-fde-dip.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -59,6 +59,12 @@
+@@ -65,6 +65,12 @@
  
  #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
      && defined(TARGET_DL_ITERATE_PHDR) \
diff --git a/packages/gcc-linaro/5.4-2017.05/910-nios2-bad-multilib-default.patch b/packages/gcc-linaro/5.4-2017.05/0029-nios2-bad-multilib-default.patch
index d94697f2..5dfe211d 100644
--- a/packages/gcc-linaro/5.4-2017.05/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0029-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/nios2.h gcc-5.3.0/gcc/config/nios2/nios2.h
---- gcc-5.3.0.orig/gcc/config/nios2/nios2.h	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/nios2.h	2016-04-18 10:37:25.998841674 -0700
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -55,11 +55,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB}"
@@ -15,9 +19,8 @@ diff -urpN gcc-5.3.0.orig/gcc/config/nios2/nios2.h gcc-5.3.0/gcc/config/nios2/ni
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/t-nios2 gcc-5.3.0/gcc/config/nios2/t-nios2
---- gcc-5.3.0.orig/gcc/config/nios2/t-nios2	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/t-nios2	2016-04-18 10:36:41.091312157 -0700
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc-linaro/7.1-2017.08/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc-linaro/5.4-2017.05/0030-libgcc-disable-split-stack-nothreads.patch
index 07f9a739..df91a9ff 100644
--- a/packages/gcc-linaro/7.1-2017.08/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0030-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc-linaro/6.4-2017.08/940-uclinux-enable-threads.patch b/packages/gcc-linaro/5.4-2017.05/0031-uclinux-enable-threads.patch
index 490a55b4..0addac91 100644
--- a/packages/gcc-linaro/6.4-2017.08/940-uclinux-enable-threads.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0031-uclinux-enable-threads.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -818,6 +818,9 @@
  *-*-uclinux*)
    extra_options="$extra_options gnu-user.opt"
    use_gcc_stdint=wrap
diff --git a/packages/gcc-linaro/5.4-2017.05/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/5.4-2017.05/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc-linaro/5.4-2017.05/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/packages/gcc-linaro/7.1-2017.08/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/6.4-2017.08/0000-libtool-leave-framework-alone.patch
index bce09eb7..1a86e415 100644
--- a/packages/gcc-linaro/7.1-2017.08/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0000-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/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/6.4-2017.08/0001-uclibc-conf.patch
index d56bf0a1..aef750af 100644
--- a/packages/gcc-linaro/4.8-2015.06/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0001-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/301-missing-execinfo_h.patch b/packages/gcc-linaro/6.4-2017.08/0002-missing-execinfo_h.patch
index 00efda24..c90222a1 100644
--- a/packages/gcc-linaro/4.8-2015.06/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0002-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/5.4-2017.05/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/6.4-2017.08/0003-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5f..fe0f146e 100644
--- a/packages/gcc-linaro/5.4-2017.05/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0003-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,10 +51,9 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
         [AC_MSG_RESULT([yes]); have_pic_shared=yes],
         [AC_MSG_RESULT([no]); have_pic_shared=no])
       if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -29200,6 +29200,9 @@
  
     pluginlibs=
  
@@ -59,7 +63,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
+@@ -29210,6 +29213,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -71,7 +75,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
+@@ -29322,23 +29330,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -102,10 +106,9 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
    ;
    return 0;
  }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
+--- a/libcc1/configure
++++ b/libcc1/configure
+@@ -14531,6 +14531,9 @@
  
     pluginlibs=
  
@@ -115,7 +118,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
+@@ -14541,6 +14544,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -127,7 +130,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
+@@ -14653,23 +14661,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/6.4-2017.08/0004-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/6.4-2017.08/0004-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc-linaro/6.4-2017.08/0004-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc-linaro/4.9-2017.01/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/6.4-2017.08/0005-arm-softfloat-libgcc.patch
index 5efa7fd1..350857dd 100644
--- a/packages/gcc-linaro/4.9-2017.01/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0005-arm-softfloat-libgcc.patch
@@ -1,5 +1,8 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ 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
 @@ -60,7 +60,7 @@
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/6.4-2017.08/0006-arm_unbreak_armv4t.patch
index b7300591..7c374453 100644
--- a/packages/gcc-linaro/6.4-2017.08/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0006-arm_unbreak_armv4t.patch
@@ -1,7 +1,9 @@
 http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
 
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
+---
+ 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/6.4-2017.08/860-cilk-wchar.patch b/packages/gcc-linaro/6.4-2017.08/0007-cilk-wchar.patch
index 1d9916f5..300837f0 100644
--- a/packages/gcc-linaro/6.4-2017.08/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0007-cilk-wchar.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
 --- a/libcilkrts/include/cilk/reducer_min_max.h
 +++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3154,7 +3154,9 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/870-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/6.4-2017.08/0008-xtensa-fix-PR-target-82181.patch
index 5fe38414..1258023d 100644
--- a/packages/gcc-linaro/6.4-2017.08/870-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0008-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 2bdf5ccef979..92fdeb08046d 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -601,6 +601,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -601,6 +601,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 2bdf5ccef979..92fdeb08046d 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/890-fix-m68k-compile.patch b/packages/gcc-linaro/6.4-2017.08/0009-fix-m68k-compile.patch
index 6e63de0c..9437f252 100644
--- a/packages/gcc-linaro/5.4-2017.05/890-fix-m68k-compile.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0009-fix-m68k-compile.patch
@@ -2,9 +2,12 @@ remove unused header, which breaks the toolchain building
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
 @@ -33,7 +33,6 @@
     using the kernel helper defined below.  There is no support for
     64-bit operations yet.  */
diff --git a/packages/gcc-linaro/4.9-2017.01/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/6.4-2017.08/0010-fix-m68k-uclinux.patch
index 4347642d..20d7c4af 100644
--- a/packages/gcc-linaro/4.9-2017.01/891-fix-m68k-uclinux.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0010-fix-m68k-uclinux.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-4.9.3.orig/libgcc/config.host gcc-4.9.3/libgcc/config.host
---- gcc-4.9.3.orig/libgcc/config.host	2014-03-27 16:40:31.000000000 +0100
-+++ gcc-4.9.3/libgcc/config.host	2016-04-05 16:20:53.422809885 +0200
-@@ -750,7 +750,7 @@
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -824,7 +824,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc-linaro/6.4-2017.08/892-libgcc-mkmap-symver-support-skip_underscore.patch b/packages/gcc-linaro/6.4-2017.08/0011-libgcc-mkmap-symver-support-skip_underscore.patch
index 73ee6c5f..c6421d09 100644
--- a/packages/gcc-linaro/6.4-2017.08/892-libgcc-mkmap-symver-support-skip_underscore.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0011-libgcc-mkmap-symver-support-skip_underscore.patch
@@ -35,14 +35,12 @@ version information for Blackfin, instead of using a custom one.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/mkmap-symver.awk | 6 +++++-
+ libgcc/mkmap-symver.awk |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk
-index 266832a..30bb179 100644
 --- a/libgcc/mkmap-symver.awk
 +++ b/libgcc/mkmap-symver.awk
-@@ -47,7 +47,11 @@ state == "nm" && ($1 == "U" || $2 == "U") {
+@@ -47,7 +47,11 @@
  
  state == "nm" && NF == 3 {
    split ($3, s, "@")
@@ -55,6 +53,3 @@ index 266832a..30bb179 100644
    sawsymbol = 1;
    next;
  }
--- 
-2.7.4
-
diff --git a/packages/gcc-linaro/6.4-2017.08/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/packages/gcc-linaro/6.4-2017.08/0012-libgcc-config-bfin-use-the-generic-linker-version-in.patch
index 454295d0..ac75cfa5 100644
--- a/packages/gcc-linaro/6.4-2017.08/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0012-libgcc-config-bfin-use-the-generic-linker-version-in.patch
@@ -22,12 +22,10 @@ symbols in libgcc, and therefore all libgcc symbols were marked as
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/config/bfin/libgcc-glibc.ver | 1894 +----------------------------------
- libgcc/config/bfin/t-linux          |    3 +-
+ libgcc/config/bfin/libgcc-glibc.ver | 1894 ------------------------------------
+ libgcc/config/bfin/t-linux          |    3 
  2 files changed, 4 insertions(+), 1893 deletions(-)
 
-diff --git a/libgcc/config/bfin/libgcc-glibc.ver b/libgcc/config/bfin/libgcc-glibc.ver
-index b1bd2df..2af3df7 100644
 --- a/libgcc/config/bfin/libgcc-glibc.ver
 +++ b/libgcc/config/bfin/libgcc-glibc.ver
 @@ -16,1898 +16,8 @@
@@ -1931,14 +1929,9 @@ index b1bd2df..2af3df7 100644
 +  __smulsi3_highpart
 +  __umulsi3_highpart
  }
-diff --git a/libgcc/config/bfin/t-linux b/libgcc/config/bfin/t-linux
-index 1c42e48..8898157 100644
 --- a/libgcc/config/bfin/t-linux
 +++ b/libgcc/config/bfin/t-linux
 @@ -1 +1,2 @@
 -SHLIB_MAPFILES = $(srcdir)/config/bfin/libgcc-glibc.ver
 +SHLIB_MAPFILES += $(srcdir)/config/bfin/libgcc-glibc.ver
 +SHLIB_MKMAP_OPTS = -v skip_underscore=1
--- 
-2.7.4
-
diff --git a/packages/gcc-linaro/6.4-2017.08/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/packages/gcc-linaro/6.4-2017.08/0013-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
index ce49de7e..f0ada67a 100644
--- a/packages/gcc-linaro/6.4-2017.08/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0013-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
@@ -17,14 +17,12 @@ Fixes PR gcc/68468.
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/unwind-dw2-fde-dip.c | 8 ++++++--
+ libgcc/unwind-dw2-fde-dip.c |    8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
-index f7a1c3f..801bce8 100644
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -124,7 +124,11 @@ static struct frame_hdr_cache_element
+@@ -124,7 +124,11 @@
  {
    _Unwind_Ptr pc_low;
    _Unwind_Ptr pc_high;
@@ -36,7 +34,7 @@ index f7a1c3f..801bce8 100644
    const ElfW(Phdr) *p_eh_frame_hdr;
    const ElfW(Phdr) *p_dynamic;
    struct frame_hdr_cache_element *link;
-@@ -163,7 +167,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
+@@ -163,7 +167,7 @@
    struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr;
    const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic;
    long n, match;
@@ -45,7 +43,7 @@ index f7a1c3f..801bce8 100644
    struct elf32_fdpic_loadaddr load_base;
  #else
    _Unwind_Ptr load_base;
-@@ -347,7 +351,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
+@@ -347,7 +351,7 @@
  	    break;
  	  }
      }
@@ -54,6 +52,3 @@ index f7a1c3f..801bce8 100644
    data->dbase = load_base.got_value;
  # else
  #  error What is DW_EH_PE_datarel base on this platform?
--- 
-2.7.4
-
diff --git a/packages/gcc-linaro/6.4-2017.08/895-bfin-define-REENTRANT.patch b/packages/gcc-linaro/6.4-2017.08/0014-bfin-define-REENTRANT.patch
index e2828a51..633084b9 100644
--- a/packages/gcc-linaro/6.4-2017.08/895-bfin-define-REENTRANT.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0014-bfin-define-REENTRANT.patch
@@ -2,9 +2,12 @@ enable _REENTRANT when -lpthread is used
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-6.2.0.orig/gcc/config/bfin/linux.h gcc-6.2.0/gcc/config/bfin/linux.h
---- gcc-6.2.0.orig/gcc/config/bfin/linux.h	2016-01-04 15:30:50.000000000 +0100
-+++ gcc-6.2.0/gcc/config/bfin/linux.h	2016-09-30 20:48:17.446636819 +0200
+---
+ gcc/config/bfin/linux.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config/bfin/linux.h
++++ b/gcc/config/bfin/linux.h
 @@ -38,6 +38,9 @@
    "%{static:--start-group} %{mfast-fp:-lbffastfp} %G %L %{static:--end-group} \
     %{!static:%{mfast-fp:-lbffastfp} %G}"
diff --git a/packages/gcc-linaro/6.4-2017.08/900-libgfortran-missing-include.patch b/packages/gcc-linaro/6.4-2017.08/0015-libgfortran-missing-include.patch
index 1f474696..701e7b4f 100644
--- a/packages/gcc-linaro/6.4-2017.08/900-libgfortran-missing-include.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0015-libgfortran-missing-include.patch
@@ -1,5 +1,9 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
+---
+ libgfortran/io/close.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libgfortran/io/close.c
++++ b/libgfortran/io/close.c
 @@ -25,6 +25,7 @@
  #include "io.h"
  #include "unix.h"
diff --git a/packages/gcc-linaro/6.4-2017.08/910-nios2-bad-multilib-default.patch b/packages/gcc-linaro/6.4-2017.08/0016-nios2-bad-multilib-default.patch
index 61989e56..4acc4918 100644
--- a/packages/gcc-linaro/6.4-2017.08/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0016-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -63,11 +63,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
@@ -15,9 +19,8 @@ diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc-linaro/5.4-2017.05/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc-linaro/6.4-2017.08/0017-libgcc-disable-split-stack-nothreads.patch
index 07f9a739..df91a9ff 100644
--- a/packages/gcc-linaro/5.4-2017.05/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0017-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc-linaro/5.4-2017.05/940-uclinux-enable-threads.patch b/packages/gcc-linaro/6.4-2017.08/0018-uclinux-enable-threads.patch
index 490a55b4..8e4e0a26 100644
--- a/packages/gcc-linaro/5.4-2017.05/940-uclinux-enable-threads.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0018-uclinux-enable-threads.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -838,6 +838,9 @@
  *-*-uclinux*)
    extra_options="$extra_options gnu-user.opt"
    use_gcc_stdint=wrap
diff --git a/packages/gcc-linaro/6.4-2017.08/951-bionic-ndk.patch b/packages/gcc-linaro/6.4-2017.08/0019-bionic-ndk.patch
index 59c50a89..474dd8c0 100644
--- a/packages/gcc-linaro/6.4-2017.08/951-bionic-ndk.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0019-bionic-ndk.patch
@@ -4,8 +4,10 @@ Date:   Tue Apr 25 19:02:18 2017 -0700
 
     Fix ctype for newer NDK headers
 
-diff --git a/libstdc++-v3/config/os/bionic/ctype_base.h b/libstdc++-v3/config/os/bionic/ctype_base.h
-index 33978f3..c36e63c 100644
+---
+ libstdc++-v3/config/os/bionic/ctype_base.h |   34 +++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)
+
 --- a/libstdc++-v3/config/os/bionic/ctype_base.h
 +++ b/libstdc++-v3/config/os/bionic/ctype_base.h
 @@ -28,6 +28,18 @@
@@ -27,7 +29,7 @@ index 33978f3..c36e63c 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -41,17 +53,17 @@
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
      typedef char 		mask;
diff --git a/packages/gcc-linaro/6.4-2017.08/952-bionic-errno.patch b/packages/gcc-linaro/6.4-2017.08/0020-bionic-errno.patch
index 91f6ca34..0a1a6327 100644
--- a/packages/gcc-linaro/6.4-2017.08/952-bionic-errno.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0020-bionic-errno.patch
@@ -4,11 +4,13 @@ Date:   Tue Apr 25 20:17:03 2017 -0700
 
     Fix, errno is volatile int
 
-diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
-index 6ff12d0..5bbd664 100644
+---
+ libstdc++-v3/src/filesystem/dir.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libstdc++-v3/src/filesystem/dir.cc
 +++ b/libstdc++-v3/src/filesystem/dir.cc
-@@ -147,7 +147,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
+@@ -146,7 +146,7 @@
  
    int err = std::exchange(errno, 0);
    const auto entp = readdir(dirp);
diff --git a/packages/gcc-linaro/6.4-2017.08/970-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0021-crystax.patch
index 30b06d51..f7a051bc 100644
--- a/packages/gcc-linaro/6.4-2017.08/970-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0021-crystax.patch
@@ -7,12 +7,34 @@ Date:   Wed Jul 29 11:28:29 2015 +0300
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
 [Edited: keep libstdc++, drop libcrystax-related modifications]
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index f66e48cd1..1c253496b 100644
+---
+ gcc/config.gcc                             |   17 +++++++-
+ gcc/config/aarch64/aarch64-linux-android.h |   59 +++++++++++++++++++++++++++++
+ gcc/config/aarch64/aarch64-linux.h         |    9 +++-
+ gcc/config/arm/arm.h                       |    3 -
+ gcc/config/arm/arm.md                      |    2 
+ gcc/config/arm/arm.opt                     |    4 +
+ gcc/config/arm/elf.h                       |   10 ++--
+ gcc/config/arm/linux-eabi.h                |    7 ++-
+ gcc/config/i386/gnu-user.h                 |    7 ++-
+ gcc/config/i386/gnu-user64.h               |    5 ++
+ gcc/config/i386/linux-common.h             |    8 +++
+ gcc/config/linux-android.h                 |   13 +++---
+ gcc/config/mips/android.h                  |   49 ++++++++++++++++++++++++
+ gcc/config/mips/gnu-user.h                 |    6 +-
+ gcc/config/mips/linux-common.h             |    2 
+ gcc/config/mips/t-linux-android            |    3 +
+ gcc/config/mips/t-linux-android64          |    4 +
+ libgcc/gthr-posix.h                        |   13 ++++++
+ libstdc++-v3/configure                     |   12 +++++
+ libstdc++-v3/include/bits/locale_facets.h  |   18 +++++++-
+ libstdc++-v3/libsupc++/guard.cc            |    5 ++
+ 21 files changed, 235 insertions(+), 21 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -942,13 +942,17 @@ aarch64*-*-elf | aarch64*-*-rtems*)
- 	TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
+@@ -955,13 +955,17 @@
+ 	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
  	;;
  aarch64*-*-linux*)
 -	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h"
@@ -30,7 +52,7 @@ index f66e48cd1..1c253496b 100644
  	esac
  	aarch64_multilibs="${with_multilib_list}"
  	if test "$aarch64_multilibs" = "default"; then
-@@ -2055,6 +2059,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+@@ -2072,6 +2076,17 @@
  	tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
  	extra_options="${extra_options} linux-android.opt"
  	case ${target} in
@@ -48,9 +70,6 @@ index f66e48cd1..1c253496b 100644
  		mipsisa32r6*)
  			default_mips_arch=mips32r6
  			;;
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-new file mode 100644
-index 000000000..db1288fd0
 --- /dev/null
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -0,0 +1,59 @@
@@ -113,8 +132,6 @@ index 000000000..db1288fd0
 +  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
 +
 +#endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5fcaa59a3..6864195ee 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,14 @@
@@ -133,11 +150,9 @@ index 5fcaa59a3..6864195ee 100644
  
  #undef MUSL_DYNAMIC_LINKER
  #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
-index ad123dde9..97b059de6 100644
 --- a/gcc/config/arm/arm.h
 +++ b/gcc/config/arm/arm.h
-@@ -1888,10 +1888,11 @@ enum arm_auto_incmodes
+@@ -1922,10 +1922,11 @@
  
  #define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2				\
  				 || (TARGET_THUMB1			\
@@ -150,11 +165,9 @@ index ad123dde9..97b059de6 100644
     ? (min >= 0 && max < 512						\
        ? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode)	\
        : min >= -256 && max < 256					\
-diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index 47171b996..eb22d1181 100644
 --- a/gcc/config/arm/arm.md
 +++ b/gcc/config/arm/arm.md
-@@ -8179,7 +8179,7 @@
+@@ -8657,7 +8657,7 @@
     (match_operand:SI 2 "const_int_operand" "")	; total range
     (match_operand:SI 3 "" "")			; table label
     (match_operand:SI 4 "" "")]			; Out of range label
@@ -163,11 +176,9 @@ index 47171b996..eb22d1181 100644
    "
    {
      enum insn_code code;
-diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 0ebe01743..772453889 100644
 --- a/gcc/config/arm/arm.opt
 +++ b/gcc/config/arm/arm.opt
-@@ -193,6 +193,10 @@ mthumb-interwork
+@@ -193,6 +193,10 @@
  Target Report Mask(INTERWORK)
  Support calls between Thumb and ARM instruction sets.
  
@@ -178,8 +189,6 @@ index 0ebe01743..772453889 100644
  mtls-dialect=
  Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU)
  Specify thread local storage scheme.
-diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
-index 77f30554d..32158ed65 100644
 --- a/gcc/config/arm/elf.h
 +++ b/gcc/config/arm/elf.h
 @@ -56,8 +56,7 @@
@@ -202,7 +211,7 @@ index 77f30554d..32158ed65 100644
  #endif
  
  /* The ARM uses @ are a comment character so we need to redefine
-@@ -104,8 +106,8 @@
+@@ -95,8 +97,8 @@
     the code more efficient, but for Thumb-1 it's better to put them out of
     band unless we are generating compressed tables.  */
  #define JUMP_TABLES_IN_TEXT_SECTION					\
@@ -213,8 +222,6 @@ index 77f30554d..32158ed65 100644
  
  #ifndef LINK_SPEC
  #define LINK_SPEC "%{mbig-endian:-EB} %{mlittle-endian:-EL} -X"
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index ace84816e..8c8fa6553 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -108,11 +108,16 @@
@@ -235,11 +242,9 @@ index ace84816e..8c8fa6553 100644
  #undef  LIB_SPEC
  #define LIB_SPEC							\
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index fee33a3ef..22fb2ced9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3.  If not see
+@@ -65,9 +65,14 @@
     When the -shared link option is used a final link is not being
     done.  */
  
@@ -255,11 +260,9 @@ index fee33a3ef..22fb2ced9 100644
  
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 7a02a7eb4..cac4179bc 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
-@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -46,6 +46,11 @@
  #define SPEC_X32 "mx32"
  #endif
  
@@ -271,11 +274,9 @@ index 7a02a7eb4..cac4179bc 100644
  #undef ASM_SPEC
  #define ASM_SPEC "%{" SPEC_32 ":--32} \
   %{" SPEC_64 ":--64} \
-diff --git a/gcc/config/i386/linux-common.h b/gcc/config/i386/linux-common.h
-index 4b9910fa9..3b11ed086 100644
 --- a/gcc/config/i386/linux-common.h
 +++ b/gcc/config/i386/linux-common.h
-@@ -30,7 +30,13 @@ along with GCC; see the file COPYING3.  If not see
+@@ -30,7 +30,13 @@
  #undef CC1_SPEC
  #define CC1_SPEC \
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \
@@ -290,11 +291,9 @@ index 4b9910fa9..3b11ed086 100644
  
  #undef	LINK_SPEC
  #define LINK_SPEC \
-diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h
-index 301a41ccd..9623c88d0 100644
 --- a/gcc/config/linux-android.h
 +++ b/gcc/config/linux-android.h
-@@ -38,15 +39,18 @@
+@@ -38,15 +38,18 @@
    "%{" NOANDROID "|tno-android-ld:" LINUX_SPEC ";:" ANDROID_SPEC "}"
  
  #define ANDROID_LINK_SPEC \
@@ -318,9 +317,6 @@ index 301a41ccd..9623c88d0 100644
  
  #define ANDROID_LIB_SPEC \
    "%{!static: -ldl}"
-diff --git a/gcc/config/mips/android.h b/gcc/config/mips/android.h
-new file mode 100644
-index 000000000..32c539c8d
 --- /dev/null
 +++ b/gcc/config/mips/android.h
 @@ -0,0 +1,49 @@
@@ -373,11 +369,9 @@ index 000000000..32c539c8d
 +									\
 +  /* Use the standard linux specs for everything else.  */		\
 +  LINUX_DRIVER_SELF_SPECS
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 15b549c08..4a2816014 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
-@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -36,6 +36,7 @@
      /* The GNU C++ standard library requires this.  */		\
      if (c_dialect_cxx ())					\
        builtin_define ("_GNU_SOURCE");				\
@@ -385,7 +379,7 @@ index 15b549c08..4a2816014 100644
    } while (0)
  
  #undef SUBTARGET_CPP_SPEC
-@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,7 +72,8 @@
  
  #undef SUBTARGET_ASM_SPEC
  #define SUBTARGET_ASM_SPEC \
@@ -395,7 +389,7 @@ index 15b549c08..4a2816014 100644
  
  /* The MIPS assembler has different syntax for .set. We set it to
     .dummy to trap any errors.  */
-@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -120,7 +122,7 @@
  #endif
  
  #define LINUX_DRIVER_SELF_SPECS \
@@ -404,11 +398,9 @@ index 15b549c08..4a2816014 100644
    MARCH_MTUNE_NATIVE_SPECS,						\
    /* -mplt has no effect without -mno-shared.  Simplify later		\
       specs handling by removing a redundant option.  */			\
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8429a7ca2..8bfacf994 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -35,7 +35,7 @@
  #undef  SUBTARGET_CC1_SPEC
  #define SUBTARGET_CC1_SPEC						\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC,			\
@@ -417,18 +409,12 @@ index 8429a7ca2..8bfacf994 100644
  
  #undef  CC1PLUS_SPEC
  #define CC1PLUS_SPEC							\
-diff --git a/gcc/config/mips/t-linux-android b/gcc/config/mips/t-linux-android
-new file mode 100644
-index 000000000..39f512c81
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android
 @@ -0,0 +1,3 @@
 +MULTILIB_OPTIONS = mips32r2/mips32r6
 +MULTILIB_DIRNAMES = mips-r2 mips-r6
 +MULTILIB_OSDIRNAMES = ../libr2 ../libr6
-diff --git a/gcc/config/mips/t-linux-android64 b/gcc/config/mips/t-linux-android64
-new file mode 100644
-index 000000000..55cab7d62
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android64
 @@ -0,0 +1,4 @@
@@ -436,11 +422,9 @@ index 000000000..55cab7d62
 +MULTILIB_DIRNAMES = 32 mips-r1 mips-r2 mips-r6 mips64-r2 mips64-r6
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../libr2 ../libr6 ../lib64r2 ../lib64
 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6
-diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
-index 555c0fe24..47c8655f9 100644
 --- a/libgcc/gthr-posix.h
 +++ b/libgcc/gthr-posix.h
-@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -32,6 +32,19 @@
  #define __GTHREADS 1
  #define __GTHREADS_CXX0X 1
  
@@ -460,11 +444,9 @@ index 555c0fe24..47c8655f9 100644
  #include <pthread.h>
  
  #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 41797a971..f746e8353 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -78319,6 +78341,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78389,6 +78389,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -477,7 +459,7 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-@@ -78377,6 +78405,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78447,6 +78453,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -490,8 +472,6 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
-index e3e206b7d..e85dc2c76 100644
 --- a/libstdc++-v3/include/bits/locale_facets.h
 +++ b/libstdc++-v3/include/bits/locale_facets.h
 @@ -47,6 +47,20 @@
@@ -515,7 +495,7 @@ index e3e206b7d..e85dc2c76 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -1102,7 +1116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1102,7 +1116,7 @@
         *  @return  @a __hi.
        */
        virtual const char*
@@ -524,7 +504,7 @@ index e3e206b7d..e85dc2c76 100644
        {
  	__builtin_memcpy(__to, __lo, __hi - __lo);
  	return __hi;
-@@ -1163,7 +1177,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1163,7 +1177,7 @@
  
      private:
        void _M_narrow_init() const;
@@ -533,8 +513,6 @@ index e3e206b7d..e85dc2c76 100644
      };
  
  #ifdef _GLIBCXX_USE_WCHAR_T
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 9b617998f..c149169bb 100644
 --- a/libstdc++-v3/libsupc++/guard.cc
 +++ b/libstdc++-v3/libsupc++/guard.cc
 @@ -33,7 +33,12 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/971-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0022-crystax.patch
index 748a3812..f1f9eb12 100644
--- a/packages/gcc-linaro/6.4-2017.08/971-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0022-crystax.patch
@@ -6,8 +6,10 @@ Date:   Thu Aug 13 16:11:54 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi
-index 8f1307c55..cbbec5bd2 100644
+---
+ gcc/config/arm/t-linux-androideabi |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 --- a/gcc/config/arm/t-linux-androideabi
 +++ b/gcc/config/arm/t-linux-androideabi
 @@ -1,8 +1,9 @@
diff --git a/packages/gcc-linaro/7.1-2017.08/972-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0023-crystax.patch
index b9077bef..f6dc7257 100644
--- a/packages/gcc-linaro/7.1-2017.08/972-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0023-crystax.patch
@@ -10,11 +10,23 @@ Date:   Mon Apr 14 15:59:47 2014 -0700
     Change-Id: Ibda473188e5a10f2a0592f2494ad00ad1f91e04b
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config.in b/gcc/config.in
-index 115cb6163..933916833 100644
+---
+ gcc/config.in                          |    6 +++++
+ gcc/config/alpha/elf.h                 |    4 +++
+ gcc/config/freebsd.h                   |    4 +++
+ gcc/config/gnu-user.h                  |    4 +++
+ gcc/config/openbsd.h                   |    4 +++
+ gcc/config/rs6000/sysv4.h              |    6 ++++-
+ gcc/config/sol2.h                      |    4 +++
+ gcc/configure                          |   36 +++++++++++++++++++++++++++++++++
+ gcc/configure.ac                       |   29 ++++++++++++++++++++++++++
+ gcc/testsuite/g++.dg/eh/spec3-static.C |   25 ++++++++++++++++++++++
+ libgcc/crtstuff.c                      |   11 ++++++----
+ 11 files changed, 128 insertions(+), 5 deletions(-)
+
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -2119,6 +2119,12 @@
+@@ -2144,6 +2144,12 @@
  #endif
  
  
@@ -27,11 +39,9 @@ index 115cb6163..933916833 100644
  /* Define to 1 if the 'long long' type is wider than 'long' but still
     efficiently supported by the host hardware. */
  #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
-index 093c38bba..54b3e0c91 100644
 --- a/gcc/config/alpha/elf.h
 +++ b/gcc/config/alpha/elf.h
-@@ -168,5 +168,9 @@ extern int alpha_this_gpdisp_sequence_number;
+@@ -168,5 +168,9 @@
     I imagine that other systems will catch up.  In the meantime, it
     doesn't harm to make sure that the data exists to be used later.  */
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -41,11 +51,9 @@ index 093c38bba..54b3e0c91 100644
  #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
  #endif
 +#endif
-diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h
-index 5ded869d2..5f51ac81d 100644
 --- a/gcc/config/freebsd.h
 +++ b/gcc/config/freebsd.h
-@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3.  If not see
+@@ -45,8 +45,12 @@
  #define LIB_SPEC FBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -58,11 +66,9 @@ index 5ded869d2..5f51ac81d 100644
  
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b0bf40a95..d1874bc29 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -118,8 +118,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -118,8 +118,12 @@
  #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -75,11 +81,9 @@ index b0bf40a95..d1874bc29 100644
  
  #undef LINK_GCC_C_SEQUENCE_SPEC
  #define LINK_GCC_C_SEQUENCE_SPEC \
-diff --git a/gcc/config/openbsd.h b/gcc/config/openbsd.h
-index 37ecfc43f..a5f1b9955 100644
 --- a/gcc/config/openbsd.h
 +++ b/gcc/config/openbsd.h
-@@ -136,8 +136,12 @@ while (0)
+@@ -136,8 +136,12 @@
  #define LIB_SPEC OBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -92,11 +96,9 @@ index 37ecfc43f..a5f1b9955 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC OBSD_LIB_SPEC
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index cbf909722..eb2217fad 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -800,7 +800,11 @@
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -109,11 +111,9 @@ index cbf909722..eb2217fad 100644
  #endif
  
  #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
-diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 5160e1fda..7632a5081 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
-@@ -347,7 +347,11 @@ along with GCC; see the file COPYING3.  If not see
+@@ -347,7 +347,11 @@
  /* Solaris 11 build 135+ implements dl_iterate_phdr.  GNU ld needs
     --eh-frame-hdr to create the required .eh_frame_hdr sections.  */
  #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
@@ -125,11 +125,9 @@ index 5160e1fda..7632a5081 100644
  #endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
  #endif
  
-diff --git a/gcc/configure b/gcc/configure
-index 1c6e3407c..28ad05004 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -934,6 +934,7 @@ enable_fix_cortex_a53_835769
+@@ -934,6 +934,7 @@
  enable_fix_cortex_a53_843419
  with_glibc_version
  enable_gnu_unique_object
@@ -137,7 +135,7 @@ index 1c6e3407c..28ad05004 100755
  enable_linker_build_id
  enable_default_ssp
  with_long_double_128
-@@ -1670,6 +1671,9 @@ Optional Features:
+@@ -1670,6 +1671,9 @@
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
                            extension on glibc systems
@@ -147,7 +145,7 @@ index 1c6e3407c..28ad05004 100755
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
    --enable-default-ssp    enable Stack Smashing Protection as default
-@@ -27703,6 +27707,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+@@ -27786,6 +27790,38 @@
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
  
@@ -186,11 +184,9 @@ index 1c6e3407c..28ad05004 100755
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_eh_frame_hdr" >&5
  $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; }
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9ae..0cf7419e7 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4828,6 +4828,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
+@@ -4861,6 +4861,35 @@
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  	AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
  [Define if your linker supports .eh_frame_hdr.])
@@ -226,9 +222,6 @@ index 6c1dcd9ae..0cf7419e7 100644
  fi
  AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr)
  
-diff --git a/gcc/testsuite/g++.dg/eh/spec3-static.C b/gcc/testsuite/g++.dg/eh/spec3-static.C
-new file mode 100644
-index 000000000..15408effa
 --- /dev/null
 +++ b/gcc/testsuite/g++.dg/eh/spec3-static.C
 @@ -0,0 +1,25 @@
@@ -257,11 +250,9 @@ index 000000000..15408effa
 +  try {	func(); }
 +  catch (A& a) { }
 +}
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index f3343fc4f..d42647779 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -88,7 +88,8 @@ call_ ## FUNC (void)					\
+@@ -88,7 +88,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -271,7 +262,7 @@ index f3343fc4f..d42647779 100644
      && defined(BSD_DL_ITERATE_PHDR_AVAILABLE)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -97,7 +98,8 @@ call_ ## FUNC (void)					\
+@@ -97,7 +98,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \
@@ -281,7 +272,7 @@ index f3343fc4f..d42647779 100644
      && defined(__sun__) && defined(__svr4__)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -106,7 +108,8 @@ call_ ## FUNC (void)					\
+@@ -106,7 +108,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -291,7 +282,7 @@ index f3343fc4f..d42647779 100644
      && defined(__GLIBC__) && __GLIBC__ >= 2
  #include <link.h>
  /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
-@@ -121,7 +124,7 @@ call_ ## FUNC (void)					\
+@@ -121,7 +124,7 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
diff --git a/packages/gcc-linaro/7.1-2017.08/973-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0024-crystax.patch
index b96ece33..e5476478 100644
--- a/packages/gcc-linaro/7.1-2017.08/973-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0024-crystax.patch
@@ -6,11 +6,13 @@ Date:   Thu Aug 20 19:11:07 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8bd..5c89fcab0 100644
+---
+ gcc/config/i386/i386.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -14631,6 +14631,7 @@ legitimate_pic_address_disp_p (rtx disp)
+@@ -14684,6 +14684,7 @@
  	  else if (!SYMBOL_REF_FAR_ADDR_P (op0)
  		   && (SYMBOL_REF_LOCAL_P (op0)
  		       || (HAVE_LD_PIE_COPYRELOC
diff --git a/packages/gcc-linaro/7.1-2017.08/974-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0025-crystax.patch
index 9db4f545..8f2eb438 100644
--- a/packages/gcc-linaro/7.1-2017.08/974-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0025-crystax.patch
@@ -6,11 +6,13 @@ Date:   Fri Aug 21 17:41:59 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 47a7d061a..67a680f90 100644
+---
+ libgcc/gthr.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
-@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -145,7 +145,11 @@
  #define GTHREAD_USE_WEAK 1
  #endif
  #endif
diff --git a/packages/gcc-linaro/7.1-2017.08/975-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0026-crystax.patch
index 9efc2a48..f555f276 100644
--- a/packages/gcc-linaro/7.1-2017.08/975-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0026-crystax.patch
@@ -9,11 +9,13 @@ Date:   Mon Apr 14 21:05:51 2014 -0700
     Change-Id: Ie1de9f946f397196bb6f1623f5add86933739484
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index 5974c65d3..71b2c7aa9 100644
+---
+ gcc/config/arm/arm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/arm.c
 +++ b/gcc/config/arm/arm.c
-@@ -22403,9 +22403,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
+@@ -22178,9 +22178,13 @@
  	memsize = MEM_SIZE (x);
  
  	/* Only certain alignment specifiers are supported by the hardware.  */
diff --git a/packages/gcc-linaro/6.4-2017.08/976-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0027-crystax.patch
index 790d4a9d..8c21a1cc 100644
--- a/packages/gcc-linaro/6.4-2017.08/976-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0027-crystax.patch
@@ -6,8 +6,10 @@ Date:   Sat Aug 22 09:55:55 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index a1f98d3d1..3725799be 100644
+---
+ gcc/config/i386/pmm_malloc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -31,7 +31,7 @@
diff --git a/packages/gcc-linaro/7.1-2017.08/977-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0028-crystax.patch
index 0211d728..ccb81fd6 100644
--- a/packages/gcc-linaro/7.1-2017.08/977-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0028-crystax.patch
@@ -6,11 +6,14 @@ Date:   Tue Aug 25 09:36:42 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-index db1288fd0..38bc64d61 100644
+---
+ gcc/config/aarch64/aarch64-linux-android.h |    4 ++++
+ gcc/config/mips/linux-common.h             |    4 ++++
+ 2 files changed, 8 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux-android.h
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
-@@ -57,4 +57,8 @@
+@@ -56,4 +56,8 @@
  #define ENDFILE_SPEC \
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
  
@@ -19,11 +22,9 @@ index db1288fd0..38bc64d61 100644
 +#endif
 +
  #endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8bfacf994..262a9a341 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -63,3 +63,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -62,3 +62,7 @@
  
  /* The default value isn't sufficient in 64-bit mode.  */
  #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
diff --git a/packages/gcc-linaro/6.4-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/6.4-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc-linaro/6.4-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/packages/gcc-linaro/6.4-2017.08/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/7.1-2017.08/0000-libtool-leave-framework-alone.patch
index bce09eb7..1a86e415 100644
--- a/packages/gcc-linaro/6.4-2017.08/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0000-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/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/7.1-2017.08/0001-uclibc-conf.patch b/packages/gcc-linaro/7.1-2017.08/0001-uclibc-conf.patch
new file mode 100644
index 00000000..aef750af
--- /dev/null
+++ b/packages/gcc-linaro/7.1-2017.08/0001-uclibc-conf.patch
@@ -0,0 +1,17 @@
+---
+ 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
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
diff --git a/packages/gcc-linaro/7.1-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/7.1-2017.08/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5f..56e05c52 100644
--- a/packages/gcc-linaro/7.1-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,10 +51,9 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
         [AC_MSG_RESULT([yes]); have_pic_shared=yes],
         [AC_MSG_RESULT([no]); have_pic_shared=no])
       if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -29444,6 +29444,9 @@
  
     pluginlibs=
  
@@ -59,7 +63,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
+@@ -29454,6 +29457,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -71,7 +75,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
+@@ -29566,23 +29574,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -102,10 +106,9 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
    ;
    return 0;
  }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
+--- a/libcc1/configure
++++ b/libcc1/configure
+@@ -14553,6 +14553,9 @@
  
     pluginlibs=
  
@@ -115,7 +118,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
+@@ -14563,6 +14566,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -127,7 +130,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
+@@ -14675,23 +14683,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/7.1-2017.08/0003-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/7.1-2017.08/0003-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc-linaro/7.1-2017.08/0003-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc-linaro/7.1-2017.08/0004-arm-softfloat-libgcc.patch b/packages/gcc-linaro/7.1-2017.08/0004-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..d9800365
--- /dev/null
+++ b/packages/gcc-linaro/7.1-2017.08/0004-arm-softfloat-libgcc.patch
@@ -0,0 +1,31 @@
+---
+ 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
+@@ -58,7 +58,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- 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 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
diff --git a/packages/gcc-linaro/4.9-2017.01/860-cilk-wchar.patch b/packages/gcc-linaro/7.1-2017.08/0005-cilk-wchar.patch
index 18374051..d2230cd4 100644
--- a/packages/gcc-linaro/4.9-2017.01/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0005-cilk-wchar.patch
@@ -10,11 +10,9 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- host-gcc-final-4.9.2.orig/libcilkrts/include/cilk/reducer_min_max.h
-+++ host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
+--- a/libcilkrts/include/cilk/reducer_min_max.h
++++ b/libcilkrts/include/cilk/reducer_min_max.h
+@@ -3289,7 +3289,9 @@
  CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
  CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
  CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
@@ -24,7 +22,7 @@ Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
  CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
  CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
  CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
+@@ -3441,7 +3443,9 @@
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
@@ -34,7 +32,7 @@ Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
+@@ -3567,7 +3571,9 @@
  CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
  CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
  CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
@@ -44,7 +42,7 @@ Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
  CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
  CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
  CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
+@@ -3719,7 +3725,9 @@
  CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
  CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
  CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
diff --git a/packages/gcc-linaro/7.1-2017.08/870-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/7.1-2017.08/0006-xtensa-fix-PR-target-82181.patch
index 7ac7cd95..ec9f1f8c 100644
--- a/packages/gcc-linaro/7.1-2017.08/870-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0006-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 25e4a2894c3b..8c404187107b 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -605,6 +605,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -605,6 +605,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 25e4a2894c3b..8c404187107b 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/7.1-2017.08/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/7.1-2017.08/0007-fix-m68k-uclinux.patch
index 4e186bd3..0acbdfc2 100644
--- a/packages/gcc-linaro/7.1-2017.08/891-fix-m68k-uclinux.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0007-fix-m68k-uclinux.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -837,7 +837,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc-linaro/7.1-2017.08/900-libgfortran-missing-include.patch b/packages/gcc-linaro/7.1-2017.08/0008-libgfortran-missing-include.patch
index 1f474696..701e7b4f 100644
--- a/packages/gcc-linaro/7.1-2017.08/900-libgfortran-missing-include.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0008-libgfortran-missing-include.patch
@@ -1,5 +1,9 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
+---
+ libgfortran/io/close.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libgfortran/io/close.c
++++ b/libgfortran/io/close.c
 @@ -25,6 +25,7 @@
  #include "io.h"
  #include "unix.h"
diff --git a/packages/gcc-linaro/7.1-2017.08/910-nios2-bad-multilib-default.patch b/packages/gcc-linaro/7.1-2017.08/0009-nios2-bad-multilib-default.patch
index 61989e56..4acc4918 100644
--- a/packages/gcc-linaro/7.1-2017.08/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0009-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -63,11 +63,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
@@ -15,9 +19,8 @@ diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc-linaro/6.4-2017.08/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc-linaro/7.1-2017.08/0010-libgcc-disable-split-stack-nothreads.patch
index 07f9a739..df91a9ff 100644
--- a/packages/gcc-linaro/6.4-2017.08/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0010-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc-linaro/7.1-2017.08/951-bionic-ndk.patch b/packages/gcc-linaro/7.1-2017.08/0011-bionic-ndk.patch
index 59c50a89..474dd8c0 100644
--- a/packages/gcc-linaro/7.1-2017.08/951-bionic-ndk.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0011-bionic-ndk.patch
@@ -4,8 +4,10 @@ Date:   Tue Apr 25 19:02:18 2017 -0700
 
     Fix ctype for newer NDK headers
 
-diff --git a/libstdc++-v3/config/os/bionic/ctype_base.h b/libstdc++-v3/config/os/bionic/ctype_base.h
-index 33978f3..c36e63c 100644
+---
+ libstdc++-v3/config/os/bionic/ctype_base.h |   34 +++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)
+
 --- a/libstdc++-v3/config/os/bionic/ctype_base.h
 +++ b/libstdc++-v3/config/os/bionic/ctype_base.h
 @@ -28,6 +28,18 @@
@@ -27,7 +29,7 @@ index 33978f3..c36e63c 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -41,17 +53,17 @@
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
      typedef char 		mask;
diff --git a/packages/gcc-linaro/7.1-2017.08/952-bionic-errno.patch b/packages/gcc-linaro/7.1-2017.08/0012-bionic-errno.patch
index 91f6ca34..0a1a6327 100644
--- a/packages/gcc-linaro/7.1-2017.08/952-bionic-errno.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0012-bionic-errno.patch
@@ -4,11 +4,13 @@ Date:   Tue Apr 25 20:17:03 2017 -0700
 
     Fix, errno is volatile int
 
-diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
-index 6ff12d0..5bbd664 100644
+---
+ libstdc++-v3/src/filesystem/dir.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libstdc++-v3/src/filesystem/dir.cc
 +++ b/libstdc++-v3/src/filesystem/dir.cc
-@@ -147,7 +147,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
+@@ -146,7 +146,7 @@
  
    int err = std::exchange(errno, 0);
    const auto entp = readdir(dirp);
diff --git a/packages/gcc-linaro/7.1-2017.08/970-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0013-crystax.patch
index 7324d7fb..e53bcb82 100644
--- a/packages/gcc-linaro/7.1-2017.08/970-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0013-crystax.patch
@@ -7,12 +7,34 @@ Date:   Wed Jul 29 11:28:29 2015 +0300
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
 [Edited: keep libstdc++, drop libcrystax-related modifications]
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index f66e48cd1..1c253496b 100644
+---
+ gcc/config.gcc                             |   17 +++++++-
+ gcc/config/aarch64/aarch64-linux-android.h |   59 +++++++++++++++++++++++++++++
+ gcc/config/aarch64/aarch64-linux.h         |    9 +++-
+ gcc/config/arm/arm.h                       |    3 -
+ gcc/config/arm/arm.md                      |    2 
+ gcc/config/arm/arm.opt                     |    4 +
+ gcc/config/arm/elf.h                       |    9 ++--
+ gcc/config/arm/linux-eabi.h                |    7 ++-
+ gcc/config/i386/gnu-user.h                 |    7 ++-
+ gcc/config/i386/gnu-user64.h               |    5 ++
+ gcc/config/i386/linux-common.h             |    8 +++
+ gcc/config/linux-android.h                 |   13 +++---
+ gcc/config/mips/android.h                  |   49 ++++++++++++++++++++++++
+ gcc/config/mips/gnu-user.h                 |    6 +-
+ gcc/config/mips/linux-common.h             |    2 
+ gcc/config/mips/t-linux-android            |    3 +
+ gcc/config/mips/t-linux-android64          |    4 +
+ libgcc/gthr-posix.h                        |   13 ++++++
+ libstdc++-v3/configure                     |   12 +++++
+ libstdc++-v3/include/bits/locale_facets.h  |   18 +++++++-
+ libstdc++-v3/libsupc++/guard.cc            |    5 ++
+ 21 files changed, 235 insertions(+), 20 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -942,13 +942,17 @@ aarch64*-*-elf | aarch64*-*-rtems*)
- 	TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
+@@ -961,13 +961,17 @@
+ 	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
  	;;
  aarch64*-*-linux*)
 -	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h"
@@ -30,7 +52,7 @@ index f66e48cd1..1c253496b 100644
  	esac
  	aarch64_multilibs="${with_multilib_list}"
  	if test "$aarch64_multilibs" = "default"; then
-@@ -2055,6 +2059,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+@@ -2074,6 +2078,17 @@
  	tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
  	extra_options="${extra_options} linux-android.opt"
  	case ${target} in
@@ -48,9 +70,6 @@ index f66e48cd1..1c253496b 100644
  		mipsisa32r6*)
  			default_mips_arch=mips32r6
  			;;
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-new file mode 100644
-index 000000000..db1288fd0
 --- /dev/null
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -0,0 +1,59 @@
@@ -113,8 +132,6 @@ index 000000000..db1288fd0
 +  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
 +
 +#endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5fcaa59a3..6864195ee 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,14 @@
@@ -133,11 +150,9 @@ index 5fcaa59a3..6864195ee 100644
  
  #undef MUSL_DYNAMIC_LINKER
  #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
-index ad123dde9..97b059de6 100644
 --- a/gcc/config/arm/arm.h
 +++ b/gcc/config/arm/arm.h
-@@ -1888,10 +1888,11 @@ enum arm_auto_incmodes
+@@ -1878,10 +1878,11 @@
  
  #define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2				\
  				 || (TARGET_THUMB1			\
@@ -150,11 +165,9 @@ index ad123dde9..97b059de6 100644
     ? (min >= 0 && max < 512						\
        ? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode)	\
        : min >= -256 && max < 256					\
-diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index 47171b996..eb22d1181 100644
 --- a/gcc/config/arm/arm.md
 +++ b/gcc/config/arm/arm.md
-@@ -8179,7 +8179,7 @@
+@@ -8668,7 +8668,7 @@
     (match_operand:SI 2 "const_int_operand" "")	; total range
     (match_operand:SI 3 "" "")			; table label
     (match_operand:SI 4 "" "")]			; Out of range label
@@ -163,11 +176,9 @@ index 47171b996..eb22d1181 100644
    "
    {
      enum insn_code code;
-diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 0ebe01743..772453889 100644
 --- a/gcc/config/arm/arm.opt
 +++ b/gcc/config/arm/arm.opt
-@@ -193,6 +193,10 @@ mthumb-interwork
+@@ -193,6 +193,10 @@
  Target Report Mask(INTERWORK)
  Support calls between Thumb and ARM instruction sets.
  
@@ -178,8 +189,6 @@ index 0ebe01743..772453889 100644
  mtls-dialect=
  Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU)
  Specify thread local storage scheme.
-diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
-index 77f30554d..32158ed65 100644
 --- a/gcc/config/arm/elf.h
 +++ b/gcc/config/arm/elf.h
 @@ -56,8 +56,7 @@
@@ -202,23 +211,19 @@ index 77f30554d..32158ed65 100644
  #endif
  
  /* The ARM uses @ are a comment character so we need to redefine
-@@ -104,8 +106,9 @@
+@@ -95,7 +97,8 @@
     the code more efficient, but for Thumb-1 it's better to put them out of
     band unless we are generating compressed tables.  */
  #define JUMP_TABLES_IN_TEXT_SECTION					\
 -   ((TARGET_32BIT || (TARGET_THUMB && (optimize_size || flag_pic))) \
--    && !target_pure_code)
 +   ((TARGET_32BIT || (TARGET_THUMB && !inline_thumb1_jump_table \
 +                    && (optimize_size || flag_pic))) \
-+    && !target_pure_code)
+     && !target_pure_code)
  
  #ifndef LINK_SPEC
- #define LINK_SPEC "%{mbig-endian:-EB} %{mlittle-endian:-EL} -X"
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index ace84816e..8c8fa6553 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
-@@ -108,11 +108,16 @@
+@@ -102,11 +102,16 @@
  #define CC1_SPEC							\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC " " ASAN_CC1_SPEC,	\
  		       GNU_USER_TARGET_CC1_SPEC " " ASAN_CC1_SPEC " "	\
@@ -236,11 +241,9 @@ index ace84816e..8c8fa6553 100644
  #undef  LIB_SPEC
  #define LIB_SPEC							\
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index fee33a3ef..22fb2ced9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3.  If not see
+@@ -65,9 +65,14 @@
     When the -shared link option is used a final link is not being
     done.  */
  
@@ -256,11 +259,9 @@ index fee33a3ef..22fb2ced9 100644
  
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 7a02a7eb4..cac4179bc 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
-@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -46,6 +46,11 @@
  #define SPEC_X32 "mx32"
  #endif
  
@@ -272,11 +273,9 @@ index 7a02a7eb4..cac4179bc 100644
  #undef ASM_SPEC
  #define ASM_SPEC "%{" SPEC_32 ":--32} \
   %{" SPEC_64 ":--64} \
-diff --git a/gcc/config/i386/linux-common.h b/gcc/config/i386/linux-common.h
-index 4b9910fa9..3b11ed086 100644
 --- a/gcc/config/i386/linux-common.h
 +++ b/gcc/config/i386/linux-common.h
-@@ -30,7 +30,13 @@ along with GCC; see the file COPYING3.  If not see
+@@ -30,7 +30,13 @@
  #undef CC1_SPEC
  #define CC1_SPEC \
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \
@@ -291,11 +290,9 @@ index 4b9910fa9..3b11ed086 100644
  
  #undef	LINK_SPEC
  #define LINK_SPEC \
-diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h
-index 301a41ccd..9623c88d0 100644
 --- a/gcc/config/linux-android.h
 +++ b/gcc/config/linux-android.h
-@@ -38,15 +39,18 @@
+@@ -38,15 +38,18 @@
    "%{" NOANDROID "|tno-android-ld:" LINUX_SPEC ";:" ANDROID_SPEC "}"
  
  #define ANDROID_LINK_SPEC \
@@ -319,9 +316,6 @@ index 301a41ccd..9623c88d0 100644
  
  #define ANDROID_LIB_SPEC \
    "%{!static: -ldl}"
-diff --git a/gcc/config/mips/android.h b/gcc/config/mips/android.h
-new file mode 100644
-index 000000000..32c539c8d
 --- /dev/null
 +++ b/gcc/config/mips/android.h
 @@ -0,0 +1,49 @@
@@ -374,11 +368,9 @@ index 000000000..32c539c8d
 +									\
 +  /* Use the standard linux specs for everything else.  */		\
 +  LINUX_DRIVER_SELF_SPECS
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 15b549c08..4a2816014 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
-@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -36,6 +36,7 @@
      /* The GNU C++ standard library requires this.  */		\
      if (c_dialect_cxx ())					\
        builtin_define ("_GNU_SOURCE");				\
@@ -386,7 +378,7 @@ index 15b549c08..4a2816014 100644
    } while (0)
  
  #undef SUBTARGET_CPP_SPEC
-@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,7 +72,8 @@
  
  #undef SUBTARGET_ASM_SPEC
  #define SUBTARGET_ASM_SPEC \
@@ -396,7 +388,7 @@ index 15b549c08..4a2816014 100644
  
  /* The MIPS assembler has different syntax for .set. We set it to
     .dummy to trap any errors.  */
-@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -120,7 +122,7 @@
  #endif
  
  #define LINUX_DRIVER_SELF_SPECS \
@@ -405,11 +397,9 @@ index 15b549c08..4a2816014 100644
    MARCH_MTUNE_NATIVE_SPECS,						\
    /* -mplt has no effect without -mno-shared.  Simplify later		\
       specs handling by removing a redundant option.  */			\
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8429a7ca2..8bfacf994 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -35,7 +35,7 @@
  #undef  SUBTARGET_CC1_SPEC
  #define SUBTARGET_CC1_SPEC						\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC,			\
@@ -418,18 +408,12 @@ index 8429a7ca2..8bfacf994 100644
  
  #undef  CC1PLUS_SPEC
  #define CC1PLUS_SPEC							\
-diff --git a/gcc/config/mips/t-linux-android b/gcc/config/mips/t-linux-android
-new file mode 100644
-index 000000000..39f512c81
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android
 @@ -0,0 +1,3 @@
 +MULTILIB_OPTIONS = mips32r2/mips32r6
 +MULTILIB_DIRNAMES = mips-r2 mips-r6
 +MULTILIB_OSDIRNAMES = ../libr2 ../libr6
-diff --git a/gcc/config/mips/t-linux-android64 b/gcc/config/mips/t-linux-android64
-new file mode 100644
-index 000000000..55cab7d62
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android64
 @@ -0,0 +1,4 @@
@@ -437,11 +421,9 @@ index 000000000..55cab7d62
 +MULTILIB_DIRNAMES = 32 mips-r1 mips-r2 mips-r6 mips64-r2 mips64-r6
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../libr2 ../libr6 ../lib64r2 ../lib64
 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6
-diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
-index 555c0fe24..47c8655f9 100644
 --- a/libgcc/gthr-posix.h
 +++ b/libgcc/gthr-posix.h
-@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -32,6 +32,19 @@
  #define __GTHREADS 1
  #define __GTHREADS_CXX0X 1
  
@@ -461,11 +443,9 @@ index 555c0fe24..47c8655f9 100644
  #include <pthread.h>
  
  #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 41797a971..f746e8353 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -78319,6 +78341,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78536,6 +78536,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -478,7 +458,7 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-@@ -78377,6 +78405,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78594,6 +78600,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -491,8 +471,6 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
-index e3e206b7d..e85dc2c76 100644
 --- a/libstdc++-v3/include/bits/locale_facets.h
 +++ b/libstdc++-v3/include/bits/locale_facets.h
 @@ -47,6 +47,20 @@
@@ -516,7 +494,7 @@ index e3e206b7d..e85dc2c76 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -1102,7 +1116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1102,7 +1116,7 @@
         *  @return  @a __hi.
        */
        virtual const char*
@@ -525,7 +503,7 @@ index e3e206b7d..e85dc2c76 100644
        {
  	__builtin_memcpy(__to, __lo, __hi - __lo);
  	return __hi;
-@@ -1163,7 +1177,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1163,7 +1177,7 @@
  
      private:
        void _M_narrow_init() const;
@@ -534,11 +512,9 @@ index e3e206b7d..e85dc2c76 100644
      };
  
  #ifdef _GLIBCXX_USE_WCHAR_T
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 9b617998f..c149169bb 100644
 --- a/libstdc++-v3/libsupc++/guard.cc
 +++ b/libstdc++-v3/libsupc++/guard.cc
-@@ -33,7 +33,12 @@
+@@ -34,7 +34,12 @@
  #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \
    && (ATOMIC_INT_LOCK_FREE > 1) && defined(_GLIBCXX_HAVE_LINUX_FUTEX)
  # include <climits>
diff --git a/packages/gcc-linaro/7.1-2017.08/971-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0014-crystax.patch
index 748a3812..f1f9eb12 100644
--- a/packages/gcc-linaro/7.1-2017.08/971-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0014-crystax.patch
@@ -6,8 +6,10 @@ Date:   Thu Aug 13 16:11:54 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi
-index 8f1307c55..cbbec5bd2 100644
+---
+ gcc/config/arm/t-linux-androideabi |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 --- a/gcc/config/arm/t-linux-androideabi
 +++ b/gcc/config/arm/t-linux-androideabi
 @@ -1,8 +1,9 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/972-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0015-crystax.patch
index b9077bef..f1de8ede 100644
--- a/packages/gcc-linaro/6.4-2017.08/972-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0015-crystax.patch
@@ -10,11 +10,23 @@ Date:   Mon Apr 14 15:59:47 2014 -0700
     Change-Id: Ibda473188e5a10f2a0592f2494ad00ad1f91e04b
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config.in b/gcc/config.in
-index 115cb6163..933916833 100644
+---
+ gcc/config.in                          |    6 +++++
+ gcc/config/alpha/elf.h                 |    4 +++
+ gcc/config/freebsd.h                   |    4 +++
+ gcc/config/gnu-user.h                  |    4 +++
+ gcc/config/openbsd.h                   |    4 +++
+ gcc/config/rs6000/sysv4.h              |    6 ++++-
+ gcc/config/sol2.h                      |    4 +++
+ gcc/configure                          |   36 +++++++++++++++++++++++++++++++++
+ gcc/configure.ac                       |   29 ++++++++++++++++++++++++++
+ gcc/testsuite/g++.dg/eh/spec3-static.C |   25 ++++++++++++++++++++++
+ libgcc/crtstuff.c                      |   11 ++++++----
+ 11 files changed, 128 insertions(+), 5 deletions(-)
+
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -2119,6 +2119,12 @@
+@@ -2176,6 +2176,12 @@
  #endif
  
  
@@ -27,11 +39,9 @@ index 115cb6163..933916833 100644
  /* Define to 1 if the 'long long' type is wider than 'long' but still
     efficiently supported by the host hardware. */
  #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
-index 093c38bba..54b3e0c91 100644
 --- a/gcc/config/alpha/elf.h
 +++ b/gcc/config/alpha/elf.h
-@@ -168,5 +168,9 @@ extern int alpha_this_gpdisp_sequence_number;
+@@ -168,5 +168,9 @@
     I imagine that other systems will catch up.  In the meantime, it
     doesn't harm to make sure that the data exists to be used later.  */
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -41,11 +51,9 @@ index 093c38bba..54b3e0c91 100644
  #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
  #endif
 +#endif
-diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h
-index 5ded869d2..5f51ac81d 100644
 --- a/gcc/config/freebsd.h
 +++ b/gcc/config/freebsd.h
-@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3.  If not see
+@@ -45,8 +45,12 @@
  #define LIB_SPEC FBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -58,11 +66,9 @@ index 5ded869d2..5f51ac81d 100644
  
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b0bf40a95..d1874bc29 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -118,8 +118,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -118,8 +118,12 @@
  #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -75,11 +81,9 @@ index b0bf40a95..d1874bc29 100644
  
  #undef LINK_GCC_C_SEQUENCE_SPEC
  #define LINK_GCC_C_SEQUENCE_SPEC \
-diff --git a/gcc/config/openbsd.h b/gcc/config/openbsd.h
-index 37ecfc43f..a5f1b9955 100644
 --- a/gcc/config/openbsd.h
 +++ b/gcc/config/openbsd.h
-@@ -136,8 +136,12 @@ while (0)
+@@ -136,8 +136,12 @@
  #define LIB_SPEC OBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -92,11 +96,9 @@ index 37ecfc43f..a5f1b9955 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC OBSD_LIB_SPEC
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index cbf909722..eb2217fad 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -805,7 +805,11 @@
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -109,11 +111,9 @@ index cbf909722..eb2217fad 100644
  #endif
  
  #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
-diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 5160e1fda..7632a5081 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
-@@ -347,7 +347,11 @@ along with GCC; see the file COPYING3.  If not see
+@@ -367,7 +367,11 @@
  /* Solaris 11 build 135+ implements dl_iterate_phdr.  GNU ld needs
     --eh-frame-hdr to create the required .eh_frame_hdr sections.  */
  #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
@@ -125,11 +125,9 @@ index 5160e1fda..7632a5081 100644
  #endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
  #endif
  
-diff --git a/gcc/configure b/gcc/configure
-index 1c6e3407c..28ad05004 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -934,6 +934,7 @@ enable_fix_cortex_a53_835769
+@@ -939,6 +939,7 @@
  enable_fix_cortex_a53_843419
  with_glibc_version
  enable_gnu_unique_object
@@ -137,7 +135,7 @@ index 1c6e3407c..28ad05004 100755
  enable_linker_build_id
  enable_default_ssp
  with_long_double_128
-@@ -1670,6 +1671,9 @@ Optional Features:
+@@ -1676,6 +1677,9 @@
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
                            extension on glibc systems
@@ -147,7 +145,7 @@ index 1c6e3407c..28ad05004 100755
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
    --enable-default-ssp    enable Stack Smashing Protection as default
-@@ -27703,6 +27707,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+@@ -28016,6 +28020,38 @@
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
  
@@ -186,11 +184,9 @@ index 1c6e3407c..28ad05004 100755
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_eh_frame_hdr" >&5
  $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; }
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9ae..0cf7419e7 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4828,6 +4828,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
+@@ -4969,6 +4969,35 @@
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  	AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
  [Define if your linker supports .eh_frame_hdr.])
@@ -226,9 +222,6 @@ index 6c1dcd9ae..0cf7419e7 100644
  fi
  AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr)
  
-diff --git a/gcc/testsuite/g++.dg/eh/spec3-static.C b/gcc/testsuite/g++.dg/eh/spec3-static.C
-new file mode 100644
-index 000000000..15408effa
 --- /dev/null
 +++ b/gcc/testsuite/g++.dg/eh/spec3-static.C
 @@ -0,0 +1,25 @@
@@ -257,11 +250,9 @@ index 000000000..15408effa
 +  try {	func(); }
 +  catch (A& a) { }
 +}
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index f3343fc4f..d42647779 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -88,7 +88,8 @@ call_ ## FUNC (void)					\
+@@ -88,7 +88,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -271,7 +262,7 @@ index f3343fc4f..d42647779 100644
      && defined(BSD_DL_ITERATE_PHDR_AVAILABLE)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -97,7 +98,8 @@ call_ ## FUNC (void)					\
+@@ -97,7 +98,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \
@@ -281,7 +272,7 @@ index f3343fc4f..d42647779 100644
      && defined(__sun__) && defined(__svr4__)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -106,7 +108,8 @@ call_ ## FUNC (void)					\
+@@ -106,7 +108,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -291,7 +282,7 @@ index f3343fc4f..d42647779 100644
      && defined(__GLIBC__) && __GLIBC__ >= 2
  #include <link.h>
  /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
-@@ -121,7 +124,7 @@ call_ ## FUNC (void)					\
+@@ -121,7 +124,7 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
diff --git a/packages/gcc-linaro/6.4-2017.08/973-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0016-crystax.patch
index b96ece33..8dfbd0d1 100644
--- a/packages/gcc-linaro/6.4-2017.08/973-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0016-crystax.patch
@@ -6,11 +6,13 @@ Date:   Thu Aug 20 19:11:07 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8bd..5c89fcab0 100644
+---
+ gcc/config/i386/i386.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -14631,6 +14631,7 @@ legitimate_pic_address_disp_p (rtx disp)
+@@ -15747,6 +15747,7 @@
  	  else if (!SYMBOL_REF_FAR_ADDR_P (op0)
  		   && (SYMBOL_REF_LOCAL_P (op0)
  		       || (HAVE_LD_PIE_COPYRELOC
diff --git a/packages/gcc-linaro/6.4-2017.08/974-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0017-crystax.patch
index 9db4f545..8f2eb438 100644
--- a/packages/gcc-linaro/6.4-2017.08/974-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0017-crystax.patch
@@ -6,11 +6,13 @@ Date:   Fri Aug 21 17:41:59 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 47a7d061a..67a680f90 100644
+---
+ libgcc/gthr.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
-@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -145,7 +145,11 @@
  #define GTHREAD_USE_WEAK 1
  #endif
  #endif
diff --git a/packages/gcc-linaro/6.4-2017.08/975-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0018-crystax.patch
index 9efc2a48..50ee371a 100644
--- a/packages/gcc-linaro/6.4-2017.08/975-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0018-crystax.patch
@@ -9,11 +9,13 @@ Date:   Mon Apr 14 21:05:51 2014 -0700
     Change-Id: Ie1de9f946f397196bb6f1623f5add86933739484
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index 5974c65d3..71b2c7aa9 100644
+---
+ gcc/config/arm/arm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/arm.c
 +++ b/gcc/config/arm/arm.c
-@@ -22403,9 +22403,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
+@@ -22293,9 +22293,13 @@
  	memsize = MEM_SIZE (x);
  
  	/* Only certain alignment specifiers are supported by the hardware.  */
diff --git a/packages/gcc-linaro/7.1-2017.08/976-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0019-crystax.patch
index 790d4a9d..8c21a1cc 100644
--- a/packages/gcc-linaro/7.1-2017.08/976-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0019-crystax.patch
@@ -6,8 +6,10 @@ Date:   Sat Aug 22 09:55:55 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index a1f98d3d1..3725799be 100644
+---
+ gcc/config/i386/pmm_malloc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -31,7 +31,7 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/977-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0020-crystax.patch
index 0211d728..ccb81fd6 100644
--- a/packages/gcc-linaro/6.4-2017.08/977-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0020-crystax.patch
@@ -6,11 +6,14 @@ Date:   Tue Aug 25 09:36:42 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-index db1288fd0..38bc64d61 100644
+---
+ gcc/config/aarch64/aarch64-linux-android.h |    4 ++++
+ gcc/config/mips/linux-common.h             |    4 ++++
+ 2 files changed, 8 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux-android.h
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
-@@ -57,4 +57,8 @@
+@@ -56,4 +56,8 @@
  #define ENDFILE_SPEC \
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
  
@@ -19,11 +22,9 @@ index db1288fd0..38bc64d61 100644
 +#endif
 +
  #endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8bfacf994..262a9a341 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -63,3 +63,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -62,3 +62,7 @@
  
  /* The default value isn't sufficient in 64-bit mode.  */
  #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
diff --git a/packages/gcc-linaro/7.1-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/7.1-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc-linaro/7.1-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"