22 files changed, 177 insertions, 174 deletions
diff --git a/packages/gcc/7.2.0/1000-libtool-leave-framework-alone.patch b/packages/gcc/7.2.0/0000-libtool-leave-framework-alone.patch
index bce09eb..1a86e41 100644
--- a/packages/gcc/7.2.0/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc/7.2.0/0000-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc/7.2.0/100-uclibc-conf.patch b/packages/gcc/7.2.0/0001-uclibc-conf.patch
index 73d1f0d..aef750a 100644
--- a/packages/gcc/7.2.0/100-uclibc-conf.patch
+++ b/packages/gcc/7.2.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/7.2.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/7.2.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index f13bff1..a5f3721 100644
--- a/packages/gcc/7.2.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc/7.2.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,9 +51,8 @@ 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
+--- a/gcc/configure
++++ b/gcc/configure
 @@ -29478,6 +29478,9 @@
  
     pluginlibs=
@@ -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
 @@ -14553,6 +14553,9 @@
  
     pluginlibs=
diff --git a/packages/gcc/7.2.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/7.2.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 0000000..5f9a07a
--- /dev/null
+++ b/packages/gcc/7.2.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch b/packages/gcc/7.2.0/0004-arm-softfloat-libgcc.patch
index 490ee73..d980036 100644
--- a/packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc/7.2.0/0004-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
 @@ -58,7 +58,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/7.2.0/860-cilk-wchar.patch b/packages/gcc/7.2.0/0005-cilk-wchar.patch
index 7ca2796..d2230cd 100644
--- a/packages/gcc/7.2.0/860-cilk-wchar.patch
+++ b/packages/gcc/7.2.0/0005-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
 @@ -3289,7 +3289,9 @@
diff --git a/packages/gcc/7.2.0/870-xtensa-fix-PR-target-82181.patch b/packages/gcc/7.2.0/0006-xtensa-fix-PR-target-82181.patch
index 7ac7cd9..ec9f1f8 100644
--- a/packages/gcc/7.2.0/870-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc/7.2.0/0006-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 25e4a2894c3b..8c404187107b 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -605,6 +605,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -605,6 +605,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 25e4a2894c3b..8c404187107b 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc/7.2.0/891-fix-m68k-uclinux.patch b/packages/gcc/7.2.0/0007-fix-m68k-uclinux.patch
index c322b03..9edd7da 100644
--- a/packages/gcc/7.2.0/891-fix-m68k-uclinux.patch
+++ b/packages/gcc/7.2.0/0007-fix-m68k-uclinux.patch
@@ -4,9 +4,12 @@ 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
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
 @@ -820,7 +820,7 @@
  m68k*-*-openbsd*)
  	;;
diff --git a/packages/gcc/7.2.0/900-libgfortran-missing-include.patch b/packages/gcc/7.2.0/0008-libgfortran-missing-include.patch
index 1f47469..701e7b4 100644
--- a/packages/gcc/7.2.0/900-libgfortran-missing-include.patch
+++ b/packages/gcc/7.2.0/0008-libgfortran-missing-include.patch
@@ -1,5 +1,9 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
+---
+ libgfortran/io/close.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libgfortran/io/close.c
++++ b/libgfortran/io/close.c
 @@ -25,6 +25,7 @@
  #include "io.h"
  #include "unix.h"
diff --git a/packages/gcc/7.2.0/910-nios2-bad-multilib-default.patch b/packages/gcc/7.2.0/0009-nios2-bad-multilib-default.patch
index 61989e5..4acc491 100644
--- a/packages/gcc/7.2.0/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc/7.2.0/0009-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -63,11 +63,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
@@ -15,9 +19,8 @@ diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc/7.2.0/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/7.2.0/0010-libgcc-disable-split-stack-nothreads.patch
index 07f9a73..df91a9f 100644
--- a/packages/gcc/7.2.0/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc/7.2.0/0010-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc/7.2.0/951-bionic-ndk.patch b/packages/gcc/7.2.0/0011-bionic-ndk.patch
index 59c50a8..474dd8c 100644
--- a/packages/gcc/7.2.0/951-bionic-ndk.patch
+++ b/packages/gcc/7.2.0/0011-bionic-ndk.patch
@@ -4,8 +4,10 @@ Date:   Tue Apr 25 19:02:18 2017 -0700
 
     Fix ctype for newer NDK headers
 
