Run all patches through renumbering and update

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

34 files changed, 226 insertions, 258 deletions

diff --git a/packages/gcc/5.5.0/1000-libtool-leave-framework-alone.patch b/packages/gcc/5.5.0/0000-libtool-leave-framework-alone.patch
index 0f4912a..1a86e41 100644
--- a/packages/gcc/5.5.0/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc/5.5.0/0000-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/5.5.0/100-uclibc-conf.patch b/packages/gcc/5.5.0/0001-uclibc-conf.patch
index 73d1f0d..aef750a 100644
--- a/packages/gcc/5.5.0/100-uclibc-conf.patch
+++ b/packages/gcc/5.5.0/0001-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/5.5.0/1100-msp430-string-literals.patch b/packages/gcc/5.5.0/0002-msp430-string-literals.patch
index 819d6d2..24f421f 100644
--- a/packages/gcc/5.5.0/1100-msp430-string-literals.patch
+++ b/packages/gcc/5.5.0/0002-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/5.5.0/110-xtensa-implement-trap-pattern.patch b/packages/gcc/5.5.0/0003-xtensa-implement-trap-pattern.patch
index 3304532..b25bbda 100644
--- a/packages/gcc/5.5.0/110-xtensa-implement-trap-pattern.patch
+++ b/packages/gcc/5.5.0/0003-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/5.5.0/111-alpha-bad-eh_frame.patch b/packages/gcc/5.5.0/0004-alpha-bad-eh_frame.patch
index 93f6e94..f341a06 100644
--- a/packages/gcc/5.5.0/111-alpha-bad-eh_frame.patch
+++ b/packages/gcc/5.5.0/0004-alpha-bad-eh_frame.patch
@@ -1,7 +1,9 @@
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80037
 
-diff --git a/libgcc/config/alpha/t-alpha b/libgcc/config/alpha/t-alpha
-index 0b6ffb1..0c2f840 100644
+---
+ libgcc/config/alpha/t-alpha |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/config/alpha/t-alpha
 +++ b/libgcc/config/alpha/t-alpha
 @@ -1,2 +1,6 @@
diff --git a/packages/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/packages/gcc/5.5.0/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
index c11ad35..412b9ac 100644
--- a/packages/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ b/packages/gcc/5.5.0/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*-*-*)
+@@ -433,7 +433,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/5.5.0/301-missing-execinfo_h.patch b/packages/gcc/5.5.0/0006-missing-execinfo_h.patch
index 2d0e7ba..c90222a 100644
--- a/packages/gcc/5.5.0/301-missing-execinfo_h.patch
+++ b/packages/gcc/5.5.0/0006-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/5.5.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/5.5.0/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5..180d0cb 100644
--- a/packages/gcc/5.5.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc/5.5.0/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
+@@ -28417,6 +28417,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 @@
+@@ -28427,6 +28430,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 @@
+@@ -28539,23 +28547,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/5.5.0/0008-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/5.5.0/0008-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 0000000..5f9a07a
--- /dev/null
+++ b/packages/gcc/5.5.0/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/5.5.0/810-arm-softfloat-libgcc.patch b/packages/gcc/5.5.0/0009-arm-softfloat-libgcc.patch
index 5efa7fd..350857d 100644
--- a/packages/gcc/5.5.0/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc/5.5.0/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/5.5.0/830-arm_unbreak_armv4t.patch b/packages/gcc/5.5.0/0010-arm_unbreak_armv4t.patch
index b730059..7c37445 100644
--- a/packages/gcc/5.5.0/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc/5.5.0/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/5.5.0/840-microblaze-enable-dwarf-eh-support.patch b/packages/gcc/5.5.0/0011-microblaze-enable-dwarf-eh-support.patch
index 9d29090..67a322a 100644
--- a/packages/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch
+++ b/packages/gcc/5.5.0/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/5.5.0/850-libstdcxx-uclibc-c99.patch b/packages/gcc/5.5.0/0012-libstdcxx-uclibc-c99.patch
index 9e97d94..50bd062 100644
--- a/packages/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc/5.5.0/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 @@
+@@ -5347,7 +5347,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/5.5.0/860-cilk-wchar.patch b/packages/gcc/5.5.0/0013-cilk-wchar.patch
index 1d9916f..300837f 100644
--- a/packages/gcc/5.5.0/860-cilk-wchar.patch
+++ b/packages/gcc/5.5.0/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/5.5.0/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc/5.5.0/0014-xtensa-add-mauto-litpools-option.patch
index aa1376c..3c44d03 100644
--- a/packages/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
+++ b/packages/gcc/5.5.0/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)
+@@ -1070,7 +1073,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)
+@@ -2451,6 +2454,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/5.5.0/871-xtensa-reimplement-register-spilling.patch b/packages/gcc/5.5.0/0015-xtensa-reimplement-register-spilling.patch
index 4056f8b..b85ecb9 100644
--- a/packages/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc/5.5.0/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/5.5.0/874-xtensa-add-uclinux-support.patch b/packages/gcc/5.5.0/0016-xtensa-add-uclinux-support.patch
index 23db3d8..b9476b2 100644
--- a/packages/gcc/5.5.0/874-xtensa-add-uclinux-support.patch
+++ b/packages/gcc/5.5.0/0016-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*)
+@@ -2971,6 +2971,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*)
+@@ -1287,6 +1287,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/5.5.0/890-fix-m68k-compile.patch b/packages/gcc/5.5.0/0017-fix-m68k-compile.patch
index 6e63de0..9437f25 100644
--- a/packages/gcc/5.5.0/890-fix-m68k-compile.patch
+++ b/packages/gcc/5.5.0/0017-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/5.5.0/891-fix-m68k-uclinux.patch b/packages/gcc/5.5.0/0018-fix-m68k-uclinux.patch
index 4e186bd..9a432e3 100644
--- a/packages/gcc/5.5.0/891-fix-m68k-uclinux.patch
+++ b/packages/gcc/5.5.0/0018-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
+@@ -806,7 +806,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc/5.5.0/892-microblaze-uclibc.patch b/packages/gcc/5.5.0/0019-microblaze-uclibc.patch
index a8eb5a6..91d0aa4 100644
--- a/packages/gcc/5.5.0/892-microblaze-uclibc.patch
+++ b/packages/gcc/5.5.0/0019-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/5.5.0/900-libitm-fixes-for-musl-support.patch b/packages/gcc/5.5.0/0020-libitm-fixes-for-musl-support.patch
index fdf4ee7..8009b89 100644
--- a/packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch
+++ b/packages/gcc/5.5.0/0020-libitm-fixes-for-musl-support.patch
@@ -17,8 +17,11 @@ On behalf of Szabolcs.Nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
+---
+ libitm/config/arm/hwcap.cc    |    2 +-
+ libitm/config/linux/x86/tls.h |    8 ++++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
 --- a/libitm/config/arm/hwcap.cc
 +++ b/libitm/config/arm/hwcap.cc
 @@ -40,7 +40,7 @@
