Merge pull request #871 from ksergeyv/gcc-patches

fix offsets of gcc 7.2.0 patches

10 files changed, 68 insertions, 70 deletions

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/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5..f13bff1 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/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -49,7 +49,7 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
 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 @@
+@@ -29478,6 +29478,9 @@
  
     pluginlibs=
  
@@ -59,7 +59,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 @@
+@@ -29488,6 +29491,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -71,7 +71,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 @@
+@@ -29600,23 +29608,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -105,7 +105,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
 diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
 --- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
 +++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
+@@ -14553,6 +14553,9 @@
  
     pluginlibs=
  
@@ -115,7 +115,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
+@@ -14563,6 +14566,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -127,7 +127,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
+@@ -14675,23 +14683,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch b/packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch
index 5efa7fd..490ee73 100644
--- a/packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch
@@ -2,7 +2,7 @@ Index: b/gcc/config/arm/linux-elf.h
 ===================================================================
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
+@@ -58,7 +58,7 @@
     %{shared:-lc} \
     %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
  
diff --git a/packages/gcc/7.2.0/860-cilk-wchar.patch b/packages/gcc/7.2.0/860-cilk-wchar.patch
index 1d9916f..7ca2796 100644
--- a/packages/gcc/7.2.0/860-cilk-wchar.patch
+++ b/packages/gcc/7.2.0/860-cilk-wchar.patch
@@ -14,7 +14,7 @@ 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 @@
+@@ -3289,7 +3289,9 @@
  CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
  CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
  CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
@@ -24,7 +24,7 @@ Index: b/libcilkrts/include/cilk/reducer_min_max.h
  CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
  CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
  CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
+@@ -3441,7 +3443,9 @@
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
@@ -34,7 +34,7 @@ Index: b/libcilkrts/include/cilk/reducer_min_max.h
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
  CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
+@@ -3567,7 +3571,9 @@
  CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
  CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
  CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
@@ -44,7 +44,7 @@ Index: b/libcilkrts/include/cilk/reducer_min_max.h
  CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
  CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
  CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
+@@ -3719,7 +3725,9 @@
  CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
  CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
  CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
diff --git a/packages/gcc/7.2.0/891-fix-m68k-uclinux.patch b/packages/gcc/7.2.0/891-fix-m68k-uclinux.patch
index 4e186bd..c322b03 100644
--- a/packages/gcc/7.2.0/891-fix-m68k-uclinux.patch
+++ b/packages/gcc/7.2.0/891-fix-m68k-uclinux.patch
@@ -7,7 +7,7 @@ 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 @@
+@@ -820,7 +820,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc/7.2.0/952-bionic-errno.patch b/packages/gcc/7.2.0/952-bionic-errno.patch
index 91f6ca3..3f77e68 100644
--- a/packages/gcc/7.2.0/952-bionic-errno.patch
+++ b/packages/gcc/7.2.0/952-bionic-errno.patch
@@ -8,7 +8,7 @@ diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/di
 index 6ff12d0..5bbd664 100644
 --- a/libstdc++-v3/src/filesystem/dir.cc
 +++ b/libstdc++-v3/src/filesystem/dir.cc
-@@ -147,7 +147,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
+@@ -146,7 +146,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
  
    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/970-crystax.patch
index 7324d7f..f498aec 100644
--- a/packages/gcc/7.2.0/970-crystax.patch
+++ b/packages/gcc/7.2.0/970-crystax.patch
@@ -8,11 +8,11 @@ Date:   Wed Jul 29 11:28:29 2015 +0300
 
 [Edited: keep libstdc++, drop libcrystax-related modifications]
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index f66e48cd1..1c253496b 100644
+index a9196cd..5f7fed2 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -942,13 +942,17 @@ aarch64*-*-elf | aarch64*-*-rtems*)
- 	TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
+@@ -961,13 +961,17 @@ aarch64*-*-freebsd*)
+ 	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
  	;;
  aarch64*-*-linux*)
 -	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h"