-diff --git a/libstdc++-v3/config/os/bionic/ctype_base.h b/libstdc++-v3/config/os/bionic/ctype_base.h
-index 33978f3..c36e63c 100644
+---
+ libstdc++-v3/config/os/bionic/ctype_base.h |   34 +++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)
+
 --- a/libstdc++-v3/config/os/bionic/ctype_base.h
 +++ b/libstdc++-v3/config/os/bionic/ctype_base.h
 @@ -28,6 +28,18 @@
@@ -27,7 +29,7 @@ index 33978f3..c36e63c 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -41,17 +53,17 @@
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
      typedef char 		mask;
diff --git a/packages/gcc/7.2.0/952-bionic-errno.patch b/packages/gcc/7.2.0/0012-bionic-errno.patch
index 3f77e68..0a1a632 100644
--- a/packages/gcc/7.2.0/952-bionic-errno.patch
+++ b/packages/gcc/7.2.0/0012-bionic-errno.patch
@@ -4,11 +4,13 @@ Date:   Tue Apr 25 20:17:03 2017 -0700
 
     Fix, errno is volatile int
 
-diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
-index 6ff12d0..5bbd664 100644
+---
+ libstdc++-v3/src/filesystem/dir.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libstdc++-v3/src/filesystem/dir.cc
 +++ b/libstdc++-v3/src/filesystem/dir.cc
-@@ -146,7 +146,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
+@@ -146,7 +146,7 @@
  
    int err = std::exchange(errno, 0);
    const auto entp = readdir(dirp);
diff --git a/packages/gcc/7.2.0/970-crystax.patch b/packages/gcc/7.2.0/0013-crystax.patch
index f498aec..8c87ba3 100644
--- a/packages/gcc/7.2.0/970-crystax.patch
+++ b/packages/gcc/7.2.0/0013-crystax.patch
@@ -7,11 +7,33 @@ Date:   Wed Jul 29 11:28:29 2015 +0300
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
 [Edited: keep libstdc++, drop libcrystax-related modifications]
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index a9196cd..5f7fed2 100644
+---
+ gcc/config.gcc                             |   17 +++++++-
+ gcc/config/aarch64/aarch64-linux-android.h |   59 +++++++++++++++++++++++++++++
+ gcc/config/aarch64/aarch64-linux.h         |    9 +++-
+ gcc/config/arm/arm.h                       |    3 -
+ gcc/config/arm/arm.md                      |    2 
+ gcc/config/arm/arm.opt                     |    4 +
+ gcc/config/arm/elf.h                       |    9 ++--
+ gcc/config/arm/linux-eabi.h                |    7 ++-
+ gcc/config/i386/gnu-user.h                 |    7 ++-
+ gcc/config/i386/gnu-user64.h               |    5 ++
+ gcc/config/i386/linux-common.h             |    8 +++
+ gcc/config/linux-android.h                 |   13 +++---
+ gcc/config/mips/android.h                  |   49 ++++++++++++++++++++++++
+ gcc/config/mips/gnu-user.h                 |    6 +-
+ gcc/config/mips/linux-common.h             |    2 
+ gcc/config/mips/t-linux-android            |    3 +
+ gcc/config/mips/t-linux-android64          |    4 +
+ libgcc/gthr-posix.h                        |   13 ++++++
+ libstdc++-v3/configure                     |   12 +++++
+ libstdc++-v3/include/bits/locale_facets.h  |   18 +++++++-
+ libstdc++-v3/libsupc++/guard.cc            |    5 ++
+ 21 files changed, 235 insertions(+), 20 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -961,13 +961,17 @@ aarch64*-*-freebsd*)
+@@ -961,13 +961,17 @@
  	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
  	;;
  aarch64*-*-linux*)