@@ -30,8 +33,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 @@
diff --git a/packages/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch b/packages/gcc/5.5.0/0021-fixincludes-update-for-musl-support.patch
index 13c08d6..de94bc8 100644
--- a/packages/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch
+++ b/packages/gcc/5.5.0/0021-fixincludes-update-for-musl-support.patch
@@ -16,8 +16,10 @@ On behalf of Szabolcs.Nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222327 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
+---
+ fixincludes/mkfixinc.sh |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 --- a/fixincludes/mkfixinc.sh
 +++ b/fixincludes/mkfixinc.sh
 @@ -19,7 +19,8 @@
diff --git a/packages/gcc/5.5.0/902-unwind-fix-for-musl.patch b/packages/gcc/5.5.0/0022-unwind-fix-for-musl.patch
index ef47054..e639942 100644
--- a/packages/gcc/5.5.0/902-unwind-fix-for-musl.patch
+++ b/packages/gcc/5.5.0/0022-unwind-fix-for-musl.patch
@@ -17,8 +17,10 @@ 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 @@
diff --git a/packages/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch b/packages/gcc/5.5.0/0023-libstdc++-libgfortran-gthr-workaround-for-musl.patch
index c852131..7b2d7b6 100644
--- a/packages/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
+++ b/packages/gcc/5.5.0/0023-libstdc++-libgfortran-gthr-workaround-for-musl.patch
@@ -24,8 +24,13 @@ On behalf of szabolcs.nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222329 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/libgfortran/acinclude.m4
-===================================================================
+---
+ libgfortran/acinclude.m4                    |    2 +-
+ libgfortran/configure                       |    2 +-
+ libstdc++-v3/config/os/generic/os_defines.h |    5 +++++
+ libstdc++-v3/configure.host                 |    3 +++
+ 4 files changed, 10 insertions(+), 2 deletions(-)
+
 --- a/libgfortran/acinclude.m4
 +++ b/libgfortran/acinclude.m4
 @@ -100,7 +100,7 @@