@@ -30,7 +30,7 @@ index f66e48cd1..1c253496b 100644
  	esac
  	aarch64_multilibs="${with_multilib_list}"
  	if test "$aarch64_multilibs" = "default"; then
-@@ -2055,6 +2059,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+@@ -2079,6 +2083,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
  	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
@@ -50,7 +50,7 @@ index f66e48cd1..1c253496b 100644
  			;;
 diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
 new file mode 100644
-index 000000000..db1288fd0
+index 0000000..91d235f
 --- /dev/null
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -0,0 +1,59 @@
@@ -114,7 +114,7 @@ index 000000000..db1288fd0
 +
 +#endif  /* GCC_AARCH64_LINUX_ANDROID_H */
 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5fcaa59a3..6864195ee 100644
+index c45fc1d..4dc6211 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,14 @@
@@ -134,10 +134,10 @@ index 5fcaa59a3..6864195ee 100644
  #undef MUSL_DYNAMIC_LINKER
  #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
 diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
-index ad123dde9..97b059de6 100644
+index b3c6db0..c646613 100644
 --- a/gcc/config/arm/arm.h
 +++ b/gcc/config/arm/arm.h
-@@ -1888,10 +1888,11 @@ enum arm_auto_incmodes
+@@ -1878,10 +1878,11 @@ enum arm_auto_incmodes
  
  #define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2				\
  				 || (TARGET_THUMB1			\
@@ -151,10 +151,10 @@ index ad123dde9..97b059de6 100644
        ? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode)	\
        : min >= -256 && max < 256					\
 diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index 47171b996..eb22d1181 100644
+index f9365cd..804ba8e 100644
 --- a/gcc/config/arm/arm.md
 +++ b/gcc/config/arm/arm.md
-@@ -8179,7 +8179,7 @@
+@@ -8668,7 +8668,7 @@
     (match_operand:SI 2 "const_int_operand" "")	; total range
     (match_operand:SI 3 "" "")			; table label
     (match_operand:SI 4 "" "")]			; Out of range label
@@ -164,7 +164,7 @@ index 47171b996..eb22d1181 100644
    {
      enum insn_code code;
 diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 0ebe01743..772453889 100644
+index 9f8116d..bb3e44d 100644
 --- a/gcc/config/arm/arm.opt
 +++ b/gcc/config/arm/arm.opt
 @@ -193,6 +193,10 @@ mthumb-interwork
@@ -179,7 +179,7 @@ index 0ebe01743..772453889 100644
  Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU)
  Specify thread local storage scheme.
 diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
-index 77f30554d..32158ed65 100644
+index f119b87..83e5343 100644
 --- a/gcc/config/arm/elf.h
 +++ b/gcc/config/arm/elf.h
 @@ -56,8 +56,7 @@
@@ -202,23 +202,21 @@ index 77f30554d..32158ed65 100644
  #endif
  
  /* The ARM uses @ are a comment character so we need to redefine
-@@ -104,8 +106,9 @@
+@@ -95,7 +97,8 @@
     the code more efficient, but for Thumb-1 it's better to put them out of
     band unless we are generating compressed tables.  */
  #define JUMP_TABLES_IN_TEXT_SECTION					\
 -   ((TARGET_32BIT || (TARGET_THUMB && (optimize_size || flag_pic))) \
--    && !target_pure_code)
 +   ((TARGET_32BIT || (TARGET_THUMB && !inline_thumb1_jump_table \
 +                    && (optimize_size || flag_pic))) \
-+    && !target_pure_code)
+     && !target_pure_code)
  
  #ifndef LINK_SPEC
- #define LINK_SPEC "%{mbig-endian:-EB} %{mlittle-endian:-EL} -X"
 diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index ace84816e..8c8fa6553 100644
