gcc: update gcc 5 to version 5.3.0

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 48826

37 files changed, 27 insertions, 62 deletions

diff --git a/toolchain/gcc/patches/5.2.0/050-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/toolchain/gcc/patches/5.2.0/050-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch
deleted file mode 100644
index 371ca51f0f..0000000000
--- a/toolchain/gcc/patches/5.2.0/050-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon, 23 Nov 2015 15:17:55 +0000
-Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for
- printing fatal error
-
-libgcc/
-	PR target/68059
-	* config/arm/linux-atomic-64bit.c (__write): Rename to...
-	(write): ...this and fix the return type.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
---- a/libgcc/config/arm/linux-atomic-64bit.c
-+++ b/libgcc/config/arm/linux-atomic-64bit.c
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTI
-    kernels; we check for that in an init section and bail out rather
-    unceremoneously.  */
- 
--extern unsigned int __write (int fd, const void *buf, unsigned int count);
-+extern int write (int fd, const void *buf, unsigned int count);
- extern void abort (void);
- 
- /* Kernel helper for compare-and-exchange.  */
-@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelp
- 	 for the user - I'm not sure I can rely on much else being
- 	 available at this point, so do the same as generic-morestack.c
- 	 write () and abort ().  */
--      __write (2 /* stderr.  */, err, sizeof (err));
-+      write (2 /* stderr.  */, err, sizeof (err));
-       abort ();
-     }
- };
diff --git a/toolchain/gcc/patches/5.2.0/001-revert_register_mode_search.patch b/toolchain/gcc/patches/5.3.0/001-revert_register_mode_search.patch
index 06373eb6a0..06373eb6a0 100644
--- a/toolchain/gcc/patches/5.2.0/001-revert_register_mode_search.patch
+++ b/toolchain/gcc/patches/5.3.0/001-revert_register_mode_search.patch
diff --git a/toolchain/gcc/patches/5.2.0/002-case_insensitive.patch b/toolchain/gcc/patches/5.3.0/002-case_insensitive.patch
index b3d2dbe291..b3d2dbe291 100644
--- a/toolchain/gcc/patches/5.2.0/002-case_insensitive.patch
+++ b/toolchain/gcc/patches/5.3.0/002-case_insensitive.patch
diff --git a/toolchain/gcc/patches/5.2.0/010-documentation.patch b/toolchain/gcc/patches/5.3.0/010-documentation.patch
index 07064a97bc..07064a97bc 100644
--- a/toolchain/gcc/patches/5.2.0/010-documentation.patch
+++ b/toolchain/gcc/patches/5.3.0/010-documentation.patch
diff --git a/toolchain/gcc/patches/5.2.0/020-no-plt-backport.patch b/toolchain/gcc/patches/5.3.0/020-no-plt-backport.patch
index b9702c9520..b9702c9520 100644
--- a/toolchain/gcc/patches/5.2.0/020-no-plt-backport.patch
+++ b/toolchain/gcc/patches/5.3.0/020-no-plt-backport.patch
diff --git a/toolchain/gcc/patches/5.2.0/030-fix-arm-codegen-PR-65932.patch b/toolchain/gcc/patches/5.3.0/030-fix-arm-codegen-PR-65932.patch
index 7f0b43c0e9..7f0b43c0e9 100644
--- a/toolchain/gcc/patches/5.2.0/030-fix-arm-codegen-PR-65932.patch
+++ b/toolchain/gcc/patches/5.3.0/030-fix-arm-codegen-PR-65932.patch
diff --git a/toolchain/gcc/patches/5.2.0/040-fix-mips-ICE-PR-68400.patch b/toolchain/gcc/patches/5.3.0/040-fix-mips-ICE-PR-68400.patch
index e88af34032..e88af34032 100644
--- a/toolchain/gcc/patches/5.2.0/040-fix-mips-ICE-PR-68400.patch
+++ b/toolchain/gcc/patches/5.3.0/040-fix-mips-ICE-PR-68400.patch
diff --git a/toolchain/gcc/patches/5.2.0/100-uclibc-conf.patch b/toolchain/gcc/patches/5.3.0/100-uclibc-conf.patch
index ff9ad94f62..ff9ad94f62 100644
--- a/toolchain/gcc/patches/5.2.0/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/5.3.0/100-uclibc-conf.patch
diff --git a/toolchain/gcc/patches/5.2.0/200-musl_config.patch b/toolchain/gcc/patches/5.3.0/200-musl_config.patch
index a2b41b3726..836e9ab499 100644
--- a/toolchain/gcc/patches/5.2.0/200-musl_config.patch
+++ b/toolchain/gcc/patches/5.3.0/200-musl_config.patch
@@ -217,7 +217,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-8
 +Use musl C library
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -27742,6 +27742,9 @@ if test "${gcc_cv_libc_provides_ssp+set}
+@@ -27802,6 +27802,9 @@ if test "${gcc_cv_libc_provides_ssp+set}
  else
    gcc_cv_libc_provides_ssp=no
      case "$target" in