@@ -37,11 +42,9 @@ Index: b/libgfortran/acinclude.m4
        AC_DEFINE(GTHREAD_USE_WEAK, 0,
  		[Define to 0 if the target shouldn't use #pragma weak])
        ;;
-Index: b/libgfortran/configure
-===================================================================
 --- a/libgfortran/configure
 +++ b/libgfortran/configure
-@@ -26447,7 +26447,7 @@
+@@ -26456,7 +26456,7 @@
  
    fi
    case "$host" in
@@ -50,8 +53,6 @@ Index: b/libgfortran/configure
  
  $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h
  
-Index: b/libstdc++-v3/config/os/generic/os_defines.h
-===================================================================
 --- a/libstdc++-v3/config/os/generic/os_defines.h
 +++ b/libstdc++-v3/config/os/generic/os_defines.h
 @@ -33,4 +33,9 @@
@@ -64,11 +65,9 @@ Index: b/libstdc++-v3/config/os/generic/os_defines.h
 +#define _GLIBCXX_GTHREAD_USE_WEAK 0
 +
  #endif
-Index: b/libstdc++-v3/configure.host
-===================================================================
 --- a/libstdc++-v3/configure.host
 +++ b/libstdc++-v3/configure.host
-@@ -271,6 +271,9 @@
+@@ -273,6 +273,9 @@
    freebsd*)
      os_include_dir="os/bsd/freebsd"
      ;;
diff --git a/packages/gcc/5.5.0/904-musl-libc-config.patch b/packages/gcc/5.5.0/0024-musl-libc-config.patch
index 8549140..808c073 100644
--- a/packages/gcc/5.5.0/904-musl-libc-config.patch
+++ b/packages/gcc/5.5.0/0024-musl-libc-config.patch
@@ -25,8 +25,15 @@ X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a9173ceabaf29
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config.gcc
-===================================================================
+---
+ gcc/config.gcc       |    5 +-
+ gcc/config/linux.h   |  110 ++++++++++++++++++++++++++++++++++++++++++++-------
+ gcc/config/linux.opt |    6 ++
+ gcc/configure        |    3 +
+ gcc/configure.ac     |    3 +
+ gcc/doc/invoke.texi  |   10 +++-
+ 6 files changed, 119 insertions(+), 18 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -575,7 +575,7 @@
@@ -48,8 +55,6 @@ Index: b/gcc/config.gcc
      *)
        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
        ;;
-Index: b/gcc/config/linux.h
-===================================================================
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
 @@ -32,10 +32,12 @@