+index f794e8f..d19529b 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
-@@ -108,11 +108,16 @@
+@@ -102,11 +102,16 @@
  #define CC1_SPEC							\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC " " ASAN_CC1_SPEC,	\
  		       GNU_USER_TARGET_CC1_SPEC " " ASAN_CC1_SPEC " "	\
@@ -237,7 +235,7 @@ index ace84816e..8c8fa6553 100644
  #define LIB_SPEC							\
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index fee33a3ef..22fb2ced9 100644
+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
@@ -257,7 +255,7 @@ index fee33a3ef..22fb2ced9 100644
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 7a02a7eb4..cac4179bc 100644
+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
@@ -273,7 +271,7 @@ index 7a02a7eb4..cac4179bc 100644
  #define ASM_SPEC "%{" SPEC_32 ":--32} \
   %{" SPEC_64 ":--64} \
 diff --git a/gcc/config/i386/linux-common.h b/gcc/config/i386/linux-common.h
-index 4b9910fa9..3b11ed086 100644
+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
@@ -292,10 +290,10 @@ index 4b9910fa9..3b11ed086 100644
  #undef	LINK_SPEC
  #define LINK_SPEC \
 diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h
-index 301a41ccd..9623c88d0 100644
+index 19c55c3..468303d 100644
 --- a/gcc/config/linux-android.h
 +++ b/gcc/config/linux-android.h
-@@ -38,15 +39,18 @@
+@@ -38,15 +38,18 @@
    "%{" NOANDROID "|tno-android-ld:" LINUX_SPEC ";:" ANDROID_SPEC "}"
  
  #define ANDROID_LINK_SPEC \
@@ -321,7 +319,7 @@ index 301a41ccd..9623c88d0 100644
    "%{!static: -ldl}"
 diff --git a/gcc/config/mips/android.h b/gcc/config/mips/android.h
 new file mode 100644
-index 000000000..32c539c8d
+index 0000000..32c539c
 --- /dev/null
 +++ b/gcc/config/mips/android.h
 @@ -0,0 +1,49 @@
@@ -375,7 +373,7 @@ index 000000000..32c539c8d
 +  /* Use the standard linux specs for everything else.  */		\
 +  LINUX_DRIVER_SELF_SPECS
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 15b549c08..4a2816014 100644
+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
@@ -406,7 +404,7 @@ index 15b549c08..4a2816014 100644
    /* -mplt has no effect without -mno-shared.  Simplify later		\
       specs handling by removing a redundant option.  */			\
 diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8429a7ca2..8bfacf994 100644
+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
@@ -420,7 +418,7 @@ index 8429a7ca2..8bfacf994 100644
  #define CC1PLUS_SPEC							\
 diff --git a/gcc/config/mips/t-linux-android b/gcc/config/mips/t-linux-android
 new file mode 100644
-index 000000000..39f512c81
+index 0000000..39f512c
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android
 @@ -0,0 +1,3 @@
@@ -429,7 +427,7 @@ index 000000000..39f512c81
 +MULTILIB_OSDIRNAMES = ../libr2 ../libr6
 diff --git a/gcc/config/mips/t-linux-android64 b/gcc/config/mips/t-linux-android64
 new file mode 100644
-index 000000000..55cab7d62
+index 0000000..55cab7d
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android64
 @@ -0,0 +1,4 @@
@@ -438,7 +436,7 @@ index 000000000..55cab7d62
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../libr2 ../libr6 ../lib64r2 ../lib64
 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6
 diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
-index 555c0fe24..47c8655f9 100644
+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
@@ -462,10 +460,10 @@ index 555c0fe24..47c8655f9 100644
  
  #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 41797a971..f746e8353 100755