@@ -227,7 +227,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-8
         *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
        # glibc 2.4 and later provides __stack_chk_fail and
        # either __stack_chk_guard, or TLS access to stack guard canary.
-@@ -27774,6 +27777,7 @@ fi
+@@ -27834,6 +27837,7 @@ fi
  	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
  	 # simply assert that glibc does provide this, which is true for all
  	 # realistically usable GNU/Hurd configurations.
@@ -235,7 +235,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-8
  	 gcc_cv_libc_provides_ssp=yes;;
         *-*-darwin* | *-*-freebsd*)
  	 ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
-@@ -27870,6 +27874,9 @@ case "$target" in
+@@ -27930,6 +27934,9 @@ case "$target" in
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -247,7 +247,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-8
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -5229,6 +5229,9 @@ AC_CACHE_CHECK(__stack_chk_fail in targe
+@@ -5282,6 +5282,9 @@ AC_CACHE_CHECK(__stack_chk_fail in targe
        gcc_cv_libc_provides_ssp,
        [gcc_cv_libc_provides_ssp=no
      case "$target" in
@@ -257,7 +257,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-8
         *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
        # glibc 2.4 and later provides __stack_chk_fail and
        # either __stack_chk_guard, or TLS access to stack guard canary.
-@@ -5255,6 +5258,7 @@ AC_CACHE_CHECK(__stack_chk_fail in targe
+@@ -5308,6 +5311,7 @@ AC_CACHE_CHECK(__stack_chk_fail in targe
  	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
  	 # simply assert that glibc does provide this, which is true for all
  	 # realistically usable GNU/Hurd configurations.
@@ -265,7 +265,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-8
  	 gcc_cv_libc_provides_ssp=yes;;
         *-*-darwin* | *-*-freebsd*)
  	 AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
-@@ -5328,6 +5332,9 @@ case "$target" in
+@@ -5381,6 +5385,9 @@ case "$target" in
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -286,7 +286,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-8
  -tno-android-cc -tno-android-ld}
  
  @emph{H8/300 Options}
-@@ -15324,13 +15324,19 @@ These @samp{-m} options are defined for
+@@ -15325,13 +15325,19 @@ These @samp{-m} options are defined for
  @item -mglibc
  @opindex mglibc
  Use the GNU C library.  This is the default except
diff --git a/toolchain/gcc/patches/5.2.0/201-musl_arm.patch b/toolchain/gcc/patches/5.3.0/201-musl_arm.patch
index 27a26afc05..27a26afc05 100644
--- a/toolchain/gcc/patches/5.2.0/201-musl_arm.patch
+++ b/toolchain/gcc/patches/5.3.0/201-musl_arm.patch
diff --git a/toolchain/gcc/patches/5.2.0/202-musl_mips.patch b/toolchain/gcc/patches/5.3.0/202-musl_mips.patch
index 816dd8d101..816dd8d101 100644
--- a/toolchain/gcc/patches/5.2.0/202-musl_mips.patch
+++ b/toolchain/gcc/patches/5.3.0/202-musl_mips.patch
diff --git a/toolchain/gcc/patches/5.2.0/203-musl_powerpc.patch b/toolchain/gcc/patches/5.3.0/203-musl_powerpc.patch
index 2783b276f7..b4f34e81ca 100644
--- a/toolchain/gcc/patches/5.2.0/203-musl_powerpc.patch
+++ b/toolchain/gcc/patches/5.3.0/203-musl_powerpc.patch
@@ -69,17 +69,17 @@ gcc/Changelog:
  
  /* Pass -G xxx to the compiler.  */
  #undef CC1_SPEC
-@@ -586,7 +589,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+@@ -574,7 +577,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ %{R*} \
+ %(link_shlib) \
+ %{!T*: %(link_start) } \
+-%(link_os)"
++%(link_os)" \
++"%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
  
- /* Override the default target of the linker.  */
- #define	LINK_TARGET_SPEC \
--  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
-+  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
-+  "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
- 
- /* Any specific OS flags.  */
- #define LINK_OS_SPEC "\
-@@ -762,17 +766,22 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ /* Shared libraries are not default.  */
+ #define LINK_SHLIB_SPEC "\
+@@ -757,17 +761,22 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
  
  #define LINK_START_LINUX_SPEC ""
  
@@ -105,7 +105,7 @@ gcc/Changelog:
  
  #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
    %{rdynamic:-export-dynamic} \
-@@ -895,6 +904,7 @@ ncrtn.o%s"
+@@ -889,6 +898,7 @@ ncrtn.o%s"
    { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
    { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
    { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
@@ -113,7 +113,7 @@ gcc/Changelog:
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-@@ -949,3 +959,72 @@ ncrtn.o%s"
+@@ -943,3 +953,72 @@ ncrtn.o%s"
  /* This target uses the sysv4.opt file.  */
  #define TARGET_USES_SYSV4_OPT 1
  
@@ -188,7 +188,7 @@ gcc/Changelog:
 +#endif
 --- a/gcc/config/rs6000/sysv4le.h
 +++ b/gcc/config/rs6000/sysv4le.h
-@@ -35,3 +35,5 @@
+@@ -31,3 +31,5 @@
  /* Little-endian PowerPC64 Linux uses the ELF v2 ABI by default.  */
  #define LINUX64_DEFAULT_ABI_ELFv2
  
@@ -196,7 +196,7 @@ gcc/Changelog:
 +#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","le")
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2410,6 +2410,10 @@ powerpc*-*-linux*)
+@@ -2416,6 +2416,10 @@ powerpc*-*-linux*)
  	    powerpc*-*-linux*paired*)
  		tm_file="${tm_file} rs6000/750cl.h" ;;
  	esac
diff --git a/toolchain/gcc/patches/5.2.0/204-musl_sh.patch b/toolchain/gcc/patches/5.3.0/204-musl_sh.patch
index 8c3753d530..8c3753d530 100644
--- a/toolchain/gcc/patches/5.2.0/204-musl_sh.patch
+++ b/toolchain/gcc/patches/5.3.0/204-musl_sh.patch
diff --git a/toolchain/gcc/patches/5.2.0/205-musl_x86.patch b/toolchain/gcc/patches/5.3.0/205-musl_x86.patch
index 8772328d64..8772328d64 100644
--- a/toolchain/gcc/patches/5.2.0/205-musl_x86.patch
+++ b/toolchain/gcc/patches/5.3.0/205-musl_x86.patch
diff --git a/toolchain/gcc/patches/5.2.0/206-musl_aarch64.patch b/toolchain/gcc/patches/5.3.0/206-musl_aarch64.patch
index 6925a026e7..6925a026e7 100644
--- a/toolchain/gcc/patches/5.2.0/206-musl_aarch64.patch
+++ b/toolchain/gcc/patches/5.3.0/206-musl_aarch64.patch
diff --git a/toolchain/gcc/patches/5.2.0/207-musl_fixincludes.patch b/toolchain/gcc/patches/5.3.0/207-musl_fixincludes.patch
index 0ff33d39d8..0ff33d39d8 100644
--- a/toolchain/gcc/patches/5.2.0/207-musl_fixincludes.patch
+++ b/toolchain/gcc/patches/5.3.0/207-musl_fixincludes.patch
diff --git a/toolchain/gcc/patches/5.2.0/209-musl_libstdc++.patch b/toolchain/gcc/patches/5.3.0/209-musl_libstdc++.patch
index 861bc76dc7..d2414d0232 100644
--- a/toolchain/gcc/patches/5.2.0/209-musl_libstdc++.patch
+++ b/toolchain/gcc/patches/5.3.0/209-musl_libstdc++.patch
@@ -37,7 +37,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222329 138bc75d-0d04-0410-961f-8
        ;;
 --- a/libgfortran/configure
 +++ b/libgfortran/configure
-@@ -26447,7 +26447,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>con
+@@ -26456,7 +26456,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>con
  
    fi
    case "$host" in
diff --git a/toolchain/gcc/patches/5.2.0/230-musl_libssp.patch b/toolchain/gcc/patches/5.3.0/230-musl_libssp.patch
index 30f42e9f7c..30f42e9f7c 100644
--- a/toolchain/gcc/patches/5.2.0/230-musl_libssp.patch
+++ b/toolchain/gcc/patches/5.3.0/230-musl_libssp.patch
diff --git a/toolchain/gcc/patches/5.2.0/240-musl-libitm-fixes.patch b/toolchain/gcc/patches/5.3.0/240-musl-libitm-fixes.patch
index 533cb68499..533cb68499 100644
--- a/toolchain/gcc/patches/5.2.0/240-musl-libitm-fixes.patch
+++ b/toolchain/gcc/patches/5.3.0/240-musl-libitm-fixes.patch
diff --git a/toolchain/gcc/patches/5.2.0/250-add-musl.patch b/toolchain/gcc/patches/5.3.0/250-add-musl.patch
index 8cbeddea33..8cbeddea33 100644
--- a/toolchain/gcc/patches/5.2.0/250-add-musl.patch
+++ b/toolchain/gcc/patches/5.3.0/250-add-musl.patch
diff --git a/toolchain/gcc/patches/5.2.0/260-musl-add-unwind-fix.patch b/toolchain/gcc/patches/5.3.0/260-musl-add-unwind-fix.patch
index a3b83e2074..a3b83e2074 100644
--- a/toolchain/gcc/patches/5.2.0/260-musl-add-unwind-fix.patch
+++ b/toolchain/gcc/patches/5.3.0/260-musl-add-unwind-fix.patch
diff --git a/toolchain/gcc/patches/5.2.0/270-musl-add-powerpc-softfloat-fix.patch b/toolchain/gcc/patches/5.3.0/270-musl-add-powerpc-softfloat-fix.patch
index 798936cbc9..bdebf6c01f 100644
--- a/toolchain/gcc/patches/5.2.0/270-musl-add-powerpc-softfloat-fix.patch
+++ b/toolchain/gcc/patches/5.3.0/270-musl-add-powerpc-softfloat-fix.patch
@@ -13,7 +13,7 @@
  #elif DEFAULT_LIBC == LIBC_GLIBC
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -770,7 +770,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+@@ -765,7 +765,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
  #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
diff --git a/toolchain/gcc/patches/5.2.0/800-arm_v5te_no_ldrd_strd.patch b/toolchain/gcc/patches/5.3.0/800-arm_v5te_no_ldrd_strd.patch
index 0edeb13c75..0edeb13c75 100644
--- a/toolchain/gcc/patches/5.2.0/800-arm_v5te_no_ldrd_strd.patch
+++ b/toolchain/gcc/patches/5.3.0/800-arm_v5te_no_ldrd_strd.patch
diff --git a/toolchain/gcc/patches/5.2.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches/5.3.0/810-arm-softfloat-libgcc.patch
index 1d06f5b2ec..1d06f5b2ec 100644
--- a/toolchain/gcc/patches/5.2.0/810-arm-softfloat-libgcc.patch
+++ b/toolchain/gcc/patches/5.3.0/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/patches/5.2.0/820-libgcc_pic.patch b/toolchain/gcc/patches/5.3.0/820-libgcc_pic.patch
index 42bf0c8ccc..42bf0c8ccc 100644
--- a/toolchain/gcc/patches/5.2.0/820-libgcc_pic.patch
+++ b/toolchain/gcc/patches/5.3.0/820-libgcc_pic.patch
diff --git a/toolchain/gcc/patches/5.2.0/830-arm_unbreak_armv4t.patch b/toolchain/gcc/patches/5.3.0/830-arm_unbreak_armv4t.patch
index 37f8f2a54d..37f8f2a54d 100644
--- a/toolchain/gcc/patches/5.2.0/830-arm_unbreak_armv4t.patch
+++ b/toolchain/gcc/patches/5.3.0/830-arm_unbreak_armv4t.patch
diff --git a/toolchain/gcc/patches/5.2.0/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches/5.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
index cb1fb98235..cb1fb98235 100644
--- a/toolchain/gcc/patches/5.2.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/toolchain/gcc/patches/5.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/toolchain/gcc/patches/5.2.0/850-use_shared_libgcc.patch b/toolchain/gcc/patches/5.3.0/850-use_shared_libgcc.patch
index 5818cf4da0..5818cf4da0 100644
--- a/toolchain/gcc/patches/5.2.0/850-use_shared_libgcc.patch
+++ b/toolchain/gcc/patches/5.3.0/850-use_shared_libgcc.patch
diff --git a/toolchain/gcc/patches/5.2.0/851-libgcc_no_compat.patch b/toolchain/gcc/patches/5.3.0/851-libgcc_no_compat.patch
index 80c3476841..80c3476841 100644
--- a/toolchain/gcc/patches/5.2.0/851-libgcc_no_compat.patch
+++ b/toolchain/gcc/patches/5.3.0/851-libgcc_no_compat.patch
diff --git a/toolchain/gcc/patches/5.2.0/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches/5.3.0/870-ppc_no_crtsavres.patch
index b38b9d5d9c..ac561544b4 100644
--- a/toolchain/gcc/patches/5.2.0/870-ppc_no_crtsavres.patch
+++ b/toolchain/gcc/patches/5.3.0/870-ppc_no_crtsavres.patch
@@ -1,6 +1,6 @@
 --- a/gcc/config/rs6000/rs6000.c
 +++ b/gcc/config/rs6000/rs6000.c
-@@ -21453,7 +21453,7 @@ rs6000_savres_strategy (rs6000_stack_t *
+@@ -21495,7 +21495,7 @@ rs6000_savres_strategy (rs6000_stack_t *
    /* Define cutoff for using out-of-line functions to save registers.  */
    if (DEFAULT_ABI == ABI_V4 || TARGET_ELF)
      {
diff --git a/toolchain/gcc/patches/5.2.0/880-no_java_section.patch b/toolchain/gcc/patches/5.3.0/880-no_java_section.patch
index def6c9f4a0..def6c9f4a0 100644
--- a/toolchain/gcc/patches/5.2.0/880-no_java_section.patch
+++ b/toolchain/gcc/patches/5.3.0/880-no_java_section.patch
diff --git a/toolchain/gcc/patches/5.2.0/900-bad-mips16-crt.patch b/toolchain/gcc/patches/5.3.0/900-bad-mips16-crt.patch
index dd6e9dc889..dd6e9dc889 100644
--- a/toolchain/gcc/patches/5.2.0/900-bad-mips16-crt.patch
+++ b/toolchain/gcc/patches/5.3.0/900-bad-mips16-crt.patch
diff --git a/toolchain/gcc/patches/5.2.0/910-mbsd_multi.patch b/toolchain/gcc/patches/5.3.0/910-mbsd_multi.patch
index 68661d2e6b..667cd96050 100644
--- a/toolchain/gcc/patches/5.2.0/910-mbsd_multi.patch
+++ b/toolchain/gcc/patches/5.3.0/910-mbsd_multi.patch
@@ -201,7 +201,7 @@
  @item -Wstack-protector
  @opindex Wstack-protector
  @opindex Wno-stack-protector
-@@ -7844,7 +7860,7 @@ so, the first branch is redirected to ei
+@@ -7845,7 +7861,7 @@ so, the first branch is redirected to ei
  second branch or a point immediately following it, depending on whether
  the condition is known to be true or false.
  
diff --git a/toolchain/gcc/patches/5.2.0/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/5.3.0/920-specs_nonfatal_getenv.patch
index 3d708f24c3..3d708f24c3 100644
--- a/toolchain/gcc/patches/5.2.0/920-specs_nonfatal_getenv.patch
+++ b/toolchain/gcc/patches/5.3.0/920-specs_nonfatal_getenv.patch
diff --git a/toolchain/gcc/patches/5.2.0/930-fix-mips-noexecstack.patch b/toolchain/gcc/patches/5.3.0/930-fix-mips-noexecstack.patch
index c05844d2e4..c05844d2e4 100644
--- a/toolchain/gcc/patches/5.2.0/930-fix-mips-noexecstack.patch
+++ b/toolchain/gcc/patches/5.3.0/930-fix-mips-noexecstack.patch
diff --git a/toolchain/gcc/patches/5.2.0/940-no-clobber-stamp-bits.patch b/toolchain/gcc/patches/5.3.0/940-no-clobber-stamp-bits.patch
index bf2ab07303..a33ce24155 100644
--- a/toolchain/gcc/patches/5.2.0/940-no-clobber-stamp-bits.patch
+++ b/toolchain/gcc/patches/5.3.0/940-no-clobber-stamp-bits.patch
@@ -1,6 +1,6 @@
 --- a/libstdc++-v3/include/Makefile.in
 +++ b/libstdc++-v3/include/Makefile.in
-@@ -1382,7 +1382,7 @@ stamp-bits: ${bits_headers}
+@@ -1420,7 +1420,7 @@ stamp-bits: ${bits_headers}
  	@$(STAMP) stamp-bits
  
  stamp-bits-sup: stamp-bits ${bits_sup_headers}
diff --git a/toolchain/gcc/patches/5.2.0/950-cpp_file_path_translation.patch b/toolchain/gcc/patches/5.3.0/950-cpp_file_path_translation.patch
index 2324d75881..ca018ec7ad 100644
--- a/toolchain/gcc/patches/5.2.0/950-cpp_file_path_translation.patch
+++ b/toolchain/gcc/patches/5.3.0/950-cpp_file_path_translation.patch
@@ -64,7 +64,7 @@ Forward ported from attachment to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=4
  
  @item Machine Dependent Options
  @xref{Submodel Options,,Hardware Models and Configurations}.
-@@ -11463,6 +11463,12 @@ be searched for header files only for th
+@@ -11464,6 +11464,12 @@ be searched for header files only for th
  "@var{file}"}; they are not searched for @code{#include <@var{file}>},
  otherwise just like @option{-I}.