@@ -206,8 +211,6 @@ Index: b/gcc/config/linux.h
  #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
  /* This is a *uclinux* target.  We don't define below macros to normal linux
     versions, because doing so would require *uclinux* targets to include
-Index: b/gcc/config/linux.opt
-===================================================================
 --- a/gcc/config/linux.opt
 +++ b/gcc/config/linux.opt
 @@ -28,5 +28,9 @@
@@ -221,11 +224,9 @@ Index: b/gcc/config/linux.opt
 +mmusl
 +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
 +Use musl C library
-Index: b/gcc/configure
-===================================================================
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -27809,6 +27813,9 @@
+@@ -27961,6 +27961,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -235,11 +236,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
-@@ -5298,6 +5302,9 @@
+@@ -5386,6 +5386,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -249,11 +248,9 @@ 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/doc/invoke.texi
-===================================================================
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -667,7 +667,7 @@
+@@ -668,7 +668,7 @@
  -mcpu=@var{cpu}}
  
  @emph{GNU/Linux Options}
@@ -262,7 +259,7 @@ Index: b/gcc/doc/invoke.texi
  -tno-android-cc -tno-android-ld}
  
  @emph{H8/300 Options}
-@@ -15324,13 +15324,19 @@
+@@ -15351,13 +15351,19 @@
  @item -mglibc
  @opindex mglibc
  Use the GNU C library.  This is the default except
diff --git a/packages/gcc/5.5.0/905-add-musl-support-to-gcc.patch b/packages/gcc/5.5.0/0025-add-musl-support-to-gcc.patch
index 92e7436..c0cc0a4 100644
--- a/packages/gcc/5.5.0/905-add-musl-support-to-gcc.patch
+++ b/packages/gcc/5.5.0/0025-add-musl-support-to-gcc.patch
@@ -19,8 +19,14 @@ X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=f2d678afa5b83
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222905 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/alpha/linux.h
-===================================================================
+---
+ gcc/config/alpha/linux.h    |    4 ++++
+ gcc/config/glibc-stdint.h   |   14 ++++++++++----
+ gcc/config/linux.h          |    2 ++
+ gcc/config/rs6000/linux.h   |    4 ++++
+ gcc/config/rs6000/linux64.h |    4 ++++
+ 5 files changed, 24 insertions(+), 4 deletions(-)
+
 --- a/gcc/config/alpha/linux.h
 +++ b/gcc/config/alpha/linux.h
 @@ -61,10 +61,14 @@
@@ -38,8 +44,6 @@ Index: b/gcc/config/alpha/linux.h
  #endif
  
  /* Determine what functions are present at the runtime;
-Index: b/gcc/config/glibc-stdint.h
-===================================================================
 --- a/gcc/config/glibc-stdint.h
 +++ b/gcc/config/glibc-stdint.h
 @@ -22,6 +22,12 @@
@@ -72,8 +76,6 @@ Index: b/gcc/config/glibc-stdint.h
  #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
  
  #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
-Index: b/gcc/config/linux.h
-===================================================================
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
 @@ -32,11 +32,13 @@
@@ -90,8 +92,6 @@ Index: b/gcc/config/linux.h
  #define OPTION_MUSL   (linux_libc == LIBC_MUSL)
  #endif
  
-Index: b/gcc/config/rs6000/linux.h
-===================================================================
 --- a/gcc/config/rs6000/linux.h
 +++ b/gcc/config/rs6000/linux.h
 @@ -30,10 +30,14 @@
@@ -109,8 +109,6 @@ Index: b/gcc/config/rs6000/linux.h
  #endif
  
  /* Determine what functions are present at the runtime;
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
 @@ -299,10 +299,14 @@
diff --git a/packages/gcc/5.5.0/906-mips-musl-support.patch b/packages/gcc/5.5.0/0026-mips-musl-support.patch
index 6b473f9..44e7713 100644
--- a/packages/gcc/5.5.0/906-mips-musl-support.patch
+++ b/packages/gcc/5.5.0/0026-mips-musl-support.patch
@@ -16,8 +16,10 @@ X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2550b6a866c88
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222915 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/mips/linux.h
-===================================================================
+---
+ gcc/config/mips/linux.h |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
 --- a/gcc/config/mips/linux.h
 +++ b/gcc/config/mips/linux.h
 @@ -37,7 +37,13 @@
diff --git a/packages/gcc/5.5.0/907-x86-musl-support.patch b/packages/gcc/5.5.0/0027-x86-musl-support.patch
index 3f2fe5d..f40f57c 100644
--- a/packages/gcc/5.5.0/907-x86-musl-support.patch
+++ b/packages/gcc/5.5.0/0027-x86-musl-support.patch
@@ -17,8 +17,11 @@ On behalf of Szabolcs Nagy.
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/i386/linux.h
-===================================================================
+---
+ gcc/config/i386/linux.h   |    3 +++
+ gcc/config/i386/linux64.h |    7 +++++++
+ 2 files changed, 10 insertions(+)
+
 --- a/gcc/config/i386/linux.h
 +++ b/gcc/config/i386/linux.h
 @@ -21,3 +21,6 @@
@@ -28,8 +31,6 @@ Index: b/gcc/config/i386/linux.h
 +
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/i386/linux64.h
-===================================================================
 --- a/gcc/config/i386/linux64.h
 +++ b/gcc/config/i386/linux64.h
 @@ -30,3 +30,10 @@
diff --git a/packages/gcc/5.5.0/908-arm-musl-support.patch b/packages/gcc/5.5.0/0028-arm-musl-support.patch
index 906355a..f955ea8 100644
--- a/packages/gcc/5.5.0/908-arm-musl-support.patch
+++ b/packages/gcc/5.5.0/0028-arm-musl-support.patch
@@ -15,8 +15,10 @@ On behalf of szabolcs.nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223749 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
+---
+ gcc/config/arm/linux-eabi.h |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -77,6 +77,23 @@
diff --git a/packages/gcc/5.5.0/909-aarch64-musl-support.patch b/packages/gcc/5.5.0/0029-aarch64-musl-support.patch
index 3d032f5..5460bc6 100644
--- a/packages/gcc/5.5.0/909-aarch64-musl-support.patch
+++ b/packages/gcc/5.5.0/0029-aarch64-musl-support.patch
@@ -17,8 +17,10 @@ gcc/Changelog:
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223766 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
+---
+ gcc/config/aarch64/aarch64-linux.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -23,6 +23,9 @@
diff --git a/packages/gcc/5.5.0/910-nios2-bad-multilib-default.patch b/packages/gcc/5.5.0/0030-nios2-bad-multilib-default.patch
index d94697f..5dfe211 100644
--- a/packages/gcc/5.5.0/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc/5.5.0/0030-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/5.5.0/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/5.5.0/0031-libgcc-disable-split-stack-nothreads.patch
index 07f9a73..df91a9f 100644
--- a/packages/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc/5.5.0/0031-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/5.5.0/940-uclinux-enable-threads.patch b/packages/gcc/5.5.0/0032-uclinux-enable-threads.patch
index 490a55b..f7c08ef 100644
--- a/packages/gcc/5.5.0/940-uclinux-enable-threads.patch
+++ b/packages/gcc/5.5.0/0032-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
+@@ -816,6 +816,9 @@
  *-*-uclinux*)
    extra_options="$extra_options gnu-user.opt"
    use_gcc_stdint=wrap
diff --git a/packages/gcc/5.5.0/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/5.5.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48e..0000000
--- a/packages/gcc/5.5.0/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"