@@ -30,7 +52,7 @@ index a9196cd..5f7fed2 100644
  	esac
  	aarch64_multilibs="${with_multilib_list}"
  	if test "$aarch64_multilibs" = "default"; then
-@@ -2079,6 +2083,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+@@ -2079,6 +2083,17 @@
  	tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
  	extra_options="${extra_options} linux-android.opt"
  	case ${target} in
@@ -48,9 +70,6 @@ index a9196cd..5f7fed2 100644
  		mipsisa32r6*)
  			default_mips_arch=mips32r6
  			;;
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-new file mode 100644
-index 0000000..91d235f
 --- /dev/null
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -0,0 +1,59 @@
@@ -113,8 +132,6 @@ index 0000000..91d235f
 +  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
 +
 +#endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index c45fc1d..4dc6211 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,14 @@
@@ -133,11 +150,9 @@ index c45fc1d..4dc6211 100644
  
  #undef MUSL_DYNAMIC_LINKER
  #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
-index b3c6db0..c646613 100644
 --- a/gcc/config/arm/arm.h
 +++ b/gcc/config/arm/arm.h
-@@ -1878,10 +1878,11 @@ enum arm_auto_incmodes
+@@ -1878,10 +1878,11 @@
  
  #define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2				\
  				 || (TARGET_THUMB1			\
@@ -150,8 +165,6 @@ index b3c6db0..c646613 100644
     ? (min >= 0 && max < 512						\
        ? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode)	\
        : min >= -256 && max < 256					\
-diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index f9365cd..804ba8e 100644
 --- a/gcc/config/arm/arm.md
 +++ b/gcc/config/arm/arm.md
 @@ -8668,7 +8668,7 @@
@@ -163,11 +176,9 @@ index f9365cd..804ba8e 100644
    "
    {
      enum insn_code code;
-diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 9f8116d..bb3e44d 100644
 --- a/gcc/config/arm/arm.opt
 +++ b/gcc/config/arm/arm.opt
-@@ -193,6 +193,10 @@ mthumb-interwork
+@@ -193,6 +193,10 @@
  Target Report Mask(INTERWORK)
  Support calls between Thumb and ARM instruction sets.
  
@@ -178,8 +189,6 @@ index 9f8116d..bb3e44d 100644
  mtls-dialect=
  Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU)
  Specify thread local storage scheme.
-diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
-index f119b87..83e5343 100644
 --- a/gcc/config/arm/elf.h
 +++ b/gcc/config/arm/elf.h
 @@ -56,8 +56,7 @@
@@ -212,8 +221,6 @@ index f119b87..83e5343 100644
      && !target_pure_code)
  
  #ifndef LINK_SPEC
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index f794e8f..d19529b 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -102,11 +102,16 @@
@@ -234,11 +241,9 @@ index f794e8f..d19529b 100644
  #undef  LIB_SPEC
  #define LIB_SPEC							\
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index a4c88f1..1f76b3f 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3.  If not see
+@@ -65,9 +65,14 @@
     When the -shared link option is used a final link is not being
     done.  */
  
@@ -254,11 +259,9 @@ index a4c88f1..1f76b3f 100644
  
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 39f5ef6..bb43280 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
-@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -46,6 +46,11 @@
  #define SPEC_X32 "mx32"
  #endif
  
@@ -270,11 +273,9 @@ index 39f5ef6..bb43280 100644
  #undef ASM_SPEC
  #define ASM_SPEC "%{" SPEC_32 ":--32} \
   %{" SPEC_64 ":--64} \
-diff --git a/gcc/config/i386/linux-common.h b/gcc/config/i386/linux-common.h
-index 6380639..ea6fa1b 100644
 --- a/gcc/config/i386/linux-common.h
 +++ b/gcc/config/i386/linux-common.h
-@@ -30,7 +30,13 @@ along with GCC; see the file COPYING3.  If not see
+@@ -30,7 +30,13 @@
  #undef CC1_SPEC
  #define CC1_SPEC \
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \
@@ -289,8 +290,6 @@ index 6380639..ea6fa1b 100644
  
  #undef	LINK_SPEC
  #define LINK_SPEC \
-diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h
-index 19c55c3..468303d 100644
 --- a/gcc/config/linux-android.h
 +++ b/gcc/config/linux-android.h
 @@ -38,15 +38,18 @@
@@ -317,9 +316,6 @@ index 19c55c3..468303d 100644
  
  #define ANDROID_LIB_SPEC \
    "%{!static: -ldl}"
-diff --git a/gcc/config/mips/android.h b/gcc/config/mips/android.h
-new file mode 100644
-index 0000000..32c539c
 --- /dev/null
 +++ b/gcc/config/mips/android.h
 @@ -0,0 +1,49 @@
@@ -372,11 +368,9 @@ index 0000000..32c539c
 +									\
 +  /* Use the standard linux specs for everything else.  */		\
 +  LINUX_DRIVER_SELF_SPECS
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index af45d18..b3e89df 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
-@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -36,6 +36,7 @@
      /* The GNU C++ standard library requires this.  */		\
      if (c_dialect_cxx ())					\
        builtin_define ("_GNU_SOURCE");				\
@@ -384,7 +378,7 @@ index af45d18..b3e89df 100644
    } while (0)
  
  #undef SUBTARGET_CPP_SPEC
-@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,7 +72,8 @@
  
  #undef SUBTARGET_ASM_SPEC
  #define SUBTARGET_ASM_SPEC \
@@ -394,7 +388,7 @@ index af45d18..b3e89df 100644
  
  /* The MIPS assembler has different syntax for .set. We set it to
     .dummy to trap any errors.  */
-@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -120,7 +122,7 @@
  #endif
  
  #define LINUX_DRIVER_SELF_SPECS \
@@ -403,11 +397,9 @@ index af45d18..b3e89df 100644
    MARCH_MTUNE_NATIVE_SPECS,						\
    /* -mplt has no effect without -mno-shared.  Simplify later		\
       specs handling by removing a redundant option.  */			\
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 6c8fda7..b8fae26 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -35,7 +35,7 @@
  #undef  SUBTARGET_CC1_SPEC
  #define SUBTARGET_CC1_SPEC						\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC,			\
@@ -416,18 +408,12 @@ index 6c8fda7..b8fae26 100644
  
  #undef  CC1PLUS_SPEC
  #define CC1PLUS_SPEC							\
-diff --git a/gcc/config/mips/t-linux-android b/gcc/config/mips/t-linux-android
-new file mode 100644
-index 0000000..39f512c
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android
 @@ -0,0 +1,3 @@
 +MULTILIB_OPTIONS = mips32r2/mips32r6
 +MULTILIB_DIRNAMES = mips-r2 mips-r6
 +MULTILIB_OSDIRNAMES = ../libr2 ../libr6
-diff --git a/gcc/config/mips/t-linux-android64 b/gcc/config/mips/t-linux-android64
-new file mode 100644
-index 0000000..55cab7d
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android64
 @@ -0,0 +1,4 @@
@@ -435,11 +421,9 @@ index 0000000..55cab7d
 +MULTILIB_DIRNAMES = 32 mips-r1 mips-r2 mips-r6 mips64-r2 mips64-r6
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../libr2 ../libr6 ../lib64r2 ../lib64
 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6
-diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
-index a54a32e..0d81ec7 100644
 --- a/libgcc/gthr-posix.h
 +++ b/libgcc/gthr-posix.h
-@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -32,6 +32,19 @@
  #define __GTHREADS 1
  #define __GTHREADS_CXX0X 1
  
