aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-07-13 12:19:42 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2016-07-13 23:04:18 +0200
commit2d3917d5b58281a6f440d57c7ededd43fb82f166 (patch)
tree68b34e5d33b5d704d2327872fb1712f5e783f8f9
parent05cc72944c29300f7af29ea364063b0f24c42e18 (diff)
downloadupstream-2d3917d5b58281a6f440d57c7ededd43fb82f166.tar.gz
upstream-2d3917d5b58281a6f440d57c7ededd43fb82f166.tar.bz2
upstream-2d3917d5b58281a6f440d57c7ededd43fb82f166.zip
gcc: update gcc to version 5.4.0
The removed patches are already integrated in upstream gcc. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--toolchain/gcc/Config.version2
-rw-r--r--toolchain/gcc/common.mk4
-rw-r--r--toolchain/gcc/patches/5.3.0/030-fix-arm-codegen-PR-65932.patch21
-rw-r--r--toolchain/gcc/patches/5.3.0/050-gcc-6-compile.patch117
-rw-r--r--toolchain/gcc/patches/5.4.0/001-revert_register_mode_search.patch (renamed from toolchain/gcc/patches/5.3.0/001-revert_register_mode_search.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/002-case_insensitive.patch (renamed from toolchain/gcc/patches/5.3.0/002-case_insensitive.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/010-documentation.patch (renamed from toolchain/gcc/patches/5.3.0/010-documentation.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/020-no-plt-backport.patch (renamed from toolchain/gcc/patches/5.3.0/020-no-plt-backport.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/040-fix-mips-ICE-PR-68400.patch (renamed from toolchain/gcc/patches/5.3.0/040-fix-mips-ICE-PR-68400.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/100-uclibc-conf.patch (renamed from toolchain/gcc/patches/5.3.0/100-uclibc-conf.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/200-musl_config.patch (renamed from toolchain/gcc/patches/5.3.0/200-musl_config.patch)14
-rw-r--r--toolchain/gcc/patches/5.4.0/201-musl_arm.patch (renamed from toolchain/gcc/patches/5.3.0/201-musl_arm.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/202-musl_mips.patch (renamed from toolchain/gcc/patches/5.3.0/202-musl_mips.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/203-musl_powerpc.patch (renamed from toolchain/gcc/patches/5.3.0/203-musl_powerpc.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/204-musl_sh.patch (renamed from toolchain/gcc/patches/5.3.0/204-musl_sh.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/205-musl_x86.patch (renamed from toolchain/gcc/patches/5.3.0/205-musl_x86.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/206-musl_aarch64.patch (renamed from toolchain/gcc/patches/5.3.0/206-musl_aarch64.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/207-musl_fixincludes.patch (renamed from toolchain/gcc/patches/5.3.0/207-musl_fixincludes.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/209-musl_libstdc++.patch (renamed from toolchain/gcc/patches/5.3.0/209-musl_libstdc++.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/230-musl_libssp.patch (renamed from toolchain/gcc/patches/5.3.0/230-musl_libssp.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/240-musl-libitm-fixes.patch (renamed from toolchain/gcc/patches/5.3.0/240-musl-libitm-fixes.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/250-add-musl.patch (renamed from toolchain/gcc/patches/5.3.0/250-add-musl.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/260-musl-add-unwind-fix.patch (renamed from toolchain/gcc/patches/5.3.0/260-musl-add-unwind-fix.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/270-musl-add-powerpc-softfloat-fix.patch (renamed from toolchain/gcc/patches/5.3.0/270-musl-add-powerpc-softfloat-fix.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/800-arm_v5te_no_ldrd_strd.patch (renamed from toolchain/gcc/patches/5.3.0/800-arm_v5te_no_ldrd_strd.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/810-arm-softfloat-libgcc.patch (renamed from toolchain/gcc/patches/5.3.0/810-arm-softfloat-libgcc.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/820-libgcc_pic.patch (renamed from toolchain/gcc/patches/5.3.0/820-libgcc_pic.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/830-arm_unbreak_armv4t.patch (renamed from toolchain/gcc/patches/5.3.0/830-arm_unbreak_armv4t.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/840-armv4_pass_fix-v4bx_to_ld.patch (renamed from toolchain/gcc/patches/5.3.0/840-armv4_pass_fix-v4bx_to_ld.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/850-use_shared_libgcc.patch (renamed from toolchain/gcc/patches/5.3.0/850-use_shared_libgcc.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/851-libgcc_no_compat.patch (renamed from toolchain/gcc/patches/5.3.0/851-libgcc_no_compat.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/870-ppc_no_crtsavres.patch (renamed from toolchain/gcc/patches/5.3.0/870-ppc_no_crtsavres.patch)2
-rw-r--r--toolchain/gcc/patches/5.4.0/880-no_java_section.patch (renamed from toolchain/gcc/patches/5.3.0/880-no_java_section.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/900-bad-mips16-crt.patch (renamed from toolchain/gcc/patches/5.3.0/900-bad-mips16-crt.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/910-mbsd_multi.patch (renamed from toolchain/gcc/patches/5.3.0/910-mbsd_multi.patch)4
-rw-r--r--toolchain/gcc/patches/5.4.0/920-specs_nonfatal_getenv.patch (renamed from toolchain/gcc/patches/5.3.0/920-specs_nonfatal_getenv.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/930-fix-mips-noexecstack.patch (renamed from toolchain/gcc/patches/5.3.0/930-fix-mips-noexecstack.patch)0
-rw-r--r--toolchain/gcc/patches/5.4.0/940-no-clobber-stamp-bits.patch (renamed from toolchain/gcc/patches/5.3.0/940-no-clobber-stamp-bits.patch)2
-rw-r--r--toolchain/gcc/patches/5.4.0/950-cpp_file_path_translation.patch (renamed from toolchain/gcc/patches/5.3.0/950-cpp_file_path_translation.patch)2
39 files changed, 15 insertions, 153 deletions
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index f9e8c47c6f..47f516d40d 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -6,7 +6,7 @@ config GCC_VERSION
string
default "4.8-linaro" if GCC_VERSION_4_8_LINARO
default "arc-2016.03" if GCC_VERSION_4_8_ARC
- default "5.3.0"
+ default "5.4.0"
config GCC_VERSION_4_8
bool
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 9bc849152b..5850f4363c 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -28,8 +28,8 @@ GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-ifeq ($(PKG_VERSION),5.3.0)
- PKG_MD5SUM:=c9616fd448f980259c31de613e575719
+ifeq ($(PKG_VERSION),5.4.0)
+ PKG_MD5SUM:=4c626ac2a83ef30dfb9260e6f59c2b30
endif
ifneq ($(CONFIG_GCC_VERSION_4_8_ARC),)
diff --git a/toolchain/gcc/patches/5.3.0/030-fix-arm-codegen-PR-65932.patch b/toolchain/gcc/patches/5.3.0/030-fix-arm-codegen-PR-65932.patch
deleted file mode 100644
index 7f0b43c0e9..0000000000
--- a/toolchain/gcc/patches/5.3.0/030-fix-arm-codegen-PR-65932.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65932
-
---- a/gcc/config/arm/arm.h
-+++ b/gcc/config/arm/arm.h
-@@ -628,16 +628,10 @@ extern int arm_arch_crc;
- type, but kept valid in the wider mode. The signedness of the
- extension may differ from that of the type. */
-
--/* It is far faster to zero extend chars than to sign extend them */
--
- #define PROMOTE_MODE(MODE, UNSIGNEDP, TYPE) \
- if (GET_MODE_CLASS (MODE) == MODE_INT \
- && GET_MODE_SIZE (MODE) < 4) \
- { \
-- if (MODE == QImode) \
-- UNSIGNEDP = 1; \
-- else if (MODE == HImode) \
-- UNSIGNEDP = 1; \
- (MODE) = SImode; \
- }
-
diff --git a/toolchain/gcc/patches/5.3.0/050-gcc-6-compile.patch b/toolchain/gcc/patches/5.3.0/050-gcc-6-compile.patch
deleted file mode 100644
index 8baf84472c..0000000000
--- a/toolchain/gcc/patches/5.3.0/050-gcc-6-compile.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Upstream commit r233720
-
-diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
-index 68acd3d..214ecf6 100644
---- a/gcc/cp/cfns.gperf
-+++ b/gcc/cp/cfns.gperf
-@@ -1,3 +1,5 @@
-+%language=C++
-+%define class-name libc_name
- %{
- /* Copyright (C) 2000-2015 Free Software Foundation, Inc.
-
-@@ -16,14 +18,6 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- %}
- %%
- # The standard C library functions, for feeding to gperf; the result is used
-diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
-index 1c6665d..596f413 100644
---- a/gcc/cp/cfns.h
-+++ b/gcc/cp/cfns.h
-@@ -1,5 +1,5 @@
--/* ANSI-C code produced by gperf version 3.0.3 */
--/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */
-+/* C++ code produced by gperf version 3.0.4 */
-+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */
-
- #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-@@ -28,7 +28,7 @@
- #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
- #endif
-
--#line 1 "cfns.gperf"
-+#line 3 "cfns.gperf"
-
- /* Copyright (C) 2000-2015 Free Software Foundation, Inc.
-
-@@ -47,25 +47,18 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- /* maximum key range = 391, duplicates = 0 */
-
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static unsigned int
--hash (register const char *str, register unsigned int len)
-+class libc_name
-+{
-+private:
-+ static inline unsigned int hash (const char *str, unsigned int len);
-+public:
-+ static const char *libc_name_p (const char *str, unsigned int len);
-+};
-+
-+inline unsigned int
-+libc_name::hash (register const char *str, register unsigned int len)
- {
- static const unsigned short asso_values[] =
- {
-@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len)
- return hval + asso_values[(unsigned char)str[len - 1]];
- }
-
--#ifdef __GNUC__
--__inline
--#ifdef __GNUC_STDC_INLINE__
--__attribute__ ((__gnu_inline__))
--#endif
--#endif
- const char *
--libc_name_p (register const char *str, register unsigned int len)
-+libc_name::libc_name_p (register const char *str, register unsigned int len)
- {
- enum
- {
-diff --git a/gcc/cp/except.c b/gcc/cp/except.c
-index 3ff1ce6..2f2e396 100644
---- a/gcc/cp/except.c
-+++ b/gcc/cp/except.c
-@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn)
- unless the system headers are playing rename tricks, and if
- they are, we don't want to be confused by them. */
- id = DECL_NAME (fn);
-- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
-+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id),
-+ IDENTIFIER_LENGTH (id));
- }
-
- /* Returns nonzero if an exception of type FROM will be caught by a
---
-1.7.1
-
diff --git a/toolchain/gcc/patches/5.3.0/001-revert_register_mode_search.patch b/toolchain/gcc/patches/5.4.0/001-revert_register_mode_search.patch
index 06373eb6a0..06373eb6a0 100644
--- a/toolchain/gcc/patches/5.3.0/001-revert_register_mode_search.patch
+++ b/toolchain/gcc/patches/5.4.0/001-revert_register_mode_search.patch
diff --git a/toolchain/gcc/patches/5.3.0/002-case_insensitive.patch b/toolchain/gcc/patches/5.4.0/002-case_insensitive.patch
index b3d2dbe291..b3d2dbe291 100644
--- a/toolchain/gcc/patches/5.3.0/002-case_insensitive.patch
+++ b/toolchain/gcc/patches/5.4.0/002-case_insensitive.patch
diff --git a/toolchain/gcc/patches/5.3.0/010-documentation.patch b/toolchain/gcc/patches/5.4.0/010-documentation.patch
index 07064a97bc..07064a97bc 100644
--- a/toolchain/gcc/patches/5.3.0/010-documentation.patch
+++ b/toolchain/gcc/patches/5.4.0/010-documentation.patch
diff --git a/toolchain/gcc/patches/5.3.0/020-no-plt-backport.patch b/toolchain/gcc/patches/5.4.0/020-no-plt-backport.patch
index b9702c9520..b9702c9520 100644
--- a/toolchain/gcc/patches/5.3.0/020-no-plt-backport.patch
+++ b/toolchain/gcc/patches/5.4.0/020-no-plt-backport.patch
diff --git a/toolchain/gcc/patches/5.3.0/040-fix-mips-ICE-PR-68400.patch b/toolchain/gcc/patches/5.4.0/040-fix-mips-ICE-PR-68400.patch
index e88af34032..e88af34032 100644
--- a/toolchain/gcc/patches/5.3.0/040-fix-mips-ICE-PR-68400.patch
+++ b/toolchain/gcc/patches/5.4.0/040-fix-mips-ICE-PR-68400.patch
diff --git a/toolchain/gcc/patches/5.3.0/100-uclibc-conf.patch b/toolchain/gcc/patches/5.4.0/100-uclibc-conf.patch
index ff9ad94f62..ff9ad94f62 100644
--- a/toolchain/gcc/patches/5.3.0/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/5.4.0/100-uclibc-conf.patch
diff --git a/toolchain/gcc/patches/5.3.0/200-musl_config.patch b/toolchain/gcc/patches/5.4.0/200-musl_config.patch
index 836e9ab499..b9a5b28274 100644
--- a/toolchain/gcc/patches/5.3.0/200-musl_config.patch
+++ b/toolchain/gcc/patches/5.4.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
-@@ -27802,6 +27802,9 @@ if test "${gcc_cv_libc_provides_ssp+set}
+@@ -27833,6 +27833,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.
-@@ -27834,6 +27837,7 @@ fi
+@@ -27865,6 +27868,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"
-@@ -27930,6 +27934,9 @@ case "$target" in
+@@ -27961,6 +27965,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
-@@ -5282,6 +5282,9 @@ AC_CACHE_CHECK(__stack_chk_fail in targe
+@@ -5287,6 +5287,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.
-@@ -5308,6 +5311,7 @@ AC_CACHE_CHECK(__stack_chk_fail in targe
+@@ -5313,6 +5316,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],
-@@ -5381,6 +5385,9 @@ case "$target" in
+@@ -5386,6 +5390,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}
-@@ -15325,13 +15325,19 @@ These @samp{-m} options are defined for
+@@ -15340,13 +15340,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.3.0/201-musl_arm.patch b/toolchain/gcc/patches/5.4.0/201-musl_arm.patch
index 27a26afc05..27a26afc05 100644
--- a/toolchain/gcc/patches/5.3.0/201-musl_arm.patch
+++ b/toolchain/gcc/patches/5.4.0/201-musl_arm.patch
diff --git a/toolchain/gcc/patches/5.3.0/202-musl_mips.patch b/toolchain/gcc/patches/5.4.0/202-musl_mips.patch
index 816dd8d101..816dd8d101 100644
--- a/toolchain/gcc/patches/5.3.0/202-musl_mips.patch
+++ b/toolchain/gcc/patches/5.4.0/202-musl_mips.patch
diff --git a/toolchain/gcc/patches/5.3.0/203-musl_powerpc.patch b/toolchain/gcc/patches/5.4.0/203-musl_powerpc.patch
index b4f34e81ca..b4f34e81ca 100644
--- a/toolchain/gcc/patches/5.3.0/203-musl_powerpc.patch
+++ b/toolchain/gcc/patches/5.4.0/203-musl_powerpc.patch
diff --git a/toolchain/gcc/patches/5.3.0/204-musl_sh.patch b/toolchain/gcc/patches/5.4.0/204-musl_sh.patch
index 8c3753d530..8c3753d530 100644
--- a/toolchain/gcc/patches/5.3.0/204-musl_sh.patch
+++ b/toolchain/gcc/patches/5.4.0/204-musl_sh.patch
diff --git a/toolchain/gcc/patches/5.3.0/205-musl_x86.patch b/toolchain/gcc/patches/5.4.0/205-musl_x86.patch
index 8772328d64..8772328d64 100644
--- a/toolchain/gcc/patches/5.3.0/205-musl_x86.patch
+++ b/toolchain/gcc/patches/5.4.0/205-musl_x86.patch
diff --git a/toolchain/gcc/patches/5.3.0/206-musl_aarch64.patch b/toolchain/gcc/patches/5.4.0/206-musl_aarch64.patch
index 6925a026e7..6925a026e7 100644
--- a/toolchain/gcc/patches/5.3.0/206-musl_aarch64.patch
+++ b/toolchain/gcc/patches/5.4.0/206-musl_aarch64.patch
diff --git a/toolchain/gcc/patches/5.3.0/207-musl_fixincludes.patch b/toolchain/gcc/patches/5.4.0/207-musl_fixincludes.patch
index 0ff33d39d8..0ff33d39d8 100644
--- a/toolchain/gcc/patches/5.3.0/207-musl_fixincludes.patch
+++ b/toolchain/gcc/patches/5.4.0/207-musl_fixincludes.patch
diff --git a/toolchain/gcc/patches/5.3.0/209-musl_libstdc++.patch b/toolchain/gcc/patches/5.4.0/209-musl_libstdc++.patch
index d2414d0232..d2414d0232 100644
--- a/toolchain/gcc/patches/5.3.0/209-musl_libstdc++.patch
+++ b/toolchain/gcc/patches/5.4.0/209-musl_libstdc++.patch
diff --git a/toolchain/gcc/patches/5.3.0/230-musl_libssp.patch b/toolchain/gcc/patches/5.4.0/230-musl_libssp.patch
index 30f42e9f7c..30f42e9f7c 100644
--- a/toolchain/gcc/patches/5.3.0/230-musl_libssp.patch
+++ b/toolchain/gcc/patches/5.4.0/230-musl_libssp.patch
diff --git a/toolchain/gcc/patches/5.3.0/240-musl-libitm-fixes.patch b/toolchain/gcc/patches/5.4.0/240-musl-libitm-fixes.patch
index 533cb68499..533cb68499 100644
--- a/toolchain/gcc/patches/5.3.0/240-musl-libitm-fixes.patch
+++ b/toolchain/gcc/patches/5.4.0/240-musl-libitm-fixes.patch
diff --git a/toolchain/gcc/patches/5.3.0/250-add-musl.patch b/toolchain/gcc/patches/5.4.0/250-add-musl.patch
index 8cbeddea33..8cbeddea33 100644
--- a/toolchain/gcc/patches/5.3.0/250-add-musl.patch
+++ b/toolchain/gcc/patches/5.4.0/250-add-musl.patch
diff --git a/toolchain/gcc/patches/5.3.0/260-musl-add-unwind-fix.patch b/toolchain/gcc/patches/5.4.0/260-musl-add-unwind-fix.patch
index a3b83e2074..a3b83e2074 100644
--- a/toolchain/gcc/patches/5.3.0/260-musl-add-unwind-fix.patch
+++ b/toolchain/gcc/patches/5.4.0/260-musl-add-unwind-fix.patch
diff --git a/toolchain/gcc/patches/5.3.0/270-musl-add-powerpc-softfloat-fix.patch b/toolchain/gcc/patches/5.4.0/270-musl-add-powerpc-softfloat-fix.patch
index bdebf6c01f..bdebf6c01f 100644
--- a/toolchain/gcc/patches/5.3.0/270-musl-add-powerpc-softfloat-fix.patch
+++ b/toolchain/gcc/patches/5.4.0/270-musl-add-powerpc-softfloat-fix.patch
diff --git a/toolchain/gcc/patches/5.3.0/800-arm_v5te_no_ldrd_strd.patch b/toolchain/gcc/patches/5.4.0/800-arm_v5te_no_ldrd_strd.patch
index 0edeb13c75..0edeb13c75 100644
--- a/toolchain/gcc/patches/5.3.0/800-arm_v5te_no_ldrd_strd.patch
+++ b/toolchain/gcc/patches/5.4.0/800-arm_v5te_no_ldrd_strd.patch
diff --git a/toolchain/gcc/patches/5.3.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches/5.4.0/810-arm-softfloat-libgcc.patch
index 1d06f5b2ec..1d06f5b2ec 100644
--- a/toolchain/gcc/patches/5.3.0/810-arm-softfloat-libgcc.patch
+++ b/toolchain/gcc/patches/5.4.0/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/patches/5.3.0/820-libgcc_pic.patch b/toolchain/gcc/patches/5.4.0/820-libgcc_pic.patch
index 42bf0c8ccc..42bf0c8ccc 100644
--- a/toolchain/gcc/patches/5.3.0/820-libgcc_pic.patch
+++ b/toolchain/gcc/patches/5.4.0/820-libgcc_pic.patch
diff --git a/toolchain/gcc/patches/5.3.0/830-arm_unbreak_armv4t.patch b/toolchain/gcc/patches/5.4.0/830-arm_unbreak_armv4t.patch
index 37f8f2a54d..37f8f2a54d 100644
--- a/toolchain/gcc/patches/5.3.0/830-arm_unbreak_armv4t.patch
+++ b/toolchain/gcc/patches/5.4.0/830-arm_unbreak_armv4t.patch
diff --git a/toolchain/gcc/patches/5.3.0/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches/5.4.0/840-armv4_pass_fix-v4bx_to_ld.patch
index cb1fb98235..cb1fb98235 100644
--- a/toolchain/gcc/patches/5.3.0/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/toolchain/gcc/patches/5.4.0/840-armv4_pass_fix-v4bx_to_ld.patch
diff --git a/toolchain/gcc/patches/5.3.0/850-use_shared_libgcc.patch b/toolchain/gcc/patches/5.4.0/850-use_shared_libgcc.patch
index 5818cf4da0..5818cf4da0 100644
--- a/toolchain/gcc/patches/5.3.0/850-use_shared_libgcc.patch
+++ b/toolchain/gcc/patches/5.4.0/850-use_shared_libgcc.patch
diff --git a/toolchain/gcc/patches/5.3.0/851-libgcc_no_compat.patch b/toolchain/gcc/patches/5.4.0/851-libgcc_no_compat.patch
index 80c3476841..80c3476841 100644
--- a/toolchain/gcc/patches/5.3.0/851-libgcc_no_compat.patch
+++ b/toolchain/gcc/patches/5.4.0/851-libgcc_no_compat.patch
diff --git a/toolchain/gcc/patches/5.3.0/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches/5.4.0/870-ppc_no_crtsavres.patch
index ac561544b4..0e64a4164b 100644
--- a/toolchain/gcc/patches/5.3.0/870-ppc_no_crtsavres.patch
+++ b/toolchain/gcc/patches/5.4.0/870-ppc_no_crtsavres.patch
@@ -1,6 +1,6 @@
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
-@@ -21495,7 +21495,7 @@ rs6000_savres_strategy (rs6000_stack_t *
+@@ -21500,7 +21500,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.3.0/880-no_java_section.patch b/toolchain/gcc/patches/5.4.0/880-no_java_section.patch
index def6c9f4a0..def6c9f4a0 100644
--- a/toolchain/gcc/patches/5.3.0/880-no_java_section.patch
+++ b/toolchain/gcc/patches/5.4.0/880-no_java_section.patch
diff --git a/toolchain/gcc/patches/5.3.0/900-bad-mips16-crt.patch b/toolchain/gcc/patches/5.4.0/900-bad-mips16-crt.patch
index dd6e9dc889..dd6e9dc889 100644
--- a/toolchain/gcc/patches/5.3.0/900-bad-mips16-crt.patch
+++ b/toolchain/gcc/patches/5.4.0/900-bad-mips16-crt.patch
diff --git a/toolchain/gcc/patches/5.3.0/910-mbsd_multi.patch b/toolchain/gcc/patches/5.4.0/910-mbsd_multi.patch
index 667cd96050..32fc9da962 100644
--- a/toolchain/gcc/patches/5.3.0/910-mbsd_multi.patch
+++ b/toolchain/gcc/patches/5.4.0/910-mbsd_multi.patch
@@ -178,7 +178,7 @@
-Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol
-Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
-Wformat-security -Wformat-signedness -Wformat-y2k @gol
-@@ -5371,6 +5371,22 @@ This option is only supported for C and
+@@ -5382,6 +5382,22 @@ This option is only supported for C and
@option{-Wall} and by @option{-Wpedantic}, which can be disabled with
@option{-Wno-pointer-sign}.
@@ -201,7 +201,7 @@
@item -Wstack-protector
@opindex Wstack-protector
@opindex Wno-stack-protector
-@@ -7845,7 +7861,7 @@ so, the first branch is redirected to ei
+@@ -7860,7 +7876,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.3.0/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/5.4.0/920-specs_nonfatal_getenv.patch
index 3d708f24c3..3d708f24c3 100644
--- a/toolchain/gcc/patches/5.3.0/920-specs_nonfatal_getenv.patch
+++ b/toolchain/gcc/patches/5.4.0/920-specs_nonfatal_getenv.patch
diff --git a/toolchain/gcc/patches/5.3.0/930-fix-mips-noexecstack.patch b/toolchain/gcc/patches/5.4.0/930-fix-mips-noexecstack.patch
index c05844d2e4..c05844d2e4 100644
--- a/toolchain/gcc/patches/5.3.0/930-fix-mips-noexecstack.patch
+++ b/toolchain/gcc/patches/5.4.0/930-fix-mips-noexecstack.patch
diff --git a/toolchain/gcc/patches/5.3.0/940-no-clobber-stamp-bits.patch b/toolchain/gcc/patches/5.4.0/940-no-clobber-stamp-bits.patch
index a33ce24155..0b21ffaf09 100644
--- a/toolchain/gcc/patches/5.3.0/940-no-clobber-stamp-bits.patch
+++ b/toolchain/gcc/patches/5.4.0/940-no-clobber-stamp-bits.patch
@@ -1,6 +1,6 @@
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
-@@ -1420,7 +1420,7 @@ stamp-bits: ${bits_headers}
+@@ -1421,7 +1421,7 @@ stamp-bits: ${bits_headers}
@$(STAMP) stamp-bits
stamp-bits-sup: stamp-bits ${bits_sup_headers}
diff --git a/toolchain/gcc/patches/5.3.0/950-cpp_file_path_translation.patch b/toolchain/gcc/patches/5.4.0/950-cpp_file_path_translation.patch
index ca018ec7ad..dc0938ab63 100644
--- a/toolchain/gcc/patches/5.3.0/950-cpp_file_path_translation.patch
+++ b/toolchain/gcc/patches/5.4.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}.
-@@ -11464,6 +11464,12 @@ be searched for header files only for th
+@@ -11479,6 +11479,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}.