Run all patches through renumbering and update

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

30 files changed, 184 insertions, 272 deletions

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 1a6f7e5..4629c90 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 e7c9cf9..3256f80 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 b970ebc..953af50 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.9-2017.01/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/4.9-2017.01/0003-libtool-leave-framework-alone.patch
index 525592e..e67e0e8 100644
--- a/packages/gcc-linaro/4.9-2017.01/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/4.9-2017.01/100-uclibc-conf.patch b/packages/gcc-linaro/4.9-2017.01/0004-uclibc-conf.patch
index d56bf0a..aef750a 100644
--- a/packages/gcc-linaro/4.9-2017.01/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0004-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.9-2017.01/1100-msp430-string-literals.patch b/packages/gcc-linaro/4.9-2017.01/0005-msp430-string-literals.patch
index 346842e..c65911f 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 8a41fd2..6bcab27 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 bb77c4b..6c04847 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 19e57bb..c2a2046 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.9-2017.01/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 1c49fb0..d866661 100644
--- a/packages/gcc-linaro/4.9-2017.01/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 55f3228..28ced14 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/4.9-2017.01/301-missing-execinfo_h.patch b/packages/gcc-linaro/4.9-2017.01/0011-missing-execinfo_h.patch
index 00efda2..c90222a 100644
--- a/packages/gcc-linaro/4.9-2017.01/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0011-missing-execinfo_h.patch
@@ -1,7 +1,9 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/boehm-gc/include/gc.h
++++ b/boehm-gc/include/gc.h
 @@ -503,7 +503,7 @@
  #if defined(__linux__) || defined(__GLIBC__)
  # include <features.h>
diff --git a/packages/gcc-linaro/4.9-2017.01/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 c3bab15..0e7c80f 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.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.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
+@@ -28059,6 +28059,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
+@@ -28070,6 +28073,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
+@@ -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.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
+@@ -5583,6 +5583,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
+@@ -5594,6 +5597,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
+@@ -5645,17 +5653,17 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/4.9-2017.01/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/4.9-2017.01/0013-arm-softfloat-libgcc.patch
index 5efa7fd..350857d 100644
--- a/packages/gcc-linaro/4.9-2017.01/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.9-2017.01/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/4.9-2017.01/0014-arm_unbreak_armv4t.patch
index 37f8f2a..7c37445 100644
--- a/packages/gcc-linaro/4.9-2017.01/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 03fc47f..68b839a 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 533d01f..5a765de 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/4.9-2017.01/860-cilk-wchar.patch b/packages/gcc-linaro/4.9-2017.01/0017-cilk-wchar.patch
index 1837405..300837f 100644
--- a/packages/gcc-linaro/4.9-2017.01/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0017-cilk-wchar.patch
@@ -10,10 +10,8 @@ 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
+--- a/libcilkrts/include/cilk/reducer_min_max.h
++++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3154,7 +3154,9 @@
  CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
  CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
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 98c7b3f..6cfa521 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.9-2017.01/871-xtensa-reimplement-register-spilling.patch b/packages/gcc-linaro/4.9-2017.01/0019-xtensa-reimplement-register-spilling.patch
index abc7a08..776914d 100644
--- a/packages/gcc-linaro/4.9-2017.01/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.9-2017.01/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 f23a5c0..ef753c1 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.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 dc40513..0fbaeec 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 881aec0..50bbaeb 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 052ffc3..b8b6f74 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 a613bb3..fbdcf1e 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 4623f29..5caeb20 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/4.9-2017.01/890-fix-m68k-compile.patch b/packages/gcc-linaro/4.9-2017.01/0026-fix-m68k-compile.patch
index 140977b..9437f25 100644
--- a/packages/gcc-linaro/4.9-2017.01/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-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/4.9-2017.01/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/4.9-2017.01/0027-fix-m68k-uclinux.patch
index 4347642..80f76d3 100644
--- a/packages/gcc-linaro/4.9-2017.01/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-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
+@@ -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 670cf8d..df91a9f 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 5108147..e427eb3 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