@@ -459,11 +443,9 @@ index a54a32e..0d81ec7 100644
  #include <pthread.h>
  
  #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index e70fdd6..014f956 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -78536,6 +78536,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78536,6 +78536,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -476,7 +458,7 @@ index e70fdd6..014f956 100755
  int
  main ()
  {
-@@ -78594,6 +78600,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78594,6 +78600,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -489,8 +471,6 @@ index e70fdd6..014f956 100755
  int
  main ()
  {
-diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
-index 1ad0eb5..9f322d8 100644
 --- a/libstdc++-v3/include/bits/locale_facets.h
 +++ b/libstdc++-v3/include/bits/locale_facets.h
 @@ -47,6 +47,20 @@
@@ -514,7 +494,7 @@ index 1ad0eb5..9f322d8 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -1102,7 +1116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1102,7 +1116,7 @@
         *  @return  @a __hi.
        */
        virtual const char*
@@ -523,7 +503,7 @@ index 1ad0eb5..9f322d8 100644
        {
  	__builtin_memcpy(__to, __lo, __hi - __lo);
  	return __hi;
-@@ -1163,7 +1177,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1163,7 +1177,7 @@
  
      private:
        void _M_narrow_init() const;
@@ -532,8 +512,6 @@ index 1ad0eb5..9f322d8 100644
      };
  
  #ifdef _GLIBCXX_USE_WCHAR_T
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 19953bc..5ae24af 100644
 --- a/libstdc++-v3/libsupc++/guard.cc
 +++ b/libstdc++-v3/libsupc++/guard.cc
 @@ -34,7 +34,12 @@
diff --git a/packages/gcc/7.2.0/971-crystax.patch b/packages/gcc/7.2.0/0014-crystax.patch
index 748a381..f1f9eb1 100644
--- a/packages/gcc/7.2.0/971-crystax.patch
+++ b/packages/gcc/7.2.0/0014-crystax.patch
@@ -6,8 +6,10 @@ Date:   Thu Aug 13 16:11:54 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi
-index 8f1307c55..cbbec5bd2 100644
+---
+ gcc/config/arm/t-linux-androideabi |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 --- a/gcc/config/arm/t-linux-androideabi
 +++ b/gcc/config/arm/t-linux-androideabi
 @@ -1,8 +1,9 @@
diff --git a/packages/gcc/7.2.0/972-crystax.patch b/packages/gcc/7.2.0/0015-crystax.patch
index f68fe1e..5fd76d7 100644
--- a/packages/gcc/7.2.0/972-crystax.patch
+++ b/packages/gcc/7.2.0/0015-crystax.patch
@@ -10,8 +10,20 @@ Date:   Mon Apr 14 15:59:47 2014 -0700
     Change-Id: Ibda473188e5a10f2a0592f2494ad00ad1f91e04b
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config.in b/gcc/config.in
-index 3fda578..ebe222c 100644
+---
+ gcc/config.in                          |    6 +++++
+ gcc/config/alpha/elf.h                 |    4 +++
+ gcc/config/freebsd.h                   |    4 +++
+ gcc/config/gnu-user.h                  |    4 +++
+ gcc/config/openbsd.h                   |    4 +++
+ gcc/config/rs6000/sysv4.h              |    6 ++++-
+ gcc/config/sol2.h                      |    4 +++
+ gcc/configure                          |   36 +++++++++++++++++++++++++++++++++
+ gcc/configure.ac                       |   29 ++++++++++++++++++++++++++
+ gcc/testsuite/g++.dg/eh/spec3-static.C |   25 ++++++++++++++++++++++
+ libgcc/crtstuff.c                      |   11 ++++++----
+ 11 files changed, 128 insertions(+), 5 deletions(-)
+
 --- a/gcc/config.in
 +++ b/gcc/config.in
 @@ -2180,6 +2180,12 @@
@@ -27,11 +39,9 @@ index 3fda578..ebe222c 100644
  /* Define to 1 if the 'long long' type is wider than 'long' but still
     efficiently supported by the host hardware. */
  #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
-index c109b07..1ad7363 100644
 --- a/gcc/config/alpha/elf.h
 +++ b/gcc/config/alpha/elf.h
-@@ -168,5 +168,9 @@ extern int alpha_this_gpdisp_sequence_number;
+@@ -168,5 +168,9 @@
     I imagine that other systems will catch up.  In the meantime, it
     doesn't harm to make sure that the data exists to be used later.  */
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -41,11 +51,9 @@ index c109b07..1ad7363 100644
  #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
  #endif
 +#endif
-diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h
-index a272455..29d5a1a 100644
 --- a/gcc/config/freebsd.h
 +++ b/gcc/config/freebsd.h
-@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3.  If not see
+@@ -45,8 +45,12 @@
  #define LIB_SPEC FBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -58,11 +66,9 @@ index a272455..29d5a1a 100644
  
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 2787a3d..be47428 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -118,8 +118,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -118,8 +118,12 @@
  #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -75,11 +81,9 @@ index 2787a3d..be47428 100644
  
  #undef LINK_GCC_C_SEQUENCE_SPEC
  #define LINK_GCC_C_SEQUENCE_SPEC \
-diff --git a/gcc/config/openbsd.h b/gcc/config/openbsd.h
-index 1048e31..47044c5 100644
 --- a/gcc/config/openbsd.h
 +++ b/gcc/config/openbsd.h
-@@ -136,8 +136,12 @@ while (0)
+@@ -136,8 +136,12 @@
  #define LIB_SPEC OBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -92,11 +96,9 @@ index 1048e31..47044c5 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC OBSD_LIB_SPEC
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index de38629..06d586a 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -805,7 +805,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -805,7 +805,11 @@
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -109,11 +111,9 @@ index de38629..06d586a 100644
  #endif
  
  #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
-diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 1ae7f9f..98c9482 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
-@@ -367,7 +367,11 @@ along with GCC; see the file COPYING3.  If not see
+@@ -367,7 +367,11 @@
  /* Solaris 11 build 135+ implements dl_iterate_phdr.  GNU ld needs
     --eh-frame-hdr to create the required .eh_frame_hdr sections.  */
  #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
@@ -125,11 +125,9 @@ index 1ae7f9f..98c9482 100644
  #endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
  #endif
  
-diff --git a/gcc/configure b/gcc/configure
-index 1d39548..f63716a 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -939,6 +939,7 @@ enable_fix_cortex_a53_835769
+@@ -939,6 +939,7 @@
  enable_fix_cortex_a53_843419
  with_glibc_version
  enable_gnu_unique_object
@@ -137,7 +135,7 @@ index 1d39548..f63716a 100755
  enable_linker_build_id
  enable_default_ssp
  with_long_double_128
-@@ -1676,6 +1677,9 @@ Optional Features:
+@@ -1676,6 +1677,9 @@
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
                            extension on glibc systems
@@ -147,7 +145,7 @@ index 1d39548..f63716a 100755
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
    --enable-default-ssp    enable Stack Smashing Protection as default
-@@ -28050,6 +28054,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+@@ -28050,6 +28054,38 @@
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
  
@@ -186,11 +184,9 @@ index 1d39548..f63716a 100755
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_eh_frame_hdr" >&5
  $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; }
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 1d5a9d7..736a534 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4981,6 +4981,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
+@@ -4981,6 +4981,35 @@
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  	AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
  [Define if your linker supports .eh_frame_hdr.])