+index e70fdd6..014f956 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -78319,6 +78341,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78536,6 +78536,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -478,7 +476,7 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-@@ -78377,6 +78405,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78594,6 +78600,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -492,7 +490,7 @@ index 41797a971..f746e8353 100755
  main ()
  {
 diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
-index e3e206b7d..e85dc2c76 100644
+index 1ad0eb5..9f322d8 100644
 --- a/libstdc++-v3/include/bits/locale_facets.h
 +++ b/libstdc++-v3/include/bits/locale_facets.h
 @@ -47,6 +47,20 @@
@@ -535,10 +533,10 @@ index e3e206b7d..e85dc2c76 100644
  
  #ifdef _GLIBCXX_USE_WCHAR_T
 diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 9b617998f..c149169bb 100644
+index 19953bc..5ae24af 100644
 --- a/libstdc++-v3/libsupc++/guard.cc
 +++ b/libstdc++-v3/libsupc++/guard.cc
-@@ -33,7 +33,12 @@
+@@ -34,7 +34,12 @@
  #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \
    && (ATOMIC_INT_LOCK_FREE > 1) && defined(_GLIBCXX_HAVE_LINUX_FUTEX)
  # include <climits>
diff --git a/packages/gcc/7.2.0/972-crystax.patch b/packages/gcc/7.2.0/972-crystax.patch
index b9077be..f68fe1e 100644
--- a/packages/gcc/7.2.0/972-crystax.patch
+++ b/packages/gcc/7.2.0/972-crystax.patch
@@ -11,10 +11,10 @@ Date:   Mon Apr 14 15:59:47 2014 -0700
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
 diff --git a/gcc/config.in b/gcc/config.in
-index 115cb6163..933916833 100644
+index 3fda578..ebe222c 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -2119,6 +2119,12 @@
+@@ -2180,6 +2180,12 @@
  #endif
  
  
@@ -28,7 +28,7 @@ index 115cb6163..933916833 100644
     efficiently supported by the host hardware. */
  #ifndef USED_FOR_TARGET
 diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
-index 093c38bba..54b3e0c91 100644
+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;
@@ -42,7 +42,7 @@ index 093c38bba..54b3e0c91 100644
  #endif
 +#endif
 diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h
-index 5ded869d2..5f51ac81d 100644
+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
@@ -59,7 +59,7 @@ index 5ded869d2..5f51ac81d 100644
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b0bf40a95..d1874bc29 100644
+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
@@ -76,7 +76,7 @@ index b0bf40a95..d1874bc29 100644
  #undef LINK_GCC_C_SEQUENCE_SPEC
  #define LINK_GCC_C_SEQUENCE_SPEC \
 diff --git a/gcc/config/openbsd.h b/gcc/config/openbsd.h
-index 37ecfc43f..a5f1b9955 100644
+index 1048e31..47044c5 100644
 --- a/gcc/config/openbsd.h
 +++ b/gcc/config/openbsd.h
 @@ -136,8 +136,12 @@ while (0)
@@ -93,10 +93,10 @@ index 37ecfc43f..a5f1b9955 100644
  #undef LIB_SPEC
  #define LIB_SPEC OBSD_LIB_SPEC
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index cbf909722..eb2217fad 100644
+index de38629..06d586a 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -805,7 +805,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -110,10 +110,10 @@ index cbf909722..eb2217fad 100644
  
  #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
 diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 5160e1fda..7632a5081 100644
+index 1ae7f9f..98c9482 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
-@@ -347,7 +347,11 @@ along with GCC; see the file COPYING3.  If not see
+@@ -367,7 +367,11 @@ along with GCC; see the file COPYING3.  If not see
  /* 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)
@@ -126,10 +126,10 @@ index 5160e1fda..7632a5081 100644
  #endif
  
 diff --git a/gcc/configure b/gcc/configure
-index 1c6e3407c..28ad05004 100755
+index 1d39548..f63716a 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -934,6 +934,7 @@ enable_fix_cortex_a53_835769
+@@ -939,6 +939,7 @@ enable_fix_cortex_a53_835769
  enable_fix_cortex_a53_843419
  with_glibc_version
  enable_gnu_unique_object
@@ -137,7 +137,7 @@ index 1c6e3407c..28ad05004 100755
  enable_linker_build_id
  enable_default_ssp
  with_long_double_128
-@@ -1670,6 +1671,9 @@ Optional Features:
+@@ -1676,6 +1677,9 @@ Optional Features:
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
                            extension on glibc systems
@@ -147,7 +147,7 @@ index 1c6e3407c..28ad05004 100755
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
    --enable-default-ssp    enable Stack Smashing Protection as default
-@@ -27703,6 +27707,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+@@ -28050,6 +28054,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
  
@@ -187,10 +187,10 @@ index 1c6e3407c..28ad05004 100755
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_eh_frame_hdr" >&5
  $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; }
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9ae..0cf7419e7 100644
+index 1d5a9d7..736a534 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4828,6 +4828,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
+@@ -4981,6 +4981,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
  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.])
@@ -228,7 +228,7 @@ index 6c1dcd9ae..0cf7419e7 100644
  
 diff --git a/gcc/testsuite/g++.dg/eh/spec3-static.C b/gcc/testsuite/g++.dg/eh/spec3-static.C
 new file mode 100644
-index 000000000..15408effa
+index 0000000..15408ef
 --- /dev/null
 +++ b/gcc/testsuite/g++.dg/eh/spec3-static.C
 @@ -0,0 +1,25 @@
@@ -258,7 +258,7 @@ index 000000000..15408effa
 +  catch (A& a) { }
 +}
 diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index f3343fc4f..d42647779 100644
+index c01f94b..00cab57 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
 @@ -88,7 +88,8 @@ call_ ## FUNC (void)					\
diff --git a/packages/gcc/7.2.0/973-crystax.patch b/packages/gcc/7.2.0/973-crystax.patch
index b96ece3..c608eb3 100644
--- a/packages/gcc/7.2.0/973-crystax.patch
+++ b/packages/gcc/7.2.0/973-crystax.patch
@@ -10,7 +10,7 @@ diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
 index 3d044e8bd..5c89fcab0 100644
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -14631,6 +14631,7 @@ legitimate_pic_address_disp_p (rtx disp)
+@@ -15753,6 +15753,7 @@ legitimate_pic_address_disp_p (rtx disp)
  	  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/975-crystax.patch b/packages/gcc/7.2.0/975-crystax.patch
index 9efc2a4..3305a43 100644
--- a/packages/gcc/7.2.0/975-crystax.patch
+++ b/packages/gcc/7.2.0/975-crystax.patch
@@ -13,7 +13,7 @@ diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
 index 5974c65d3..71b2c7aa9 100644
 --- a/gcc/config/arm/arm.c
 +++ b/gcc/config/arm/arm.c
-@@ -22403,9 +22403,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
+@@ -22270,9 +22270,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
  	memsize = MEM_SIZE (x);
  
  	/* Only certain alignment specifiers are supported by the hardware.  */
diff --git a/packages/gcc/7.2.0/977-crystax.patch b/packages/gcc/7.2.0/977-crystax.patch
index 0211d72..61d2261 100644
--- a/packages/gcc/7.2.0/977-crystax.patch
+++ b/packages/gcc/7.2.0/977-crystax.patch
@@ -10,7 +10,7 @@ diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aar
 index db1288fd0..38bc64d61 100644
 --- a/gcc/config/aarch64/aarch64-linux-android.h
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
-@@ -57,4 +57,8 @@
+@@ -56,4 +56,8 @@
  #define ENDFILE_SPEC \
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
  
@@ -23,7 +23,7 @@ diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
 index 8bfacf994..262a9a341 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -63,3 +63,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -62,3 +62,7 @@ along with GCC; see the file COPYING3.  If not see
  
  /* The default value isn't sufficient in 64-bit mode.  */
  #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)