gcc: update to 5.4.0 as default

10 files changed, 0 insertions, 1642 deletions

diff --git a/package/gcc/patches/5.3.0/bfin-fix-gcc.patch b/package/gcc/patches/5.3.0/bfin-fix-gcc.patch
deleted file mode 100644
index a0643f5fc..000000000
--- a/package/gcc/patches/5.3.0/bfin-fix-gcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-4.9.3.orig/gcc/config.gcc gcc-4.9.3/gcc/config.gcc
---- gcc-4.9.3.orig/gcc/config.gcc	2015-05-21 22:50:59.000000000 +0200
-+++ gcc-4.9.3/gcc/config.gcc	2015-11-23 22:51:58.686375134 +0100
-@@ -1101,7 +1101,7 @@
- 	;;
- bfin*-linux-uclibc*)
- 	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h gnu-user.h linux.h glibc-stdint.h bfin/linux.h ./linux-sysroot-suffix.h"
--	tmake_file="bfin/t-bfin-linux t-slibgcc t-linux"
-+	tmake_file="${tmake_file} bfin/t-bfin-linux t-slibgcc t-linux"
- 	use_collect2=no
- 	;;
- bfin*-rtems*)
diff --git a/package/gcc/patches/5.3.0/cflags.patch b/package/gcc/patches/5.3.0/cflags.patch
deleted file mode 100644
index 7ebb5e548..000000000
--- a/package/gcc/patches/5.3.0/cflags.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff -Nur gcc-5.1.0.orig/gcc/c-family/c-opts.c gcc-5.1.0/gcc/c-family/c-opts.c
---- gcc-5.1.0.orig/gcc/c-family/c-opts.c	2015-02-13 06:26:37.000000000 +0100
-+++ gcc-5.1.0/gcc/c-family/c-opts.c	2015-05-01 23:07:27.000000000 +0200
-@@ -122,6 +122,9 @@
- /* Whether any standard preincluded header has been preincluded.  */
- static bool done_preinclude;
- 
-+/* Check if a port honours COPTS.  */
-+static int honour_copts = 0;
-+
- static void handle_OPT_d (const char *);
- static void set_std_cxx98 (int);
- static void set_std_cxx11 (int);
-@@ -449,6 +452,12 @@
-       flag_no_builtin = !value;
-       break;
- 
-+    case OPT_fhonour_copts:
-+      if (c_language == clk_c) {
-+        honour_copts++;
-+      }
-+      break;
-+
-     case OPT_fconstant_string_class_:
-       constant_string_class_name = arg;
-       break;
-@@ -1034,6 +1043,47 @@
-       return false;
-     }
- 
-+  if (c_language == clk_c) {
-+    char *ev = getenv ("GCC_HONOUR_COPTS");
-+    int evv;
-+    if (ev == NULL)
-+      evv = -1;
-+    else if ((*ev == '0') || (*ev == '\0'))
-+      evv = 0;
-+    else if (*ev == '1')
-+      evv = 1;
-+    else if (*ev == '2')
-+      evv = 2;
-+    else if (*ev == 's')
-+      evv = -1;
-+    else {
-+      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
-+      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
-+    }
-+    if (evv == 1) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in lenient mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        warning (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+      }
-+    } else if (evv == 2) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in strict mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        error ("someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+        return false;
-+      }
-+    } else if (evv == 0) {
-+      if (honour_copts != 1)
-+        inform (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+    }
-+  }
-+
-   return true;
- }
- 
-diff -Nur gcc-5.1.0.orig/gcc/c-family/c.opt gcc-5.1.0/gcc/c-family/c.opt
---- gcc-5.1.0.orig/gcc/c-family/c.opt	2015-03-27 11:29:04.000000000 +0100
-+++ gcc-5.1.0/gcc/c-family/c.opt	2015-05-01 23:07:27.000000000 +0200
-@@ -431,6 +431,10 @@
- C ObjC C++ ObjC++ Var(warn_float_conversion) LangEnabledBy(C ObjC C++ ObjC++,Wconversion)
- Warn for implicit type conversions that cause loss of floating point precision
- 
-+Werror-maybe-reset
-+C ObjC C++ ObjC++
-+; Documented in common.opt
-+
- Wfloat-equal
- C ObjC C++ ObjC++ Var(warn_float_equal) Warning
- Warn if testing floating point numbers for equality
-@@ -1161,6 +1165,9 @@
- fhonor-std
- C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
- 
-+fhonour-copts
-+C ObjC C++ ObjC++ RejectNegative
-+
- fhosted
- C ObjC
- Assume normal C execution environment
-diff -Nur gcc-5.1.0.orig/gcc/common.opt gcc-5.1.0/gcc/common.opt
---- gcc-5.1.0.orig/gcc/common.opt	2015-02-27 03:06:48.000000000 +0100
-+++ gcc-5.1.0/gcc/common.opt	2015-05-01 23:07:27.000000000 +0200
-@@ -561,6 +561,10 @@
- Common Joined
- Treat specified warning as error
- 
-+Werror-maybe-reset
-+Common
-+If environment variable GCC_NO_WERROR is set, act as -Wno-error
-+
- Wextra
- Common Var(extra_warnings) Warning
- Print extra (possibly unwanted) warnings
-@@ -1357,6 +1361,9 @@
- Common Report Var(flag_guess_branch_prob) Optimization
- Enable guessing of branch probabilities
- 
-+fhonour-copts
-+Common RejectNegative
-+
- ; Nonzero means ignore `#ident' directives.  0 means handle them.
- ; Generate position-independent code for executables if possible
- ; On SVR4 targets, it also controls whether or not to emit a
-diff -Nur gcc-5.1.0.orig/gcc/doc/cppopts.texi gcc-5.1.0/gcc/doc/cppopts.texi
---- gcc-5.1.0.orig/gcc/doc/cppopts.texi	2015-03-23 02:12:06.000000000 +0100
-+++ gcc-5.1.0/gcc/doc/cppopts.texi	2015-05-01 23:07:27.000000000 +0200
-@@ -163,6 +163,11 @@
- Make all warnings into hard errors.  Source code which triggers warnings
- will be rejected.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
- @item -Wsystem-headers
- @opindex Wsystem-headers
- Issue warnings for code in system headers.  These are normally unhelpful
-diff -Nur gcc-5.1.0.orig/gcc/doc/invoke.texi gcc-5.1.0/gcc/doc/invoke.texi
---- gcc-5.1.0.orig/gcc/doc/invoke.texi	2015-04-12 21:29:44.000000000 +0200
-+++ gcc-5.1.0/gcc/doc/invoke.texi	2015-05-01 23:07:27.000000000 +0200
-@@ -251,7 +251,7 @@
- -Wdisabled-optimization @gol
- -Wno-discarded-qualifiers -Wno-discarded-array-qualifiers @gol
- -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
---Wno-endif-labels -Werror  -Werror=* @gol
-+-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
- -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
-@@ -5370,6 +5370,22 @@
- @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
- @option{-Wno-pointer-sign}.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
-+ at item -fhonour-copts
-+ at opindex fhonour-copts
-+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
-+given at least once, and warn if it is given more than once.
-+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
-+given exactly once.
-+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
-+is not given exactly once.
-+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
-+This flag and environment variable only affect the C language.
-+
- @item -Wstack-protector
- @opindex Wstack-protector
- @opindex Wno-stack-protector
-@@ -7843,7 +7859,7 @@
- second branch or a point immediately following it, depending on whether
- the condition is known to be true or false.
- 
--Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
-+Enabled at levels @option{-O3}.
- 
- @item -fsplit-wide-types
- @opindex fsplit-wide-types
-diff -Nur gcc-5.1.0.orig/gcc/java/jvspec.c gcc-5.1.0/gcc/java/jvspec.c
---- gcc-5.1.0.orig/gcc/java/jvspec.c	2015-01-30 17:15:00.000000000 +0100
-+++ gcc-5.1.0/gcc/java/jvspec.c	2015-05-01 23:07:27.000000000 +0200
-@@ -629,6 +629,7 @@
-      class name.  Append dummy `.c' that can be stripped by set_input so %b
-      is correct.  */ 
-   set_input (concat (main_class_name, "main.c", NULL));
-+  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
-   err = do_spec (jvgenmain_spec);
-   if (err == 0)
-     {
-diff -Nur gcc-5.1.0.orig/gcc/opts.c gcc-5.1.0/gcc/opts.c
---- gcc-5.1.0.orig/gcc/opts.c	2015-02-17 22:25:56.000000000 +0100
-+++ gcc-5.1.0/gcc/opts.c	2015-05-01 23:07:27.000000000 +0200
-@@ -511,6 +511,8 @@
-     { OPT_LEVELS_2_PLUS, OPT_flra_remat, NULL, 1 },
- 
-     /* -O3 optimizations.  */
-+    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
-+    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
-     /* Inlining of functions reducing size is a good idea with -Os
-@@ -1699,6 +1701,17 @@
- 			       opts, opts_set, loc, dc);
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      {
-+        char *ev = getenv ("GCC_NO_WERROR");
-+        if ((ev != NULL) && (*ev != '0'))
-+          warnings_are_errors = 0;
-+      }
-+      break;
-+
-+    case OPT_fhonour_copts:
-+      break;
-+
-     case OPT_Wlarger_than_:
-       opts->x_larger_than_size = value;
-       opts->x_warn_larger_than = value != -1;
diff --git a/package/gcc/patches/5.3.0/disable-dwarf.bfin b/package/gcc/patches/5.3.0/disable-dwarf.bfin
deleted file mode 100644
index c11baec92..000000000
--- a/package/gcc/patches/5.3.0/disable-dwarf.bfin
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-git.orig/libgcc/config.host gcc-git/libgcc/config.host
---- gcc-git.orig/libgcc/config.host	2015-10-23 21:12:52.000000000 +0200
-+++ gcc-git/libgcc/config.host	2015-11-15 21:17:38.385745887 +0100
-@@ -231,7 +231,7 @@
-   esac
-   ;;
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
--  tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
-+  tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
-   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-   if test x$enable_vtable_verify = xyes; then
-     extra_parts="$extra_parts vtv_start.o vtv_end.o vtv_start_preinit.o vtv_end_preinit.o"
diff --git a/package/gcc/patches/5.3.0/fix-m86k-libgcc.patch b/package/gcc/patches/5.3.0/fix-m86k-libgcc.patch
deleted file mode 100644
index e8481d549..000000000
--- a/package/gcc/patches/5.3.0/fix-m86k-libgcc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c
---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c	2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c	2015-11-29 14:42:10.566143595 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/package/gcc/patches/5.3.0/gcc.musl b/package/gcc/patches/5.3.0/gcc.musl
deleted file mode 100644
index 1b47664f0..000000000
--- a/package/gcc/patches/5.3.0/gcc.musl
+++ /dev/null
@@ -1,631 +0,0 @@
-diff -Nur gcc-5.3.0.orig/fixincludes/mkfixinc.sh gcc-5.3.0/fixincludes/mkfixinc.sh
---- gcc-5.3.0.orig/fixincludes/mkfixinc.sh	2012-10-28 22:42:48.000000000 +0100
-+++ gcc-5.3.0/fixincludes/mkfixinc.sh	2015-12-08 05:53:22.243521385 +0100
-@@ -19,7 +19,8 @@
-     powerpc-*-eabi*    | \
-     powerpc-*-rtems*   | \
-     powerpcle-*-eabisim* | \
--    powerpcle-*-eabi* )
-+    powerpcle-*-eabi* | \
-+    *-musl* )
- 	#  IF there is no include fixing,
- 	#  THEN create a no-op fixer and exit
- 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-diff -Nur gcc-5.3.0.orig/gcc/config/aarch64/aarch64-linux.h gcc-5.3.0/gcc/config/aarch64/aarch64-linux.h
---- gcc-5.3.0.orig/gcc/config/aarch64/aarch64-linux.h	2015-07-24 18:00:26.000000000 +0200
-+++ gcc-5.3.0/gcc/config/aarch64/aarch64-linux.h	2015-12-08 05:53:22.243521385 +0100
-@@ -29,6 +29,8 @@
- #undef  CC1_SPEC
- #define CC1_SPEC GNU_USER_TARGET_CC1_SPEC ASAN_CC1_SPEC
- 
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
-+
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
-diff -Nur gcc-5.3.0.orig/gcc/config/arm/linux-eabi.h gcc-5.3.0/gcc/config/arm/linux-eabi.h
---- gcc-5.3.0.orig/gcc/config/arm/linux-eabi.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/arm/linux-eabi.h	2015-12-08 05:53:22.243521385 +0100
-@@ -77,6 +77,23 @@
-     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
-     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
- 
-+/* For ARM musl currently supports four dynamic linkers:
-+   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
-+   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
-+   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
-+   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
-+   musl does not support the legacy OABI mode.
-+   All the dynamic linkers live in /lib.
-+   We default to soft-float, EL. */
-+#undef  MUSL_DYNAMIC_LINKER
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER \
-+  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
-diff -Nur gcc-5.3.0.orig/gcc/config/i386/linux64.h gcc-5.3.0/gcc/config/i386/linux64.h
---- gcc-5.3.0.orig/gcc/config/i386/linux64.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/i386/linux64.h	2015-12-08 05:53:22.243521385 +0100
-@@ -30,3 +30,7 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-diff -Nur gcc-5.3.0.orig/gcc/config/i386/linux.h gcc-5.3.0/gcc/config/i386/linux.h
---- gcc-5.3.0.orig/gcc/config/i386/linux.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/i386/linux.h	2015-12-08 05:53:22.243521385 +0100
-@@ -21,3 +21,4 @@
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-diff -Nur gcc-5.3.0.orig/gcc/config/linux.h gcc-5.3.0/gcc/config/linux.h
---- gcc-5.3.0.orig/gcc/config/linux.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/linux.h	2015-12-08 05:53:22.243521385 +0100
-@@ -32,10 +32,12 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
-@@ -53,18 +55,21 @@
-    uClibc or Bionic is the default C library and whether
-    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
- 
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
--  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
-+  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
- 
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -84,21 +89,92 @@
- 
- #define GNU_USER_DYNAMIC_LINKER						\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
--			 BIONIC_DYNAMIC_LINKER)
-+			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
--			 BIONIC_DYNAMIC_LINKER32)
-+			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
--			 BIONIC_DYNAMIC_LINKER64)
-+			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
--			 BIONIC_DYNAMIC_LINKERX32)
-+			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
- 
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
- 
-+/* musl avoids problematic includes by rearranging the include directories.
-+ * Unfortunately, this is mostly duplicated from cppdefault.c */
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define INCLUDE_DEFAULTS_MUSL_GPP			\
-+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
-+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
-+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
-+
-+#ifdef LOCAL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL
-+#endif
-+
-+#ifdef PREFIX_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX
-+#endif
-+
-+#ifdef CROSS_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_CROSS			\
-+    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#ifdef TOOL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_TOOL			\
-+    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_TOOL
-+#endif
-+
-+#ifdef NATIVE_SYSTEM_HEADER_DIR
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#endif
-+
-+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-+# undef INCLUDE_DEFAULTS_MUSL_LOCAL
-+# define INCLUDE_DEFAULTS_MUSL_LOCAL
-+# undef INCLUDE_DEFAULTS_MUSL_NATIVE
-+# define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#else
-+# undef INCLUDE_DEFAULTS_MUSL_CROSS
-+# define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#undef INCLUDE_DEFAULTS
-+#define INCLUDE_DEFAULTS				\
-+  {							\
-+    INCLUDE_DEFAULTS_MUSL_GPP				\
-+    INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    INCLUDE_DEFAULTS_MUSL_CROSS				\
-+    INCLUDE_DEFAULTS_MUSL_TOOL				\
-+    INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
-+    { 0, 0, 0, 0, 0, 0 }				\
-+  }
-+#endif
-+
- #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
- /* This is a *uclinux* target.  We don't define below macros to normal linux
-    versions, because doing so would require *uclinux* targets to include
-diff -Nur gcc-5.3.0.orig/gcc/config/linux.opt gcc-5.3.0/gcc/config/linux.opt
---- gcc-5.3.0.orig/gcc/config/linux.opt	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/linux.opt	2015-12-08 05:53:22.243521385 +0100
-@@ -30,3 +30,7 @@
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
-+Use musl C library
-diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h
---- gcc-5.3.0.orig/gcc/config/microblaze/linux.h	2015-05-28 16:08:19.000000000 +0200
-+++ gcc-5.3.0/gcc/config/microblaze/linux.h	2015-12-08 05:53:22.243521385 +0100
-@@ -28,7 +28,22 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define DYNAMIC_LINKER "/lib/ld.so.1"
-+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
-+#else
-+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
-+#endif
-+
-+
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-   { "dynamic_linker", DYNAMIC_LINKER }
-diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/microblaze.h gcc-5.3.0/gcc/config/microblaze/microblaze.h
---- gcc-5.3.0.orig/gcc/config/microblaze/microblaze.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/microblaze/microblaze.h	2015-12-08 05:53:22.243521385 +0100
-@@ -218,6 +218,12 @@
- #undef PTRDIFF_TYPE
- #define PTRDIFF_TYPE "int"
- 
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
- #define CONSTANT_ALIGNMENT(EXP, ALIGN)					\
-   ((TREE_CODE (EXP) == STRING_CST  || TREE_CODE (EXP) == CONSTRUCTOR)	\
-    && (ALIGN) < BITS_PER_WORD						\
-diff -Nur gcc-5.3.0.orig/gcc/config/mips/linux.h gcc-5.3.0/gcc/config/mips/linux.h
---- gcc-5.3.0.orig/gcc/config/mips/linux.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/mips/linux.h	2015-12-08 05:53:22.243521385 +0100
-@@ -31,13 +31,26 @@
- #undef UCLIBC_DYNAMIC_LINKER32
- #define UCLIBC_DYNAMIC_LINKER32 \
-   "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
-+
-+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
- #undef UCLIBC_DYNAMIC_LINKER64
- #define UCLIBC_DYNAMIC_LINKER64 \
-   "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
- #define UCLIBC_DYNAMIC_LINKERN32 \
-   "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
- 
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1"
-+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1"
-+
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--                         BIONIC_DYNAMIC_LINKERN32)
-+                         BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
-diff -Nur gcc-5.3.0.orig/gcc/config/rs6000/linux64.h gcc-5.3.0/gcc/config/rs6000/linux64.h
---- gcc-5.3.0.orig/gcc/config/rs6000/linux64.h	2015-03-10 00:18:57.000000000 +0100
-+++ gcc-5.3.0/gcc/config/rs6000/linux64.h	2015-12-08 05:53:22.243521385 +0100
-@@ -365,17 +365,21 @@
- #endif
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- 
- #undef  DEFAULT_ASM_ENDIAN
- #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-diff -Nur gcc-5.3.0.orig/gcc/config/rs6000/secureplt.h gcc-5.3.0/gcc/config/rs6000/secureplt.h
---- gcc-5.3.0.orig/gcc/config/rs6000/secureplt.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/rs6000/secureplt.h	2015-12-08 05:53:22.243521385 +0100
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-diff -Nur gcc-5.3.0.orig/gcc/config/rs6000/sysv4.h gcc-5.3.0/gcc/config/rs6000/sysv4.h
---- gcc-5.3.0.orig/gcc/config/rs6000/sysv4.h	2015-09-24 15:46:45.000000000 +0200
-+++ gcc-5.3.0/gcc/config/rs6000/sysv4.h	2015-12-08 05:53:22.243521385 +0100
-@@ -537,6 +537,9 @@
- #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
- #define CC1_SECURE_PLT_DEFAULT_SPEC ""
- #endif
-+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
-+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
-+#endif
- 
- /* Pass -G xxx to the compiler.  */
- #undef CC1_SPEC
-@@ -759,15 +762,18 @@
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- 
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-@@ -889,6 +895,7 @@
-   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
-   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
-   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
-+  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
-   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
-   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
-   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-diff -Nur gcc-5.3.0.orig/gcc/config/sh/linux.h gcc-5.3.0/gcc/config/sh/linux.h
---- gcc-5.3.0.orig/gcc/config/sh/linux.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/config/sh/linux.h	2015-12-08 05:53:22.243521385 +0100
-@@ -43,7 +43,14 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
-+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
-+#define MUSL_DYNAMIC_LINKER_E "eb"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E
-+#endif
-+
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-diff -Nur gcc-5.3.0.orig/gcc/config.gcc gcc-5.3.0/gcc/config.gcc
---- gcc-5.3.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.3.0/gcc/config.gcc	2015-12-08 05:53:22.247521539 +0100
-@@ -575,7 +575,7 @@
- esac
- 
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
- 
- # 32-bit x86 processors supported by --with-arch=.  Each processor
- # MUST be separated by exactly one space.
-@@ -720,6 +720,9 @@
-     *-*-*uclibc*)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
-       ;;
-+    *-*-*musl*)
-+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+      ;;
-     *)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
-       ;;
-@@ -2413,6 +2416,10 @@
- 	    powerpc*-*-linux*paired*)
- 		tm_file="${tm_file} rs6000/750cl.h" ;;
- 	esac
-+        case ${target} in
-+            *-linux*-musl*)
-+                enable_secureplt=yes ;;
-+        esac
- 	if test x${enable_secureplt} = xyes; then
- 		tm_file="rs6000/secureplt.h ${tm_file}"
- 	fi
-diff -Nur gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-11-19 14:32:10.000000000 +0100
-+++ gcc-5.3.0/gcc/configure	2015-12-08 05:53:22.251521693 +0100
-@@ -27802,6 +27802,9 @@
- else
-   gcc_cv_libc_provides_ssp=no
-     case "$target" in
-+       *-*-musl*)
-+         # All versions of musl provide stack protector
-+	 gcc_cv_libc_provides_ssp=yes;;
-        *-*-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 @@
- 	 # <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.
-+	 # All supported versions of musl provide it as well
- 	 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 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- 
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-diff -Nur gcc-5.3.0.orig/gcc/configure.ac gcc-5.3.0/gcc/configure.ac
---- gcc-5.3.0.orig/gcc/configure.ac	2015-11-19 14:32:10.000000000 +0100
-+++ gcc-5.3.0/gcc/configure.ac	2015-12-08 05:53:22.255521847 +0100
-@@ -5282,6 +5282,9 @@
-       gcc_cv_libc_provides_ssp,
-       [gcc_cv_libc_provides_ssp=no
-     case "$target" in
-+       *-*-musl*)
-+         # All versions of musl provide stack protector
-+	 gcc_cv_libc_provides_ssp=yes;;
-        *-*-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 @@
- 	 # <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.
-+	 # All supported versions of musl provide it as well
- 	 gcc_cv_libc_provides_ssp=yes;;
-        *-*-darwin* | *-*-freebsd*)
- 	 AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
-@@ -5381,6 +5385,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-diff -Nur gcc-5.3.0.orig/gcc/gcc.c gcc-5.3.0/gcc/gcc.c
---- gcc-5.3.0.orig/gcc/gcc.c	2015-03-10 10:37:41.000000000 +0100
-+++ gcc-5.3.0/gcc/gcc.c	2015-12-08 05:53:22.255521847 +0100
-@@ -729,7 +729,7 @@
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
--		       "|fstack-protector-strong|fstack-protector-explicit:}"
-+		       "|fstack-protector-strong|fstack-protector-explicit:-lssp_nonshared}"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit" \
-diff -Nur gcc-5.3.0.orig/gcc/ginclude/stddef.h gcc-5.3.0/gcc/ginclude/stddef.h
---- gcc-5.3.0.orig/gcc/ginclude/stddef.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/gcc/ginclude/stddef.h	2015-12-08 05:53:22.255521847 +0100
-@@ -184,6 +184,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__	/* BeOS */
- #define __SIZE_T__	/* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -200,6 +201,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
-   || defined(__DragonFly__) \
-   || defined(__FreeBSD_kernel__)
-@@ -218,6 +220,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
-diff -Nur gcc-5.3.0.orig/libgcc/unwind-dw2-fde-dip.c gcc-5.3.0/libgcc/unwind-dw2-fde-dip.c
---- gcc-5.3.0.orig/libgcc/unwind-dw2-fde-dip.c	2015-01-27 11:02:26.000000000 +0100
-+++ gcc-5.3.0/libgcc/unwind-dw2-fde-dip.c	2015-12-08 05:53:22.255521847 +0100
-@@ -46,6 +46,10 @@
- #include "unwind-compat.h"
- #include "gthr.h"
- 
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
-+# define USE_PT_GNU_EH_FRAME
-+#endif
-+
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
- 	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-diff -Nur gcc-5.3.0.orig/libgomp/config/posix/time.c gcc-5.3.0/libgomp/config/posix/time.c
---- gcc-5.3.0.orig/libgomp/config/posix/time.c	2015-01-10 20:10:37.000000000 +0100
-+++ gcc-5.3.0/libgomp/config/posix/time.c	2015-12-08 05:53:22.255521847 +0100
-@@ -29,6 +29,8 @@
-    The following implementation uses the most simple POSIX routines.
-    If present, POSIX 4 clocks should be used instead.  */
- 
-+#define _POSIX_C_SOURCE 199309L /* for clocks */
-+
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
-diff -Nur gcc-5.3.0.orig/libitm/config/arm/hwcap.cc gcc-5.3.0/libitm/config/arm/hwcap.cc
---- gcc-5.3.0.orig/libitm/config/arm/hwcap.cc	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libitm/config/arm/hwcap.cc	2015-12-08 05:53:22.255521847 +0100
-@@ -40,7 +40,11 @@
- 
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
- 
- static void __attribute__((constructor))
-diff -Nur gcc-5.3.0.orig/libitm/config/linux/x86/tls.h gcc-5.3.0/libitm/config/linux/x86/tls.h
---- gcc-5.3.0.orig/libitm/config/linux/x86/tls.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libitm/config/linux/x86/tls.h	2015-12-08 05:53:22.255521847 +0100
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
-    GLIBC has reserved words 10 through 13 for TM.  */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
- 
- #include "config/generic/tls.h"
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
- 
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@
- 
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
- 
- #endif // LIBITM_X86_TLS_H
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/configure.host gcc-5.3.0/libstdc++-v3/configure.host
---- gcc-5.3.0.orig/libstdc++-v3/configure.host	2015-06-24 11:59:28.000000000 +0200
-+++ gcc-5.3.0/libstdc++-v3/configure.host	2015-12-08 05:53:22.255521847 +0100
-@@ -274,6 +274,13 @@
-     os_include_dir="os/bsd/freebsd"
-     ;;
-   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-+    # check for musl by target
-+    case "${host_os}" in
-+      *-musl*)
-+        os_include_dir="os/generic"
-+        ;;
-+      *)
-+
-     if [ "$uclibc" = "yes" ]; then
-       os_include_dir="os/uclibc"
-     elif [ "$bionic" = "yes" ]; then
-@@ -282,6 +289,9 @@
-       os_include_dir="os/gnu-linux"
-     fi
-     ;;
-+
-+    esac
-+    ;;
-   hpux*)
-     os_include_dir="os/hpux"
-     ;;
diff --git a/package/gcc/patches/5.3.0/ia64-fix-libgcc.patch b/package/gcc/patches/5.3.0/ia64-fix-libgcc.patch
deleted file mode 100644
index cdbbd6000..000000000
--- a/package/gcc/patches/5.3.0/ia64-fix-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur gcc-4.9.3.orig/libgcc/config/ia64/fde-glibc.c gcc-4.9.3/libgcc/config/ia64/fde-glibc.c
---- gcc-4.9.3.orig/libgcc/config/ia64/fde-glibc.c	2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/config/ia64/fde-glibc.c	2015-12-01 07:06:43.963906167 +0100
-@@ -25,6 +25,8 @@
- /* Locate the FDE entry for a given address, using glibc ld.so routines
-    to avoid register/deregister calls at DSO load/unload.  */
- 
-+#ifndef inhibit_libc
-+
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
-@@ -159,3 +161,4 @@
- 
-   return data.ret;
- }
-+#endif
-diff -Nur gcc-4.9.3.orig/libgcc/unwind-generic.h gcc-4.9.3/libgcc/unwind-generic.h
---- gcc-4.9.3.orig/libgcc/unwind-generic.h	2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/unwind-generic.h	2015-12-01 07:00:15.731287428 +0100
-@@ -221,7 +221,9 @@
-    compatible with the standard ABI for IA-64, we inline these.  */
- 
- #ifdef __ia64__
-+#ifndef inhibit_libc
- #include <stdlib.h>
-+#endif
- 
- static inline _Unwind_Ptr
- _Unwind_GetDataRelBase (struct _Unwind_Context *_C)
diff --git a/package/gcc/patches/5.3.0/libstdcxx-uclibc-c99.patch b/package/gcc/patches/5.3.0/libstdcxx-uclibc-c99.patch
deleted file mode 100644
index fcf2af8d5..000000000
--- a/package/gcc/patches/5.3.0/libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-5.3.0/libstdc++-v3/config/locale/generic/c_locale.h
---- gcc-5.3.0.orig/libstdc++-v3/config/locale/generic/c_locale.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/config/locale/generic/c_locale.h	2015-12-06 09:10:01.383992311 +0100
-@@ -70,7 +70,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-5.3.0/libstdc++-v3/config/locale/gnu/c_locale.h
---- gcc-5.3.0.orig/libstdc++-v3/config/locale/gnu/c_locale.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/config/locale/gnu/c_locale.h	2015-12-06 09:10:01.383992311 +0100
-@@ -88,7 +88,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/bits/basic_string.h gcc-5.3.0/libstdc++-v3/include/bits/basic_string.h
---- gcc-5.3.0.orig/libstdc++-v3/include/bits/basic_string.h	2015-11-25 17:11:33.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/bits/basic_string.h	2015-12-06 09:10:01.383992311 +0100
-@@ -5246,7 +5246,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
-+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))
- 
- #include <ext/string_conversions.h>
- 
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/bits/locale_facets_nonio.tcc gcc-5.3.0/libstdc++-v3/include/bits/locale_facets_nonio.tcc
---- gcc-5.3.0.orig/libstdc++-v3/include/bits/locale_facets_nonio.tcc	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/bits/locale_facets_nonio.tcc	2015-12-06 09:10:01.383992311 +0100
-@@ -578,7 +578,7 @@
-     {
-       const locale __loc = __io.getloc();
-       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       // First try a buffer perhaps big enough.
-       int __cs_size = 64;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/bits/locale_facets.tcc gcc-5.3.0/libstdc++-v3/include/bits/locale_facets.tcc
---- gcc-5.3.0.orig/libstdc++-v3/include/bits/locale_facets.tcc	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/bits/locale_facets.tcc	2015-12-06 09:10:32.189186155 +0100
-@@ -992,7 +992,7 @@
- 	char __fbuf[16];
- 	__num_base::_S_format_float(__io, __fbuf, __mod);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 	// Precision is always used except for hexfloat format.
- 	const bool __use_prec =
- 	  (__io.flags() & ios_base::floatfield) != ios_base::floatfield;
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/c_compatibility/math.h gcc-5.3.0/libstdc++-v3/include/c_compatibility/math.h
---- gcc-5.3.0.orig/libstdc++-v3/include/c_compatibility/math.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/c_compatibility/math.h	2015-12-06 09:10:01.383992311 +0100
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/c_compatibility/wchar.h gcc-5.3.0/libstdc++-v3/include/c_compatibility/wchar.h
---- gcc-5.3.0.orig/libstdc++-v3/include/c_compatibility/wchar.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/c_compatibility/wchar.h	2015-12-06 09:10:01.383992311 +0100
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/c_global/cstdio gcc-5.3.0/libstdc++-v3/include/c_global/cstdio
---- gcc-5.3.0.orig/libstdc++-v3/include/c_global/cstdio	2015-02-01 16:11:08.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/c_global/cstdio	2015-12-06 09:10:01.383992311 +0100
-@@ -146,7 +146,7 @@
-   using ::vsprintf;
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/c_global/cstdlib gcc-5.3.0/libstdc++-v3/include/c_global/cstdlib
---- gcc-5.3.0.orig/libstdc++-v3/include/c_global/cstdlib	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/c_global/cstdlib	2015-12-06 09:10:01.383992311 +0100
-@@ -195,7 +195,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/c_global/cwchar gcc-5.3.0/libstdc++-v3/include/c_global/cwchar
---- gcc-5.3.0.orig/libstdc++-v3/include/c_global/cwchar	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/c_global/cwchar	2015-12-06 09:10:01.383992311 +0100
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/c_std/cstdio gcc-5.3.0/libstdc++-v3/include/c_std/cstdio
---- gcc-5.3.0.orig/libstdc++-v3/include/c_std/cstdio	2015-02-01 16:11:08.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/c_std/cstdio	2015-12-06 09:10:01.383992311 +0100
-@@ -144,7 +144,7 @@
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/c_std/cstdlib gcc-5.3.0/libstdc++-v3/include/c_std/cstdlib
---- gcc-5.3.0.orig/libstdc++-v3/include/c_std/cstdlib	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/c_std/cstdlib	2015-12-06 09:10:01.383992311 +0100
-@@ -192,7 +192,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/c_std/cwchar gcc-5.3.0/libstdc++-v3/include/c_std/cwchar
---- gcc-5.3.0.orig/libstdc++-v3/include/c_std/cwchar	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/c_std/cwchar	2015-12-06 09:10:01.383992311 +0100
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/ext/vstring.h gcc-5.3.0/libstdc++-v3/include/ext/vstring.h
---- gcc-5.3.0.orig/libstdc++-v3/include/ext/vstring.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/ext/vstring.h	2015-12-06 09:10:01.387992466 +0100
-@@ -2680,7 +2680,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
- 
- #include <ext/string_conversions.h>
- 
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/tr1/cstdio gcc-5.3.0/libstdc++-v3/include/tr1/cstdio
---- gcc-5.3.0.orig/libstdc++-v3/include/tr1/cstdio	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/tr1/cstdio	2015-12-06 09:10:01.395992777 +0100
-@@ -33,7 +33,7 @@
- 
- #include <cstdio>
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/tr1/cstdlib gcc-5.3.0/libstdc++-v3/include/tr1/cstdlib
---- gcc-5.3.0.orig/libstdc++-v3/include/tr1/cstdlib	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/tr1/cstdlib	2015-12-06 09:10:01.395992777 +0100
-@@ -35,7 +35,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/tr1/cwchar gcc-5.3.0/libstdc++-v3/include/tr1/cwchar
---- gcc-5.3.0.orig/libstdc++-v3/include/tr1/cwchar	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/tr1/cwchar	2015-12-06 09:10:01.395992777 +0100
-@@ -52,7 +52,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/include/tr1/stdlib.h gcc-5.3.0/libstdc++-v3/include/tr1/stdlib.h
---- gcc-5.3.0.orig/libstdc++-v3/include/tr1/stdlib.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/include/tr1/stdlib.h	2015-12-06 09:10:01.395992777 +0100
-@@ -33,7 +33,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- using std::tr1::atoll;
- using std::tr1::strtoll;
-diff -Nur gcc-5.3.0.orig/libstdc++-v3/src/c++11/debug.cc gcc-5.3.0/libstdc++-v3/src/c++11/debug.cc
---- gcc-5.3.0.orig/libstdc++-v3/src/c++11/debug.cc	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libstdc++-v3/src/c++11/debug.cc	2015-12-06 09:10:01.395992777 +0100
-@@ -788,7 +788,7 @@
- 				     int __n __attribute__ ((__unused__)), 
- 				     const char* __fmt, _Tp __s) const throw ()
-     {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       std::snprintf(__buf, __n, __fmt, __s);
- #else
-       std::sprintf(__buf, __fmt, __s);
diff --git a/package/gcc/patches/5.3.0/m68k-disable-atomic-uclinux.patch b/package/gcc/patches/5.3.0/m68k-disable-atomic-uclinux.patch
deleted file mode 100644
index 4ab553218..000000000
--- a/package/gcc/patches/5.3.0/m68k-disable-atomic-uclinux.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-4.8.3.orig/libgcc/config.host gcc-4.8.3/libgcc/config.host
---- gcc-4.8.3.orig/libgcc/config.host	2014-03-20 17:12:30.000000000 +0100
-+++ gcc-4.8.3/libgcc/config.host	2014-07-26 13:15:06.359463368 +0200
-@@ -689,7 +689,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/package/gcc/patches/5.3.0/tile-fix-libgcc.patch b/package/gcc/patches/5.3.0/tile-fix-libgcc.patch
deleted file mode 100644
index 07aa97200..000000000
--- a/package/gcc/patches/5.3.0/tile-fix-libgcc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nur gcc-5.2.0.orig/gcc/config/tilegx/linux.h gcc-5.2.0/gcc/config/tilegx/linux.h
---- gcc-5.2.0.orig/gcc/config/tilegx/linux.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.2.0/gcc/config/tilegx/linux.h	2015-12-02 15:13:59.563521746 +0100
-@@ -55,8 +55,6 @@
- /* For __clear_cache in libgcc2.c.  */
- #ifdef IN_LIBGCC2
- 
--#include <arch/icache.h>
--
- /* Use the minimum page size of 4K.  Alternatively we can call
-    getpagesize() but it introduces a libc dependence.  */
- #undef CLEAR_INSN_CACHE
-diff -Nur gcc-5.2.0.orig/libgcc/config/tilepro/atomic.h gcc-5.2.0/libgcc/config/tilepro/atomic.h
---- gcc-5.2.0.orig/libgcc/config/tilepro/atomic.h	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.2.0/libgcc/config/tilepro/atomic.h	2015-12-02 15:41:08.868942210 +0100
-@@ -46,6 +46,11 @@
-    The "exchange" and "compare and exchange" macros may also take
-    pointer values.  We use the pseudo-type "VAL" in the documentation
-    to indicate the use of an appropriate type.  */
-+
-+#ifndef SPR_CMPEXCH_VALUE
-+#define SPR_CMPEXCH_VALUE 0x2780
-+#endif
-+
- #else
- /* Atomic instruction macros
- 
-@@ -92,13 +97,6 @@
-    compare-and-exchange routine, so may be potentially less efficient.  */
- #endif
- 
--#ifdef __tilegx__
--#include <arch/spr_def.h>
--#else
--#include <asm/unistd.h>
--#endif
--
--
- /* 32-bit integer compare-and-exchange.  */
- static __inline __attribute__ ((always_inline))
-      int arch_atomic_val_compare_and_exchange_4 (volatile int *mem,
diff --git a/package/gcc/patches/5.3.0/uclibc-cmath-long-double.patch b/package/gcc/patches/5.3.0/uclibc-cmath-long-double.patch
deleted file mode 100644
index 9ea5dc38f..000000000
--- a/package/gcc/patches/5.3.0/uclibc-cmath-long-double.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-diff -Nur gcc-4.9.2.orig/libstdc++-v3/include/c_global/cmath gcc-4.9.2/libstdc++-v3/include/c_global/cmath
---- gcc-4.9.2.orig/libstdc++-v3/include/c_global/cmath	2014-01-02 16:30:10.000000000 -0600
-+++ gcc-4.9.2/libstdc++-v3/include/c_global/cmath	2015-06-02 20:29:58.615890169 -0500
-@@ -1041,143 +1041,213 @@
-   // functions
-   using ::acosh;
-   using ::acoshf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::acoshl;
-+#endif
- 
-   using ::asinh;
-   using ::asinhf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::asinhl;
-+#endif
- 
-   using ::atanh;
-   using ::atanhf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::atanhl;
-+#endif
- 
-   using ::cbrt;
-   using ::cbrtf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::cbrtl;
-+#endif
- 
-   using ::copysign;
-   using ::copysignf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::copysignl;
-+#endif
- 
-   using ::erf;
-   using ::erff;
-+#ifdef __LONG_DOUBLE_128__
-   using ::erfl;
-+#endif
- 
-   using ::erfc;
-   using ::erfcf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::erfcl;
-+#endif
- 
-   using ::exp2;
-   using ::exp2f;
-+#ifdef __LONG_DOUBLE_128__
-   using ::exp2l;
-+#endif
- 
-   using ::expm1;
-   using ::expm1f;
-+#ifdef __LONG_DOUBLE_128__
-   using ::expm1l;
-+#endif
- 
-   using ::fdim;
-   using ::fdimf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::fdiml;
-+#endif
- 
-   using ::fma;
-   using ::fmaf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::fmal;
-+#endif
- 
-   using ::fmax;
-   using ::fmaxf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::fmaxl;
-+#endif
- 
-   using ::fmin;
-   using ::fminf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::fminl;
-+#endif
- 
-   using ::hypot;
-   using ::hypotf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::hypotl;
-+#endif
- 
-   using ::ilogb;
-   using ::ilogbf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::ilogbl;
-+#endif
- 
-   using ::lgamma;
-   using ::lgammaf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::lgammal;
-+#endif
- 
-   using ::llrint;
-   using ::llrintf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::llrintl;
-+#endif
- 
-   using ::llround;
-   using ::llroundf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::llroundl;
-+#endif
- 
-   using ::log1p;
-   using ::log1pf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::log1pl;
-+#endif
- 
-   using ::log2;
-   using ::log2f;
-+#ifdef __LONG_DOUBLE_128__
-   using ::log2l;
-+#endif
- 
-   using ::logb;
-   using ::logbf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::logbl;
-+#endif
- 
-   using ::lrint;
-   using ::lrintf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::lrintl;
-+#endif
- 
-   using ::lround;
-   using ::lroundf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::lroundl;
-+#endif
- 
-   using ::nan;
-   using ::nanf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::nanl;
-+#endif
- 
-   using ::nearbyint;
-   using ::nearbyintf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::nearbyintl;
-+#endif
- 
-   using ::nextafter;
-   using ::nextafterf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::nextafterl;
-+#endif
- 
-   using ::nexttoward;
-   using ::nexttowardf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::nexttowardl;
-+#endif
- 
-   using ::remainder;
-   using ::remainderf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::remainderl;
-+#endif
- 
-   using ::remquo;
-   using ::remquof;
-+#ifdef __LONG_DOUBLE_128__
-   using ::remquol;
-+#endif
- 
-   using ::rint;
-   using ::rintf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::rintl;
-+#endif
- 
-   using ::round;
-   using ::roundf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::roundl;
-+#endif
- 
-   using ::scalbln;
-   using ::scalblnf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::scalblnl;
-+#endif
- 
-   using ::scalbn;
-   using ::scalbnf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::scalbnl;
-+#endif
- 
-   using ::tgamma;
-   using ::tgammaf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::tgammal;
-+#endif
- 
-   using ::trunc;
-   using ::truncf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::truncl;
-+#endif
- 
-   /// Additional overloads.
-   constexpr float
-diff -Nur gcc-4.9.2.orig/libstdc++-v3/include/tr1/cmath gcc-4.9.2/libstdc++-v3/include/tr1/cmath
---- gcc-4.9.2.orig/libstdc++-v3/include/tr1/cmath	2014-01-02 16:30:10.000000000 -0600
-+++ gcc-4.9.2/libstdc++-v3/include/tr1/cmath	2015-06-02 20:29:58.619890102 -0500
-@@ -158,143 +158,213 @@
-   // functions
-   using ::acosh;
-   using ::acoshf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::acoshl;
-+#endif
- 
-   using ::asinh;
-   using ::asinhf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::asinhl;
-+#endif
- 
-   using ::atanh;
-   using ::atanhf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::atanhl;
-+#endif
- 
-   using ::cbrt;
-   using ::cbrtf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::cbrtl;
-+#endif
- 
-   using ::copysign;
-   using ::copysignf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::copysignl;
-+#endif
- 
-   using ::erf;
-   using ::erff;
-+#ifdef __LONG_DOUBLE_128__
-   using ::erfl;
-+#endif
- 
-   using ::erfc;
-   using ::erfcf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::erfcl;
-+#endif
- 
-   using ::exp2;
-   using ::exp2f;
-+#ifdef __LONG_DOUBLE_128__
-   using ::exp2l;
-+#endif
- 
-   using ::expm1;
-   using ::expm1f;
-+#ifdef __LONG_DOUBLE_128__
-   using ::expm1l;
-+#endif
- 
-   using ::fdim;
-   using ::fdimf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::fdiml;
-+#endif
- 
-   using ::fma;
-   using ::fmaf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::fmal;
-+#endif
- 
-   using ::fmax;
-   using ::fmaxf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::fmaxl;
-+#endif
- 
-   using ::fmin;
-   using ::fminf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::fminl;
-+#endif
- 
-   using ::hypot;
-   using ::hypotf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::hypotl;
-+#endif
- 
-   using ::ilogb;
-   using ::ilogbf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::ilogbl;
-+#endif
- 
-   using ::lgamma;
-   using ::lgammaf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::lgammal;
-+#endif
- 
-   using ::llrint;
-   using ::llrintf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::llrintl;
-+#endif
- 
-   using ::llround;
-   using ::llroundf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::llroundl;
-+#endif
- 
-   using ::log1p;
-   using ::log1pf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::log1pl;
-+#endif
- 
-   using ::log2;
-   using ::log2f;
-+#ifdef __LONG_DOUBLE_128__
-   using ::log2l;
-+#endif
- 
-   using ::logb;
-   using ::logbf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::logbl;
-+#endif
- 
-   using ::lrint;
-   using ::lrintf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::lrintl;
-+#endif
- 
-   using ::lround;
-   using ::lroundf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::lroundl;
-+#endif
- 
-   using ::nan;
-   using ::nanf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::nanl;
-+#endif
- 
-   using ::nearbyint;
-   using ::nearbyintf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::nearbyintl;
-+#endif
- 
-   using ::nextafter;
-   using ::nextafterf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::nextafterl;
-+#endif
- 
-   using ::nexttoward;
-   using ::nexttowardf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::nexttowardl;
-+#endif
- 
-   using ::remainder;
-   using ::remainderf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::remainderl;
-+#endif
- 
-   using ::remquo;
-   using ::remquof;
-+#ifdef __LONG_DOUBLE_128__
-   using ::remquol;
-+#endif
- 
-   using ::rint;
-   using ::rintf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::rintl;
-+#endif
- 
-   using ::round;
-   using ::roundf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::roundl;
-+#endif
- 
-   using ::scalbln;
-   using ::scalblnf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::scalblnl;
-+#endif
- 
-   using ::scalbn;
-   using ::scalbnf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::scalbnl;
-+#endif
- 
-   using ::tgamma;
-   using ::tgammaf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::tgammal;
-+#endif
- 
-   using ::trunc;
-   using ::truncf;
-+#ifdef __LONG_DOUBLE_128__
-   using ::truncl;
-+#endif
- 
- #endif
-