@@ -226,9 +222,6 @@ index 1d5a9d7..736a534 100644
  fi
  AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr)
  
-diff --git a/gcc/testsuite/g++.dg/eh/spec3-static.C b/gcc/testsuite/g++.dg/eh/spec3-static.C
-new file mode 100644
-index 0000000..15408ef
 --- /dev/null
 +++ b/gcc/testsuite/g++.dg/eh/spec3-static.C
 @@ -0,0 +1,25 @@
@@ -257,11 +250,9 @@ index 0000000..15408ef
 +  try {	func(); }
 +  catch (A& a) { }
 +}
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index c01f94b..00cab57 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -88,7 +88,8 @@ call_ ## FUNC (void)					\
+@@ -88,7 +88,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -271,7 +262,7 @@ index c01f94b..00cab57 100644
      && defined(BSD_DL_ITERATE_PHDR_AVAILABLE)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -97,7 +98,8 @@ call_ ## FUNC (void)					\
+@@ -97,7 +98,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \
@@ -281,7 +272,7 @@ index c01f94b..00cab57 100644
      && defined(__sun__) && defined(__svr4__)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -106,7 +108,8 @@ call_ ## FUNC (void)					\
+@@ -106,7 +108,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -291,7 +282,7 @@ index c01f94b..00cab57 100644
      && defined(__GLIBC__) && __GLIBC__ >= 2
  #include <link.h>
  /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
-@@ -121,7 +124,7 @@ call_ ## FUNC (void)					\
+@@ -121,7 +124,7 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
diff --git a/packages/gcc/7.2.0/973-crystax.patch b/packages/gcc/7.2.0/0016-crystax.patch
index c608eb3..cd56a56 100644
--- a/packages/gcc/7.2.0/973-crystax.patch
+++ b/packages/gcc/7.2.0/0016-crystax.patch
@@ -6,11 +6,13 @@ Date:   Thu Aug 20 19:11:07 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8bd..5c89fcab0 100644
+---
+ gcc/config/i386/i386.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -15753,6 +15753,7 @@ legitimate_pic_address_disp_p (rtx disp)
+@@ -15753,6 +15753,7 @@
  	  else if (!SYMBOL_REF_FAR_ADDR_P (op0)
  		   && (SYMBOL_REF_LOCAL_P (op0)
  		       || (HAVE_LD_PIE_COPYRELOC
diff --git a/packages/gcc/7.2.0/974-crystax.patch b/packages/gcc/7.2.0/0017-crystax.patch
index 9db4f54..8f2eb43 100644
--- a/packages/gcc/7.2.0/974-crystax.patch
+++ b/packages/gcc/7.2.0/0017-crystax.patch
@@ -6,11 +6,13 @@ Date:   Fri Aug 21 17:41:59 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 47a7d061a..67a680f90 100644
+---
+ libgcc/gthr.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
-@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -145,7 +145,11 @@
  #define GTHREAD_USE_WEAK 1
  #endif
  #endif
diff --git a/packages/gcc/7.2.0/975-crystax.patch b/packages/gcc/7.2.0/0018-crystax.patch
index 3305a43..bbfcd14 100644
--- a/packages/gcc/7.2.0/975-crystax.patch
+++ b/packages/gcc/7.2.0/0018-crystax.patch
@@ -9,11 +9,13 @@ Date:   Mon Apr 14 21:05:51 2014 -0700
     Change-Id: Ie1de9f946f397196bb6f1623f5add86933739484
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index 5974c65d3..71b2c7aa9 100644
+---
+ gcc/config/arm/arm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/arm.c
 +++ b/gcc/config/arm/arm.c
-@@ -22270,9 +22270,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
+@@ -22270,9 +22270,13 @@
  	memsize = MEM_SIZE (x);
  
  	/* Only certain alignment specifiers are supported by the hardware.  */
diff --git a/packages/gcc/7.2.0/976-crystax.patch b/packages/gcc/7.2.0/0019-crystax.patch
index 790d4a9..8c21a1c 100644
--- a/packages/gcc/7.2.0/976-crystax.patch
+++ b/packages/gcc/7.2.0/0019-crystax.patch
@@ -6,8 +6,10 @@ Date:   Sat Aug 22 09:55:55 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index a1f98d3d1..3725799be 100644
+---
+ gcc/config/i386/pmm_malloc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -31,7 +31,7 @@
diff --git a/packages/gcc/7.2.0/977-crystax.patch b/packages/gcc/7.2.0/0020-crystax.patch
index 61d2261..ccb81fd 100644
--- a/packages/gcc/7.2.0/977-crystax.patch
+++ b/packages/gcc/7.2.0/0020-crystax.patch
@@ -6,8 +6,11 @@ Date:   Tue Aug 25 09:36:42 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-index db1288fd0..38bc64d61 100644
+---
+ gcc/config/aarch64/aarch64-linux-android.h |    4 ++++
+ gcc/config/mips/linux-common.h             |    4 ++++
+ 2 files changed, 8 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux-android.h
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -56,4 +56,8 @@
@@ -19,11 +22,9 @@ index db1288fd0..38bc64d61 100644
 +#endif
 +
  #endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8bfacf994..262a9a341 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -62,3 +62,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -62,3 +62,7 @@
  
  /* The default value isn't sufficient in 64-bit mode.  */
  #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
diff --git a/packages/gcc/7.2.0/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/7.2.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48e..0000000
--- a/packages/gcc/7.2.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"