From a69eb5d83813a31238c94876b4face5b16228148 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 25 Dec 2014 00:59:37 -0600 Subject: update to gcc 4.8.4 --- toolchain/gcc/Makefile.inc | 4 +- toolchain/gcc/patches/4.8.3/cflags.patch | 231 --- toolchain/gcc/patches/4.8.3/disable-atomics.m68k | 12 - toolchain/gcc/patches/4.8.3/disable-tm.m68k | 14 - toolchain/gcc/patches/4.8.3/gcc.musl | 633 ------- toolchain/gcc/patches/4.8.3/miscompile.microblaze | 22 - toolchain/gcc/patches/4.8.3/uclibc-cmath.ppc | 1878 --------------------- toolchain/gcc/patches/4.8.4/cflags.patch | 231 +++ toolchain/gcc/patches/4.8.4/disable-atomics.m68k | 12 + toolchain/gcc/patches/4.8.4/disable-tm.m68k | 14 + toolchain/gcc/patches/4.8.4/gcc.musl | 633 +++++++ toolchain/gcc/patches/4.8.4/uclibc-cmath.ppc | 1878 +++++++++++++++++++++ 12 files changed, 2770 insertions(+), 2792 deletions(-) delete mode 100644 toolchain/gcc/patches/4.8.3/cflags.patch delete mode 100644 toolchain/gcc/patches/4.8.3/disable-atomics.m68k delete mode 100644 toolchain/gcc/patches/4.8.3/disable-tm.m68k delete mode 100644 toolchain/gcc/patches/4.8.3/gcc.musl delete mode 100644 toolchain/gcc/patches/4.8.3/miscompile.microblaze delete mode 100644 toolchain/gcc/patches/4.8.3/uclibc-cmath.ppc create mode 100644 toolchain/gcc/patches/4.8.4/cflags.patch create mode 100644 toolchain/gcc/patches/4.8.4/disable-atomics.m68k create mode 100644 toolchain/gcc/patches/4.8.4/disable-tm.m68k create mode 100644 toolchain/gcc/patches/4.8.4/gcc.musl create mode 100644 toolchain/gcc/patches/4.8.4/uclibc-cmath.ppc (limited to 'toolchain/gcc') diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index e522805f2..0acfdc50c 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -10,8 +10,8 @@ PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz LIBSTDCXXVER:= 19 endif -ifeq ($(ADK_TOOLCHAIN_GCC_4_8_3),y) -PKG_VERSION:= 4.8.3 +ifeq ($(ADK_TOOLCHAIN_GCC_4_8_4),y) +PKG_VERSION:= 4.8.4 PKG_MD5SUM:= e2c60f5ef918be2db08df96c7d97d0c4 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 diff --git a/toolchain/gcc/patches/4.8.3/cflags.patch b/toolchain/gcc/patches/4.8.3/cflags.patch deleted file mode 100644 index 4f9de8069..000000000 --- a/toolchain/gcc/patches/4.8.3/cflags.patch +++ /dev/null @@ -1,231 +0,0 @@ -diff -Nur gcc-4.8.2.orig/gcc/c-family/c.opt gcc-4.8.2/gcc/c-family/c.opt ---- gcc-4.8.2.orig/gcc/c-family/c.opt 2013-01-19 06:25:25.000000000 +0100 -+++ gcc-4.8.2/gcc/c-family/c.opt 2014-02-23 20:22:48.000000000 +0100 -@@ -379,6 +379,10 @@ - C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration) - This switch is deprecated; use -Werror=implicit-function-declaration instead - -+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 -@@ -949,6 +953,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-4.8.2.orig/gcc/c-family/c-opts.c gcc-4.8.2/gcc/c-family/c-opts.c ---- gcc-4.8.2.orig/gcc/c-family/c-opts.c 2013-02-18 20:42:56.000000000 +0100 -+++ gcc-4.8.2/gcc/c-family/c-opts.c 2014-02-23 20:22:48.000000000 +0100 -@@ -104,6 +104,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); -@@ -491,6 +494,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; -@@ -1027,6 +1036,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-4.8.2.orig/gcc/common.opt gcc-4.8.2/gcc/common.opt ---- gcc-4.8.2.orig/gcc/common.opt 2013-03-14 10:13:36.000000000 +0100 -+++ gcc-4.8.2/gcc/common.opt 2014-02-23 20:22:48.000000000 +0100 -@@ -541,6 +541,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 -@@ -1242,6 +1246,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-4.8.2.orig/gcc/doc/cppopts.texi gcc-4.8.2/gcc/doc/cppopts.texi ---- gcc-4.8.2.orig/gcc/doc/cppopts.texi 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.2/gcc/doc/cppopts.texi 2014-02-23 20:22:48.000000000 +0100 -@@ -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-4.8.2.orig/gcc/doc/invoke.texi gcc-4.8.2/gcc/doc/invoke.texi ---- gcc-4.8.2.orig/gcc/doc/invoke.texi 2013-06-19 21:55:50.000000000 +0200 -+++ gcc-4.8.2/gcc/doc/invoke.texi 2014-02-23 20:22:48.000000000 +0100 -@@ -240,7 +240,7 @@ - -Wconversion -Wcoverage-mismatch -Wno-cpp -Wno-deprecated @gol - -Wno-deprecated-declarations -Wdisabled-optimization @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-y2k @gol -@@ -4807,6 +4807,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 -@@ -6918,7 +6934,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-4.8.2.orig/gcc/java/jvspec.c gcc-4.8.2/gcc/java/jvspec.c ---- gcc-4.8.2.orig/gcc/java/jvspec.c 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.2/gcc/java/jvspec.c 2014-02-23 20:22:48.000000000 +0100 -@@ -626,6 +626,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-4.8.2.orig/gcc/opts.c gcc-4.8.2/gcc/opts.c ---- gcc-4.8.2.orig/gcc/opts.c 2013-03-05 07:01:13.000000000 +0100 -+++ gcc-4.8.2/gcc/opts.c 2014-02-23 20:22:48.000000000 +0100 -@@ -468,8 +468,6 @@ - { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 }, - #endif - { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 }, -- { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 }, -- { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 }, -@@ -488,6 +486,8 @@ - { OPT_LEVELS_2_PLUS, OPT_fhoist_adjacent_loads, 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 -@@ -1423,6 +1423,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/toolchain/gcc/patches/4.8.3/disable-atomics.m68k b/toolchain/gcc/patches/4.8.3/disable-atomics.m68k deleted file mode 100644 index 4ab553218..000000000 --- a/toolchain/gcc/patches/4.8.3/disable-atomics.m68k +++ /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/toolchain/gcc/patches/4.8.3/disable-tm.m68k b/toolchain/gcc/patches/4.8.3/disable-tm.m68k deleted file mode 100644 index 02b5cb854..000000000 --- a/toolchain/gcc/patches/4.8.3/disable-tm.m68k +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur gcc-4.8.3.orig/gcc/config/m68k/uclinux.h gcc-4.8.3/gcc/config/m68k/uclinux.h ---- gcc-4.8.3.orig/gcc/config/m68k/uclinux.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/config/m68k/uclinux.h 2014-08-25 17:03:59.543127685 +0200 -@@ -20,6 +20,10 @@ - along with GCC; see the file COPYING3. If not see - . */ - -+/* Do not use TM clone registry. It breaks -msep-data (-fPIC) code. */ -+/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54584 */ -+#define USE_TM_CLONE_REGISTRY 0 -+ - #undef STARTFILE_SPEC - #define STARTFILE_SPEC \ - "%{mshared-library-id=0|!mshared-library-id=*: crt1.o%s ;: Scrt1.o%s} \ diff --git a/toolchain/gcc/patches/4.8.3/gcc.musl b/toolchain/gcc/patches/4.8.3/gcc.musl deleted file mode 100644 index 4150dfcdf..000000000 --- a/toolchain/gcc/patches/4.8.3/gcc.musl +++ /dev/null @@ -1,633 +0,0 @@ -diff -Nur gcc-4.8.3.orig/fixincludes/mkfixinc.sh gcc-4.8.3/fixincludes/mkfixinc.sh ---- gcc-4.8.3.orig/fixincludes/mkfixinc.sh 2012-10-28 22:42:48.000000000 +0100 -+++ gcc-4.8.3/fixincludes/mkfixinc.sh 2014-05-23 08:22:46.987415702 +0200 -@@ -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-4.8.3.orig/gcc/config/aarch64/aarch64-linux.h gcc-4.8.3/gcc/config/aarch64/aarch64-linux.h ---- gcc-4.8.3.orig/gcc/config/aarch64/aarch64-linux.h 2013-08-13 15:22:18.000000000 +0200 -+++ gcc-4.8.3/gcc/config/aarch64/aarch64-linux.h 2014-05-23 08:22:46.987415702 +0200 -@@ -21,7 +21,11 @@ - #ifndef GCC_AARCH64_LINUX_H - #define GCC_AARCH64_LINUX_H - -+/* The AArch64 port currently supports two dynamic linkers: -+ - ld-linux-aarch64.so.1 - GLIBC dynamic linker -+ - ld-musl-aarch64.so.1 - musl libc dynamic linker */ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" - - #define CPP_SPEC "%{pthread:-D_REENTRANT}" - -diff -Nur gcc-4.8.3.orig/gcc/config/arm/linux-eabi.h gcc-4.8.3/gcc/config/arm/linux-eabi.h ---- gcc-4.8.3.orig/gcc/config/arm/linux-eabi.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/config/arm/linux-eabi.h 2014-05-23 08:22:46.987415702 +0200 -@@ -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-4.8.3.orig/gcc/config/i386/linux64.h gcc-4.8.3/gcc/config/i386/linux64.h ---- gcc-4.8.3.orig/gcc/config/i386/linux64.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/config/i386/linux64.h 2014-05-23 08:22:46.987415702 +0200 -@@ -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-4.8.3.orig/gcc/config/i386/linux.h gcc-4.8.3/gcc/config/i386/linux.h ---- gcc-4.8.3.orig/gcc/config/i386/linux.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/config/i386/linux.h 2014-05-23 08:22:46.987415702 +0200 -@@ -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-4.8.3.orig/gcc/config/linux.h gcc-4.8.3/gcc/config/linux.h ---- gcc-4.8.3.orig/gcc/config/linux.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/config/linux.h 2014-05-23 08:22:46.987415702 +0200 -@@ -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,21 @@ - - #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) - - /* Determine whether the entire c99 runtime - is present in the runtime library. */ - #undef TARGET_C99_FUNCTIONS --#define TARGET_C99_FUNCTIONS (OPTION_GLIBC) -+#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL) - - /* Whether we have sincos that follows the GNU extension. */ - #undef TARGET_HAS_SINCOS -@@ -107,3 +112,74 @@ - /* 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 -diff -Nur gcc-4.8.3.orig/gcc/config/linux.opt gcc-4.8.3/gcc/config/linux.opt ---- gcc-4.8.3.orig/gcc/config/linux.opt 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/config/linux.opt 2014-05-23 08:22:46.987415702 +0200 -@@ -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-4.8.3.orig/gcc/config/microblaze/linux.h gcc-4.8.3/gcc/config/microblaze/linux.h ---- gcc-4.8.3.orig/gcc/config/microblaze/linux.h 2013-03-14 16:43:23.000000000 +0100 -+++ gcc-4.8.3/gcc/config/microblaze/linux.h 2014-05-23 08:22:46.987415702 +0200 -@@ -25,7 +25,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-4.8.3.orig/gcc/config/mips/linux.h gcc-4.8.3/gcc/config/mips/linux.h ---- gcc-4.8.3.orig/gcc/config/mips/linux.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/config/mips/linux.h 2014-05-23 08:22:48.643418636 +0200 -@@ -18,3 +18,10 @@ - . */ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+ -+#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 ".so.1" -diff -Nur gcc-4.8.3.orig/gcc/config/rs6000/linux64.h gcc-4.8.3/gcc/config/rs6000/linux64.h ---- gcc-4.8.3.orig/gcc/config/rs6000/linux64.h 2014-04-04 17:10:24.000000000 +0200 -+++ gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-05-23 08:22:48.643418636 +0200 -@@ -374,17 +374,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-4.8.3.orig/gcc/config/rs6000/secureplt.h gcc-4.8.3/gcc/config/rs6000/secureplt.h ---- gcc-4.8.3.orig/gcc/config/rs6000/secureplt.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/config/rs6000/secureplt.h 2014-05-23 08:22:48.643418636 +0200 -@@ -18,3 +18,4 @@ - . */ - - #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" -+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" -diff -Nur gcc-4.8.3.orig/gcc/config/rs6000/sysv4.h gcc-4.8.3/gcc/config/rs6000/sysv4.h ---- gcc-4.8.3.orig/gcc/config/rs6000/sysv4.h 2014-04-04 16:50:31.000000000 +0200 -+++ gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-05-23 08:22:48.643418636 +0200 -@@ -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. */ - #define CC1_SPEC "%{G*} %(cc1_cpu)" \ -@@ -585,7 +588,8 @@ - - /* 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 "\ -@@ -763,15 +767,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} \ -@@ -894,6 +901,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-4.8.3.orig/gcc/config/sh/linux.h gcc-4.8.3/gcc/config/sh/linux.h ---- gcc-4.8.3.orig/gcc/config/sh/linux.h 2013-03-14 04:01:53.000000000 +0100 -+++ gcc-4.8.3/gcc/config/sh/linux.h 2014-05-23 08:22:48.643418636 +0200 -@@ -43,7 +43,14 @@ - - #define TARGET_ASM_FILE_END file_end_indicate_exec_stack - -+#if TARGET_ENDIAN_DEFAULT == 0 /* 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-4.8.3.orig/gcc/config.gcc gcc-4.8.3/gcc/config.gcc ---- gcc-4.8.3.orig/gcc/config.gcc 2014-05-06 17:29:04.000000000 +0200 -+++ gcc-4.8.3/gcc/config.gcc 2014-05-23 08:22:49.895420854 +0200 -@@ -550,7 +550,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" - - # Common parts for widely ported systems. - case ${target} in -@@ -653,6 +653,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" - ;; -@@ -2135,6 +2138,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-4.8.3.orig/gcc/configure gcc-4.8.3/gcc/configure ---- gcc-4.8.3.orig/gcc/configure 2014-04-28 12:05:29.000000000 +0200 -+++ gcc-4.8.3/gcc/configure 2014-05-23 08:22:49.903420868 +0200 -@@ -26821,6 +26821,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. -@@ -26854,6 +26857,7 @@ - # ) 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" -@@ -26936,6 +26940,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-4.8.3.orig/gcc/configure.ac gcc-4.8.3/gcc/configure.ac ---- gcc-4.8.3.orig/gcc/configure.ac 2014-04-28 12:05:29.000000000 +0200 -+++ gcc-4.8.3/gcc/configure.ac 2014-05-23 08:22:49.903420868 +0200 -@@ -4750,6 +4750,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. -@@ -4783,6 +4786,7 @@ - # ) 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], -@@ -4848,6 +4852,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-4.8.3.orig/gcc/ginclude/stddef.h gcc-4.8.3/gcc/ginclude/stddef.h ---- gcc-4.8.3.orig/gcc/ginclude/stddef.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/ginclude/stddef.h 2014-05-23 08:22:49.903420868 +0200 -@@ -181,6 +181,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 -@@ -197,6 +198,7 @@ - #define ___int_size_t_h - #define _GCC_SIZE_T - #define _SIZET_ -+#define __DEFINED_size_t /* musl */ - #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ - || defined(__FreeBSD_kernel__) - /* __size_t is a typedef on FreeBSD 5, must not trash it. */ -@@ -214,6 +216,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-4.8.3.orig/libgcc/unwind-dw2-fde-dip.c gcc-4.8.3/libgcc/unwind-dw2-fde-dip.c ---- gcc-4.8.3.orig/libgcc/unwind-dw2-fde-dip.c 2013-02-04 20:06:20.000000000 +0100 -+++ gcc-4.8.3/libgcc/unwind-dw2-fde-dip.c 2014-05-23 08:22:49.955420959 +0200 -@@ -46,33 +46,13 @@ - #include "unwind-compat.h" - #include "gthr.h" - --#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))) --# define USE_PT_GNU_EH_FRAME --#endif -- --#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -- && defined(__BIONIC__) --# define USE_PT_GNU_EH_FRAME --#endif -- --#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -- && defined(__FreeBSD__) && __FreeBSD__ >= 7 --# define ElfW __ElfN --# define USE_PT_GNU_EH_FRAME --#endif -- --#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -- && defined(__OpenBSD__) --# define ElfW(type) Elf_##type --# define USE_PT_GNU_EH_FRAME --#endif -- --#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -- && defined(TARGET_DL_ITERATE_PHDR) \ -- && defined(__sun__) && defined(__svr4__) -+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) - # define USE_PT_GNU_EH_FRAME -+# ifdef __OpenBSD__ -+# define ElfW(type) Elf_##typ -+# elif defined(__FreeBSD__) && __FreeBSD__ >= 7 -+# define ElfW __ElfN -+# endif - #endif - - #if defined(USE_PT_GNU_EH_FRAME) -diff -Nur gcc-4.8.3.orig/libgomp/config/posix/time.c gcc-4.8.3/libgomp/config/posix/time.c ---- gcc-4.8.3.orig/libgomp/config/posix/time.c 2013-01-14 19:18:49.000000000 +0100 -+++ gcc-4.8.3/libgomp/config/posix/time.c 2014-05-23 08:22:49.975420996 +0200 -@@ -28,6 +28,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 - #if TIME_WITH_SYS_TIME -diff -Nur gcc-4.8.3.orig/libitm/config/arm/hwcap.cc gcc-4.8.3/libitm/config/arm/hwcap.cc ---- gcc-4.8.3.orig/libitm/config/arm/hwcap.cc 2013-02-03 18:46:11.000000000 +0100 -+++ gcc-4.8.3/libitm/config/arm/hwcap.cc 2014-05-23 08:22:49.979421003 +0200 -@@ -40,7 +40,11 @@ - - #ifdef __linux__ - #include -+#ifdef __GLIBC__ - #include -+#else -+#include -+#endif - #include - - static void __attribute__((constructor)) -diff -Nur gcc-4.8.3.orig/libitm/config/linux/x86/tls.h gcc-4.8.3/libitm/config/linux/x86/tls.h ---- gcc-4.8.3.orig/libitm/config/linux/x86/tls.h 2013-02-03 18:46:11.000000000 +0100 -+++ gcc-4.8.3/libitm/config/linux/x86/tls.h 2014-05-23 08:22:49.999421038 +0200 -@@ -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-4.8.3.orig/libstdc++-v3/configure.host gcc-4.8.3/libstdc++-v3/configure.host ---- gcc-4.8.3.orig/libstdc++-v3/configure.host 2013-06-19 03:18:38.000000000 +0200 -+++ gcc-4.8.3/libstdc++-v3/configure.host 2014-05-23 08:22:50.015421065 +0200 -@@ -264,6 +264,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 -@@ -272,6 +279,9 @@ - os_include_dir="os/gnu-linux" - fi - ;; -+ -+ esac -+ ;; - hpux*) - os_include_dir="os/hpux" - ;; diff --git a/toolchain/gcc/patches/4.8.3/miscompile.microblaze b/toolchain/gcc/patches/4.8.3/miscompile.microblaze deleted file mode 100644 index d575054aa..000000000 --- a/toolchain/gcc/patches/4.8.3/miscompile.microblaze +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur gcc-4.8.3.orig/gcc/config/microblaze/microblaze.md gcc-4.8.3/gcc/config/microblaze/microblaze.md ---- gcc-4.8.3.orig/gcc/config/microblaze/microblaze.md 2014-02-23 19:59:26.000000000 +0100 -+++ gcc-4.8.3/gcc/config/microblaze/microblaze.md 2014-05-31 20:39:29.978608468 +0200 -@@ -1119,18 +1119,6 @@ - } - ) - --;;Load and store reverse --(define_insn "movsi4_rev" -- [(set (match_operand:SI 0 "reg_or_mem_operand" "=r,Q") -- (bswap:SI (match_operand:SF 1 "reg_or_mem_operand" "Q,r")))] -- "TARGET_REORDER" -- "@ -- lwr\t%0,%y1,r0 -- swr\t%1,%y0,r0" -- [(set_attr "type" "load,store") -- (set_attr "mode" "SI") -- (set_attr "length" "4,4")]) -- - ;; 32-bit floating point moves - - (define_expand "movsf" diff --git a/toolchain/gcc/patches/4.8.3/uclibc-cmath.ppc b/toolchain/gcc/patches/4.8.3/uclibc-cmath.ppc deleted file mode 100644 index 81bd123fc..000000000 --- a/toolchain/gcc/patches/4.8.3/uclibc-cmath.ppc +++ /dev/null @@ -1,1878 +0,0 @@ -diff -Nur gcc-4.8.3.orig/libstdc++-v3/include/c_global/cmath gcc-4.8.3/libstdc++-v3/include/c_global/cmath ---- gcc-4.8.3.orig/libstdc++-v3/include/c_global/cmath 2013-02-03 18:54:05.000000000 +0100 -+++ gcc-4.8.3/libstdc++-v3/include/c_global/cmath 2014-07-27 07:24:43.600272987 +0200 -@@ -1040,143 +1040,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.8.3.orig/libstdc++-v3/include/tr1/cmath gcc-4.8.3/libstdc++-v3/include/tr1/cmath ---- gcc-4.8.3.orig/libstdc++-v3/include/tr1/cmath 2013-02-03 18:54:05.000000000 +0100 -+++ gcc-4.8.3/libstdc++-v3/include/tr1/cmath 2014-07-26 12:58:43.652151897 +0200 -@@ -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 - -diff -Nur gcc-4.8.3.orig/libstdc++-v3/include/tr1/cmath.orig gcc-4.8.3/libstdc++-v3/include/tr1/cmath.orig ---- gcc-4.8.3.orig/libstdc++-v3/include/tr1/cmath.orig 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-4.8.3/libstdc++-v3/include/tr1/cmath.orig 2013-02-03 18:54:05.000000000 +0100 -@@ -0,0 +1,1440 @@ -+// TR1 cmath -*- C++ -*- -+ -+// Copyright (C) 2006-2013 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library is free -+// software; you can redistribute it and/or modify it under the -+// terms of the GNU General Public License as published by the -+// Free Software Foundation; either version 3, or (at your option) -+// any later version. -+ -+// This library is distributed in the hope that it will be useful, -+// but WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+// GNU General Public License for more details. -+ -+// Under Section 7 of GPL version 3, you are granted additional -+// permissions described in the GCC Runtime Library Exception, version -+// 3.1, as published by the Free Software Foundation. -+ -+// You should have received a copy of the GNU General Public License and -+// a copy of the GCC Runtime Library Exception along with this program; -+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -+// . -+ -+/** @file tr1/cmath -+ * This is a TR1 C++ Library header. -+ */ -+ -+#ifndef _GLIBCXX_TR1_CMATH -+#define _GLIBCXX_TR1_CMATH 1 -+ -+#pragma GCC system_header -+ -+#include -+ -+#ifdef _GLIBCXX_USE_C99_MATH_TR1 -+ -+#undef acosh -+#undef acoshf -+#undef acoshl -+#undef asinh -+#undef asinhf -+#undef asinhl -+#undef atanh -+#undef atanhf -+#undef atanhl -+#undef cbrt -+#undef cbrtf -+#undef cbrtl -+#undef copysign -+#undef copysignf -+#undef copysignl -+#undef erf -+#undef erff -+#undef erfl -+#undef erfc -+#undef erfcf -+#undef erfcl -+#undef exp2 -+#undef exp2f -+#undef exp2l -+#undef expm1 -+#undef expm1f -+#undef expm1l -+#undef fdim -+#undef fdimf -+#undef fdiml -+#undef fma -+#undef fmaf -+#undef fmal -+#undef fmax -+#undef fmaxf -+#undef fmaxl -+#undef fmin -+#undef fminf -+#undef fminl -+#undef hypot -+#undef hypotf -+#undef hypotl -+#undef ilogb -+#undef ilogbf -+#undef ilogbl -+#undef lgamma -+#undef lgammaf -+#undef lgammal -+#undef llrint -+#undef llrintf -+#undef llrintl -+#undef llround -+#undef llroundf -+#undef llroundl -+#undef log1p -+#undef log1pf -+#undef log1pl -+#undef log2 -+#undef log2f -+#undef log2l -+#undef logb -+#undef logbf -+#undef logbl -+#undef lrint -+#undef lrintf -+#undef lrintl -+#undef lround -+#undef lroundf -+#undef lroundl -+#undef nan -+#undef nanf -+#undef nanl -+#undef nearbyint -+#undef nearbyintf -+#undef nearbyintl -+#undef nextafter -+#undef nextafterf -+#undef nextafterl -+#undef nexttoward -+#undef nexttowardf -+#undef nexttowardl -+#undef remainder -+#undef remainderf -+#undef remainderl -+#undef remquo -+#undef remquof -+#undef remquol -+#undef rint -+#undef rintf -+#undef rintl -+#undef round -+#undef roundf -+#undef roundl -+#undef scalbln -+#undef scalblnf -+#undef scalblnl -+#undef scalbn -+#undef scalbnf -+#undef scalbnl -+#undef tgamma -+#undef tgammaf -+#undef tgammal -+#undef trunc -+#undef truncf -+#undef truncl -+ -+#endif -+ -+namespace std _GLIBCXX_VISIBILITY(default) -+{ -+namespace tr1 -+{ -+_GLIBCXX_BEGIN_NAMESPACE_VERSION -+ -+#if _GLIBCXX_USE_C99_MATH_TR1 -+ -+ // types -+ using ::double_t; -+ using ::float_t; -+ -+ // functions -+ using ::acosh; -+ using ::acoshf; -+ using ::acoshl; -+ -+ using ::asinh; -+ using ::asinhf; -+ using ::asinhl; -+ -+ using ::atanh; -+ using ::atanhf; -+ using ::atanhl; -+ -+ using ::cbrt; -+ using ::cbrtf; -+ using ::cbrtl; -+ -+ using ::copysign; -+ using ::copysignf; -+ using ::copysignl; -+ -+ using ::erf; -+ using ::erff; -+ using ::erfl; -+ -+ using ::erfc; -+ using ::erfcf; -+ using ::erfcl; -+ -+ using ::exp2; -+ using ::exp2f; -+ using ::exp2l; -+ -+ using ::expm1; -+ using ::expm1f; -+ using ::expm1l; -+ -+ using ::fdim; -+ using ::fdimf; -+ using ::fdiml; -+ -+ using ::fma; -+ using ::fmaf; -+ using ::fmal; -+ -+ using ::fmax; -+ using ::fmaxf; -+ using ::fmaxl; -+ -+ using ::fmin; -+ using ::fminf; -+ using ::fminl; -+ -+ using ::hypot; -+ using ::hypotf; -+ using ::hypotl; -+ -+ using ::ilogb; -+ using ::ilogbf; -+ using ::ilogbl; -+ -+ using ::lgamma; -+ using ::lgammaf; -+ using ::lgammal; -+ -+ using ::llrint; -+ using ::llrintf; -+ using ::llrintl; -+ -+ using ::llround; -+ using ::llroundf; -+ using ::llroundl; -+ -+ using ::log1p; -+ using ::log1pf; -+ using ::log1pl; -+ -+ using ::log2; -+ using ::log2f; -+ using ::log2l; -+ -+ using ::logb; -+ using ::logbf; -+ using ::logbl; -+ -+ using ::lrint; -+ using ::lrintf; -+ using ::lrintl; -+ -+ using ::lround; -+ using ::lroundf; -+ using ::lroundl; -+ -+ using ::nan; -+ using ::nanf; -+ using ::nanl; -+ -+ using ::nearbyint; -+ using ::nearbyintf; -+ using ::nearbyintl; -+ -+ using ::nextafter; -+ using ::nextafterf; -+ using ::nextafterl; -+ -+ using ::nexttoward; -+ using ::nexttowardf; -+ using ::nexttowardl; -+ -+ using ::remainder; -+ using ::remainderf; -+ using ::remainderl; -+ -+ using ::remquo; -+ using ::remquof; -+ using ::remquol; -+ -+ using ::rint; -+ using ::rintf; -+ using ::rintl; -+ -+ using ::round; -+ using ::roundf; -+ using ::roundl; -+ -+ using ::scalbln; -+ using ::scalblnf; -+ using ::scalblnl; -+ -+ using ::scalbn; -+ using ::scalbnf; -+ using ::scalbnl; -+ -+ using ::tgamma; -+ using ::tgammaf; -+ using ::tgammal; -+ -+ using ::trunc; -+ using ::truncf; -+ using ::truncl; -+ -+#endif -+ -+#if _GLIBCXX_USE_C99_MATH -+#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC -+ -+ /// Function template definitions [8.16.3]. -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ fpclassify(_Tp __f) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, -+ FP_SUBNORMAL, FP_ZERO, __type(__f)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ isfinite(_Tp __f) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_isfinite(__type(__f)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ isinf(_Tp __f) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_isinf(__type(__f)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ isnan(_Tp __f) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_isnan(__type(__f)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ isnormal(_Tp __f) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_isnormal(__type(__f)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ signbit(_Tp __f) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_signbit(__type(__f)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ isgreater(_Tp __f1, _Tp __f2) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_isgreater(__type(__f1), __type(__f2)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ isgreaterequal(_Tp __f1, _Tp __f2) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_isgreaterequal(__type(__f1), __type(__f2)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ isless(_Tp __f1, _Tp __f2) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_isless(__type(__f1), __type(__f2)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ islessequal(_Tp __f1, _Tp __f2) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_islessequal(__type(__f1), __type(__f2)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ islessgreater(_Tp __f1, _Tp __f2) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_islessgreater(__type(__f1), __type(__f2)); -+ } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, -+ int>::__type -+ isunordered(_Tp __f1, _Tp __f2) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __builtin_isunordered(__type(__f1), __type(__f2)); -+ } -+ -+#endif -+#endif -+ -+#if _GLIBCXX_USE_C99_MATH_TR1 -+ -+ /// Additional overloads [8.16.4]. -+ using std::acos; -+ -+ inline float -+ acosh(float __x) -+ { return __builtin_acoshf(__x); } -+ -+ inline long double -+ acosh(long double __x) -+ { return __builtin_acoshl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ acosh(_Tp __x) -+ { return __builtin_acosh(__x); } -+ -+ using std::asin; -+ -+ inline float -+ asinh(float __x) -+ { return __builtin_asinhf(__x); } -+ -+ inline long double -+ asinh(long double __x) -+ { return __builtin_asinhl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ asinh(_Tp __x) -+ { return __builtin_asinh(__x); } -+ -+ using std::atan; -+ using std::atan2; -+ -+ inline float -+ atanh(float __x) -+ { return __builtin_atanhf(__x); } -+ -+ inline long double -+ atanh(long double __x) -+ { return __builtin_atanhl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ atanh(_Tp __x) -+ { return __builtin_atanh(__x); } -+ -+ inline float -+ cbrt(float __x) -+ { return __builtin_cbrtf(__x); } -+ -+ inline long double -+ cbrt(long double __x) -+ { return __builtin_cbrtl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ cbrt(_Tp __x) -+ { return __builtin_cbrt(__x); } -+ -+ using std::ceil; -+ -+ inline float -+ copysign(float __x, float __y) -+ { return __builtin_copysignf(__x, __y); } -+ -+ inline long double -+ copysign(long double __x, long double __y) -+ { return __builtin_copysignl(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ copysign(_Tp __x, _Up __y) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return copysign(__type(__x), __type(__y)); -+ } -+ -+ using std::cos; -+ using std::cosh; -+ -+ inline float -+ erf(float __x) -+ { return __builtin_erff(__x); } -+ -+ inline long double -+ erf(long double __x) -+ { return __builtin_erfl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ erf(_Tp __x) -+ { return __builtin_erf(__x); } -+ -+ inline float -+ erfc(float __x) -+ { return __builtin_erfcf(__x); } -+ -+ inline long double -+ erfc(long double __x) -+ { return __builtin_erfcl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ erfc(_Tp __x) -+ { return __builtin_erfc(__x); } -+ -+ using std::exp; -+ -+ inline float -+ exp2(float __x) -+ { return __builtin_exp2f(__x); } -+ -+ inline long double -+ exp2(long double __x) -+ { return __builtin_exp2l(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ exp2(_Tp __x) -+ { return __builtin_exp2(__x); } -+ -+ inline float -+ expm1(float __x) -+ { return __builtin_expm1f(__x); } -+ -+ inline long double -+ expm1(long double __x) -+ { return __builtin_expm1l(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ expm1(_Tp __x) -+ { return __builtin_expm1(__x); } -+ -+ // Note: we deal with fabs in a special way, because an using std::fabs -+ // would bring in also the overloads for complex types, which in C++0x -+ // mode have a different return type. -+ // With __CORRECT_ISO_CPP_MATH_H_PROTO, math.h imports std::fabs in the -+ // global namespace after the declarations of the float / double / long -+ // double overloads but before the std::complex overloads. -+ using ::fabs; -+ -+#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO -+ inline float -+ fabs(float __x) -+ { return __builtin_fabsf(__x); } -+ -+ inline long double -+ fabs(long double __x) -+ { return __builtin_fabsl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ fabs(_Tp __x) -+ { return __builtin_fabs(__x); } -+#endif -+ -+ inline float -+ fdim(float __x, float __y) -+ { return __builtin_fdimf(__x, __y); } -+ -+ inline long double -+ fdim(long double __x, long double __y) -+ { return __builtin_fdiml(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ fdim(_Tp __x, _Up __y) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return fdim(__type(__x), __type(__y)); -+ } -+ -+ using std::floor; -+ -+ inline float -+ fma(float __x, float __y, float __z) -+ { return __builtin_fmaf(__x, __y, __z); } -+ -+ inline long double -+ fma(long double __x, long double __y, long double __z) -+ { return __builtin_fmal(__x, __y, __z); } -+ -+ template -+ inline typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type -+ fma(_Tp __x, _Up __y, _Vp __z) -+ { -+ typedef typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type __type; -+ return fma(__type(__x), __type(__y), __type(__z)); -+ } -+ -+ inline float -+ fmax(float __x, float __y) -+ { return __builtin_fmaxf(__x, __y); } -+ -+ inline long double -+ fmax(long double __x, long double __y) -+ { return __builtin_fmaxl(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ fmax(_Tp __x, _Up __y) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return fmax(__type(__x), __type(__y)); -+ } -+ -+ inline float -+ fmin(float __x, float __y) -+ { return __builtin_fminf(__x, __y); } -+ -+ inline long double -+ fmin(long double __x, long double __y) -+ { return __builtin_fminl(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ fmin(_Tp __x, _Up __y) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return fmin(__type(__x), __type(__y)); -+ } -+ -+ using std::fmod; -+ using std::frexp; -+ -+ inline float -+ hypot(float __x, float __y) -+ { return __builtin_hypotf(__x, __y); } -+ -+ inline long double -+ hypot(long double __x, long double __y) -+ { return __builtin_hypotl(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ hypot(_Tp __y, _Up __x) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return hypot(__type(__y), __type(__x)); -+ } -+ -+ inline int -+ ilogb(float __x) -+ { return __builtin_ilogbf(__x); } -+ -+ inline int -+ ilogb(long double __x) -+ { return __builtin_ilogbl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ int>::__type -+ ilogb(_Tp __x) -+ { return __builtin_ilogb(__x); } -+ -+ using std::ldexp; -+ -+ inline float -+ lgamma(float __x) -+ { return __builtin_lgammaf(__x); } -+ -+ inline long double -+ lgamma(long double __x) -+ { return __builtin_lgammal(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ lgamma(_Tp __x) -+ { return __builtin_lgamma(__x); } -+ -+ inline long long -+ llrint(float __x) -+ { return __builtin_llrintf(__x); } -+ -+ inline long long -+ llrint(long double __x) -+ { return __builtin_llrintl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ long long>::__type -+ llrint(_Tp __x) -+ { return __builtin_llrint(__x); } -+ -+ inline long long -+ llround(float __x) -+ { return __builtin_llroundf(__x); } -+ -+ inline long long -+ llround(long double __x) -+ { return __builtin_llroundl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ long long>::__type -+ llround(_Tp __x) -+ { return __builtin_llround(__x); } -+ -+ using std::log; -+ using std::log10; -+ -+ inline float -+ log1p(float __x) -+ { return __builtin_log1pf(__x); } -+ -+ inline long double -+ log1p(long double __x) -+ { return __builtin_log1pl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ log1p(_Tp __x) -+ { return __builtin_log1p(__x); } -+ -+ // DR 568. -+ inline float -+ log2(float __x) -+ { return __builtin_log2f(__x); } -+ -+ inline long double -+ log2(long double __x) -+ { return __builtin_log2l(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ log2(_Tp __x) -+ { return __builtin_log2(__x); } -+ -+ inline float -+ logb(float __x) -+ { return __builtin_logbf(__x); } -+ -+ inline long double -+ logb(long double __x) -+ { return __builtin_logbl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ logb(_Tp __x) -+ { -+ return __builtin_logb(__x); -+ } -+ -+ inline long -+ lrint(float __x) -+ { return __builtin_lrintf(__x); } -+ -+ inline long -+ lrint(long double __x) -+ { return __builtin_lrintl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ long>::__type -+ lrint(_Tp __x) -+ { return __builtin_lrint(__x); } -+ -+ inline long -+ lround(float __x) -+ { return __builtin_lroundf(__x); } -+ -+ inline long -+ lround(long double __x) -+ { return __builtin_lroundl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ long>::__type -+ lround(_Tp __x) -+ { return __builtin_lround(__x); } -+ -+ inline float -+ nearbyint(float __x) -+ { return __builtin_nearbyintf(__x); } -+ -+ inline long double -+ nearbyint(long double __x) -+ { return __builtin_nearbyintl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ nearbyint(_Tp __x) -+ { return __builtin_nearbyint(__x); } -+ -+ inline float -+ nextafter(float __x, float __y) -+ { return __builtin_nextafterf(__x, __y); } -+ -+ inline long double -+ nextafter(long double __x, long double __y) -+ { return __builtin_nextafterl(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ nextafter(_Tp __x, _Up __y) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return nextafter(__type(__x), __type(__y)); -+ } -+ -+ inline float -+ nexttoward(float __x, long double __y) -+ { return __builtin_nexttowardf(__x, __y); } -+ -+ inline long double -+ nexttoward(long double __x, long double __y) -+ { return __builtin_nexttowardl(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ nexttoward(_Tp __x, long double __y) -+ { return __builtin_nexttoward(__x, __y); } -+ -+ // DR 550. What should the return type of pow(float,int) be? -+ // NB: C++0x and TR1 != C++03. -+ // using std::pow; -+ -+ inline float -+ remainder(float __x, float __y) -+ { return __builtin_remainderf(__x, __y); } -+ -+ inline long double -+ remainder(long double __x, long double __y) -+ { return __builtin_remainderl(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ remainder(_Tp __x, _Up __y) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return remainder(__type(__x), __type(__y)); -+ } -+ -+ inline float -+ remquo(float __x, float __y, int* __pquo) -+ { return __builtin_remquof(__x, __y, __pquo); } -+ -+ inline long double -+ remquo(long double __x, long double __y, int* __pquo) -+ { return __builtin_remquol(__x, __y, __pquo); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ remquo(_Tp __x, _Up __y, int* __pquo) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return remquo(__type(__x), __type(__y), __pquo); -+ } -+ -+ inline float -+ rint(float __x) -+ { return __builtin_rintf(__x); } -+ -+ inline long double -+ rint(long double __x) -+ { return __builtin_rintl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ rint(_Tp __x) -+ { return __builtin_rint(__x); } -+ -+ inline float -+ round(float __x) -+ { return __builtin_roundf(__x); } -+ -+ inline long double -+ round(long double __x) -+ { return __builtin_roundl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ round(_Tp __x) -+ { return __builtin_round(__x); } -+ -+ inline float -+ scalbln(float __x, long __ex) -+ { return __builtin_scalblnf(__x, __ex); } -+ -+ inline long double -+ scalbln(long double __x, long __ex) -+ { return __builtin_scalblnl(__x, __ex); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ scalbln(_Tp __x, long __ex) -+ { return __builtin_scalbln(__x, __ex); } -+ -+ inline float -+ scalbn(float __x, int __ex) -+ { return __builtin_scalbnf(__x, __ex); } -+ -+ inline long double -+ scalbn(long double __x, int __ex) -+ { return __builtin_scalbnl(__x, __ex); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ scalbn(_Tp __x, int __ex) -+ { return __builtin_scalbn(__x, __ex); } -+ -+ using std::sin; -+ using std::sinh; -+ using std::sqrt; -+ using std::tan; -+ using std::tanh; -+ -+ inline float -+ tgamma(float __x) -+ { return __builtin_tgammaf(__x); } -+ -+ inline long double -+ tgamma(long double __x) -+ { return __builtin_tgammal(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ tgamma(_Tp __x) -+ { return __builtin_tgamma(__x); } -+ -+ inline float -+ trunc(float __x) -+ { return __builtin_truncf(__x); } -+ -+ inline long double -+ trunc(long double __x) -+ { return __builtin_truncl(__x); } -+ -+ template -+ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, -+ double>::__type -+ trunc(_Tp __x) -+ { return __builtin_trunc(__x); } -+ -+#endif -+_GLIBCXX_END_NAMESPACE_VERSION -+} -+} -+ -+namespace std _GLIBCXX_VISIBILITY(default) -+{ -+namespace tr1 -+{ -+_GLIBCXX_BEGIN_NAMESPACE_VERSION -+ -+ // DR 550. What should the return type of pow(float,int) be? -+ // NB: C++0x and TR1 != C++03. -+ inline double -+ pow(double __x, double __y) -+ { return std::pow(__x, __y); } -+ -+ inline float -+ pow(float __x, float __y) -+ { return std::pow(__x, __y); } -+ -+ inline long double -+ pow(long double __x, long double __y) -+ { return std::pow(__x, __y); } -+ -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type -+ pow(_Tp __x, _Up __y) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; -+ return std::pow(__type(__x), __type(__y)); -+ } -+ -+_GLIBCXX_END_NAMESPACE_VERSION -+} -+} -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+namespace std _GLIBCXX_VISIBILITY(default) -+{ -+namespace tr1 -+{ -+_GLIBCXX_BEGIN_NAMESPACE_VERSION -+ -+ /** -+ * @defgroup tr1_math_spec_func Mathematical Special Functions -+ * @ingroup numerics -+ * -+ * A collection of advanced mathematical special functions. -+ * @{ -+ */ -+ -+ inline float -+ assoc_laguerref(unsigned int __n, unsigned int __m, float __x) -+ { return __detail::__assoc_laguerre(__n, __m, __x); } -+ -+ inline long double -+ assoc_laguerrel(unsigned int __n, unsigned int __m, long double __x) -+ { -+ return __detail::__assoc_laguerre(__n, __m, __x); -+ } -+ -+ /// 5.2.1.1 Associated Laguerre polynomials. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ assoc_laguerre(unsigned int __n, unsigned int __m, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__assoc_laguerre<__type>(__n, __m, __x); -+ } -+ -+ inline float -+ assoc_legendref(unsigned int __l, unsigned int __m, float __x) -+ { return __detail::__assoc_legendre_p(__l, __m, __x); } -+ -+ inline long double -+ assoc_legendrel(unsigned int __l, unsigned int __m, long double __x) -+ { return __detail::__assoc_legendre_p(__l, __m, __x); } -+ -+ /// 5.2.1.2 Associated Legendre functions. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ assoc_legendre(unsigned int __l, unsigned int __m, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__assoc_legendre_p<__type>(__l, __m, __x); -+ } -+ -+ inline float -+ betaf(float __x, float __y) -+ { return __detail::__beta(__x, __y); } -+ -+ inline long double -+ betal(long double __x, long double __y) -+ { return __detail::__beta(__x, __y); } -+ -+ /// 5.2.1.3 Beta functions. -+ template -+ inline typename __gnu_cxx::__promote_2<_Tpx, _Tpy>::__type -+ beta(_Tpx __x, _Tpy __y) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tpx, _Tpy>::__type __type; -+ return __detail::__beta<__type>(__x, __y); -+ } -+ -+ inline float -+ comp_ellint_1f(float __k) -+ { return __detail::__comp_ellint_1(__k); } -+ -+ inline long double -+ comp_ellint_1l(long double __k) -+ { return __detail::__comp_ellint_1(__k); } -+ -+ /// 5.2.1.4 Complete elliptic integrals of the first kind. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ comp_ellint_1(_Tp __k) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__comp_ellint_1<__type>(__k); -+ } -+ -+ inline float -+ comp_ellint_2f(float __k) -+ { return __detail::__comp_ellint_2(__k); } -+ -+ inline long double -+ comp_ellint_2l(long double __k) -+ { return __detail::__comp_ellint_2(__k); } -+ -+ /// 5.2.1.5 Complete elliptic integrals of the second kind. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ comp_ellint_2(_Tp __k) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__comp_ellint_2<__type>(__k); -+ } -+ -+ inline float -+ comp_ellint_3f(float __k, float __nu) -+ { return __detail::__comp_ellint_3(__k, __nu); } -+ -+ inline long double -+ comp_ellint_3l(long double __k, long double __nu) -+ { return __detail::__comp_ellint_3(__k, __nu); } -+ -+ /// 5.2.1.6 Complete elliptic integrals of the third kind. -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Tpn>::__type -+ comp_ellint_3(_Tp __k, _Tpn __nu) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Tpn>::__type __type; -+ return __detail::__comp_ellint_3<__type>(__k, __nu); -+ } -+ -+ inline float -+ conf_hypergf(float __a, float __c, float __x) -+ { return __detail::__conf_hyperg(__a, __c, __x); } -+ -+ inline long double -+ conf_hypergl(long double __a, long double __c, long double __x) -+ { return __detail::__conf_hyperg(__a, __c, __x); } -+ -+ /// 5.2.1.7 Confluent hypergeometric functions. -+ template -+ inline typename __gnu_cxx::__promote_3<_Tpa, _Tpc, _Tp>::__type -+ conf_hyperg(_Tpa __a, _Tpc __c, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote_3<_Tpa, _Tpc, _Tp>::__type __type; -+ return __detail::__conf_hyperg<__type>(__a, __c, __x); -+ } -+ -+ inline float -+ cyl_bessel_if(float __nu, float __x) -+ { return __detail::__cyl_bessel_i(__nu, __x); } -+ -+ inline long double -+ cyl_bessel_il(long double __nu, long double __x) -+ { return __detail::__cyl_bessel_i(__nu, __x); } -+ -+ /// 5.2.1.8 Regular modified cylindrical Bessel functions. -+ template -+ inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type -+ cyl_bessel_i(_Tpnu __nu, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type; -+ return __detail::__cyl_bessel_i<__type>(__nu, __x); -+ } -+ -+ inline float -+ cyl_bessel_jf(float __nu, float __x) -+ { return __detail::__cyl_bessel_j(__nu, __x); } -+ -+ inline long double -+ cyl_bessel_jl(long double __nu, long double __x) -+ { return __detail::__cyl_bessel_j(__nu, __x); } -+ -+ /// 5.2.1.9 Cylindrical Bessel functions (of the first kind). -+ template -+ inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type -+ cyl_bessel_j(_Tpnu __nu, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type; -+ return __detail::__cyl_bessel_j<__type>(__nu, __x); -+ } -+ -+ inline float -+ cyl_bessel_kf(float __nu, float __x) -+ { return __detail::__cyl_bessel_k(__nu, __x); } -+ -+ inline long double -+ cyl_bessel_kl(long double __nu, long double __x) -+ { return __detail::__cyl_bessel_k(__nu, __x); } -+ -+ /// 5.2.1.10 Irregular modified cylindrical Bessel functions. -+ template -+ inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type -+ cyl_bessel_k(_Tpnu __nu, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type; -+ return __detail::__cyl_bessel_k<__type>(__nu, __x); -+ } -+ -+ inline float -+ cyl_neumannf(float __nu, float __x) -+ { return __detail::__cyl_neumann_n(__nu, __x); } -+ -+ inline long double -+ cyl_neumannl(long double __nu, long double __x) -+ { return __detail::__cyl_neumann_n(__nu, __x); } -+ -+ /// 5.2.1.11 Cylindrical Neumann functions. -+ template -+ inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type -+ cyl_neumann(_Tpnu __nu, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type; -+ return __detail::__cyl_neumann_n<__type>(__nu, __x); -+ } -+ -+ inline float -+ ellint_1f(float __k, float __phi) -+ { return __detail::__ellint_1(__k, __phi); } -+ -+ inline long double -+ ellint_1l(long double __k, long double __phi) -+ { return __detail::__ellint_1(__k, __phi); } -+ -+ /// 5.2.1.12 Incomplete elliptic integrals of the first kind. -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type -+ ellint_1(_Tp __k, _Tpp __phi) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type __type; -+ return __detail::__ellint_1<__type>(__k, __phi); -+ } -+ -+ inline float -+ ellint_2f(float __k, float __phi) -+ { return __detail::__ellint_2(__k, __phi); } -+ -+ inline long double -+ ellint_2l(long double __k, long double __phi) -+ { return __detail::__ellint_2(__k, __phi); } -+ -+ /// 5.2.1.13 Incomplete elliptic integrals of the second kind. -+ template -+ inline typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type -+ ellint_2(_Tp __k, _Tpp __phi) -+ { -+ typedef typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type __type; -+ return __detail::__ellint_2<__type>(__k, __phi); -+ } -+ -+ inline float -+ ellint_3f(float __k, float __nu, float __phi) -+ { return __detail::__ellint_3(__k, __nu, __phi); } -+ -+ inline long double -+ ellint_3l(long double __k, long double __nu, long double __phi) -+ { return __detail::__ellint_3(__k, __nu, __phi); } -+ -+ /// 5.2.1.14 Incomplete elliptic integrals of the third kind. -+ template -+ inline typename __gnu_cxx::__promote_3<_Tp, _Tpn, _Tpp>::__type -+ ellint_3(_Tp __k, _Tpn __nu, _Tpp __phi) -+ { -+ typedef typename __gnu_cxx::__promote_3<_Tp, _Tpn, _Tpp>::__type __type; -+ return __detail::__ellint_3<__type>(__k, __nu, __phi); -+ } -+ -+ inline float -+ expintf(float __x) -+ { return __detail::__expint(__x); } -+ -+ inline long double -+ expintl(long double __x) -+ { return __detail::__expint(__x); } -+ -+ /// 5.2.1.15 Exponential integrals. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ expint(_Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__expint<__type>(__x); -+ } -+ -+ inline float -+ hermitef(unsigned int __n, float __x) -+ { return __detail::__poly_hermite(__n, __x); } -+ -+ inline long double -+ hermitel(unsigned int __n, long double __x) -+ { return __detail::__poly_hermite(__n, __x); } -+ -+ /// 5.2.1.16 Hermite polynomials. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ hermite(unsigned int __n, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__poly_hermite<__type>(__n, __x); -+ } -+ -+ inline float -+ hypergf(float __a, float __b, float __c, float __x) -+ { return __detail::__hyperg(__a, __b, __c, __x); } -+ -+ inline long double -+ hypergl(long double __a, long double __b, long double __c, long double __x) -+ { return __detail::__hyperg(__a, __b, __c, __x); } -+ -+ /// 5.2.1.17 Hypergeometric functions. -+ template -+ inline typename __gnu_cxx::__promote_4<_Tpa, _Tpb, _Tpc, _Tp>::__type -+ hyperg(_Tpa __a, _Tpb __b, _Tpc __c, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote_4<_Tpa, _Tpb, _Tpc, _Tp>::__type __type; -+ return __detail::__hyperg<__type>(__a, __b, __c, __x); -+ } -+ -+ inline float -+ laguerref(unsigned int __n, float __x) -+ { return __detail::__laguerre(__n, __x); } -+ -+ inline long double -+ laguerrel(unsigned int __n, long double __x) -+ { return __detail::__laguerre(__n, __x); } -+ -+ /// 5.2.1.18 Laguerre polynomials. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ laguerre(unsigned int __n, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__laguerre<__type>(__n, __x); -+ } -+ -+ inline float -+ legendref(unsigned int __n, float __x) -+ { return __detail::__poly_legendre_p(__n, __x); } -+ -+ inline long double -+ legendrel(unsigned int __n, long double __x) -+ { return __detail::__poly_legendre_p(__n, __x); } -+ -+ /// 5.2.1.19 Legendre polynomials. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ legendre(unsigned int __n, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__poly_legendre_p<__type>(__n, __x); -+ } -+ -+ inline float -+ riemann_zetaf(float __x) -+ { return __detail::__riemann_zeta(__x); } -+ -+ inline long double -+ riemann_zetal(long double __x) -+ { return __detail::__riemann_zeta(__x); } -+ -+ /// 5.2.1.20 Riemann zeta function. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ riemann_zeta(_Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__riemann_zeta<__type>(__x); -+ } -+ -+ inline float -+ sph_besself(unsigned int __n, float __x) -+ { return __detail::__sph_bessel(__n, __x); } -+ -+ inline long double -+ sph_bessell(unsigned int __n, long double __x) -+ { return __detail::__sph_bessel(__n, __x); } -+ -+ /// 5.2.1.21 Spherical Bessel functions. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ sph_bessel(unsigned int __n, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__sph_bessel<__type>(__n, __x); -+ } -+ -+ inline float -+ sph_legendref(unsigned int __l, unsigned int __m, float __theta) -+ { return __detail::__sph_legendre(__l, __m, __theta); } -+ -+ inline long double -+ sph_legendrel(unsigned int __l, unsigned int __m, long double __theta) -+ { return __detail::__sph_legendre(__l, __m, __theta); } -+ -+ /// 5.2.1.22 Spherical associated Legendre functions. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ sph_legendre(unsigned int __l, unsigned int __m, _Tp __theta) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__sph_legendre<__type>(__l, __m, __theta); -+ } -+ -+ inline float -+ sph_neumannf(unsigned int __n, float __x) -+ { return __detail::__sph_neumann(__n, __x); } -+ -+ inline long double -+ sph_neumannl(unsigned int __n, long double __x) -+ { return __detail::__sph_neumann(__n, __x); } -+ -+ /// 5.2.1.23 Spherical Neumann functions. -+ template -+ inline typename __gnu_cxx::__promote<_Tp>::__type -+ sph_neumann(unsigned int __n, _Tp __x) -+ { -+ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -+ return __detail::__sph_neumann<__type>(__n, __x); -+ } -+ -+ /* @} */ // tr1_math_spec_func -+_GLIBCXX_END_NAMESPACE_VERSION -+} -+} -+ -+#endif // _GLIBCXX_TR1_CMATH diff --git a/toolchain/gcc/patches/4.8.4/cflags.patch b/toolchain/gcc/patches/4.8.4/cflags.patch new file mode 100644 index 000000000..4f9de8069 --- /dev/null +++ b/toolchain/gcc/patches/4.8.4/cflags.patch @@ -0,0 +1,231 @@ +diff -Nur gcc-4.8.2.orig/gcc/c-family/c.opt gcc-4.8.2/gcc/c-family/c.opt +--- gcc-4.8.2.orig/gcc/c-family/c.opt 2013-01-19 06:25:25.000000000 +0100 ++++ gcc-4.8.2/gcc/c-family/c.opt 2014-02-23 20:22:48.000000000 +0100 +@@ -379,6 +379,10 @@ + C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration) + This switch is deprecated; use -Werror=implicit-function-declaration instead + ++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 +@@ -949,6 +953,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-4.8.2.orig/gcc/c-family/c-opts.c gcc-4.8.2/gcc/c-family/c-opts.c +--- gcc-4.8.2.orig/gcc/c-family/c-opts.c 2013-02-18 20:42:56.000000000 +0100 ++++ gcc-4.8.2/gcc/c-family/c-opts.c 2014-02-23 20:22:48.000000000 +0100 +@@ -104,6 +104,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); +@@ -491,6 +494,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; +@@ -1027,6 +1036,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-4.8.2.orig/gcc/common.opt gcc-4.8.2/gcc/common.opt +--- gcc-4.8.2.orig/gcc/common.opt 2013-03-14 10:13:36.000000000 +0100 ++++ gcc-4.8.2/gcc/common.opt 2014-02-23 20:22:48.000000000 +0100 +@@ -541,6 +541,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 +@@ -1242,6 +1246,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-4.8.2.orig/gcc/doc/cppopts.texi gcc-4.8.2/gcc/doc/cppopts.texi +--- gcc-4.8.2.orig/gcc/doc/cppopts.texi 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.2/gcc/doc/cppopts.texi 2014-02-23 20:22:48.000000000 +0100 +@@ -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-4.8.2.orig/gcc/doc/invoke.texi gcc-4.8.2/gcc/doc/invoke.texi +--- gcc-4.8.2.orig/gcc/doc/invoke.texi 2013-06-19 21:55:50.000000000 +0200 ++++ gcc-4.8.2/gcc/doc/invoke.texi 2014-02-23 20:22:48.000000000 +0100 +@@ -240,7 +240,7 @@ + -Wconversion -Wcoverage-mismatch -Wno-cpp -Wno-deprecated @gol + -Wno-deprecated-declarations -Wdisabled-optimization @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-y2k @gol +@@ -4807,6 +4807,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 +@@ -6918,7 +6934,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-4.8.2.orig/gcc/java/jvspec.c gcc-4.8.2/gcc/java/jvspec.c +--- gcc-4.8.2.orig/gcc/java/jvspec.c 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.2/gcc/java/jvspec.c 2014-02-23 20:22:48.000000000 +0100 +@@ -626,6 +626,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-4.8.2.orig/gcc/opts.c gcc-4.8.2/gcc/opts.c +--- gcc-4.8.2.orig/gcc/opts.c 2013-03-05 07:01:13.000000000 +0100 ++++ gcc-4.8.2/gcc/opts.c 2014-02-23 20:22:48.000000000 +0100 +@@ -468,8 +468,6 @@ + { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 }, + #endif + { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 }, +- { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 }, +- { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 }, + { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 }, + { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 }, + { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 }, +@@ -488,6 +486,8 @@ + { OPT_LEVELS_2_PLUS, OPT_fhoist_adjacent_loads, 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 +@@ -1423,6 +1423,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/toolchain/gcc/patches/4.8.4/disable-atomics.m68k b/toolchain/gcc/patches/4.8.4/disable-atomics.m68k new file mode 100644 index 000000000..4ab553218 --- /dev/null +++ b/toolchain/gcc/patches/4.8.4/disable-atomics.m68k @@ -0,0 +1,12 @@ +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/toolchain/gcc/patches/4.8.4/disable-tm.m68k b/toolchain/gcc/patches/4.8.4/disable-tm.m68k new file mode 100644 index 000000000..02b5cb854 --- /dev/null +++ b/toolchain/gcc/patches/4.8.4/disable-tm.m68k @@ -0,0 +1,14 @@ +diff -Nur gcc-4.8.3.orig/gcc/config/m68k/uclinux.h gcc-4.8.3/gcc/config/m68k/uclinux.h +--- gcc-4.8.3.orig/gcc/config/m68k/uclinux.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/config/m68k/uclinux.h 2014-08-25 17:03:59.543127685 +0200 +@@ -20,6 +20,10 @@ + along with GCC; see the file COPYING3. If not see + . */ + ++/* Do not use TM clone registry. It breaks -msep-data (-fPIC) code. */ ++/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54584 */ ++#define USE_TM_CLONE_REGISTRY 0 ++ + #undef STARTFILE_SPEC + #define STARTFILE_SPEC \ + "%{mshared-library-id=0|!mshared-library-id=*: crt1.o%s ;: Scrt1.o%s} \ diff --git a/toolchain/gcc/patches/4.8.4/gcc.musl b/toolchain/gcc/patches/4.8.4/gcc.musl new file mode 100644 index 000000000..4150dfcdf --- /dev/null +++ b/toolchain/gcc/patches/4.8.4/gcc.musl @@ -0,0 +1,633 @@ +diff -Nur gcc-4.8.3.orig/fixincludes/mkfixinc.sh gcc-4.8.3/fixincludes/mkfixinc.sh +--- gcc-4.8.3.orig/fixincludes/mkfixinc.sh 2012-10-28 22:42:48.000000000 +0100 ++++ gcc-4.8.3/fixincludes/mkfixinc.sh 2014-05-23 08:22:46.987415702 +0200 +@@ -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-4.8.3.orig/gcc/config/aarch64/aarch64-linux.h gcc-4.8.3/gcc/config/aarch64/aarch64-linux.h +--- gcc-4.8.3.orig/gcc/config/aarch64/aarch64-linux.h 2013-08-13 15:22:18.000000000 +0200 ++++ gcc-4.8.3/gcc/config/aarch64/aarch64-linux.h 2014-05-23 08:22:46.987415702 +0200 +@@ -21,7 +21,11 @@ + #ifndef GCC_AARCH64_LINUX_H + #define GCC_AARCH64_LINUX_H + ++/* The AArch64 port currently supports two dynamic linkers: ++ - ld-linux-aarch64.so.1 - GLIBC dynamic linker ++ - ld-musl-aarch64.so.1 - musl libc dynamic linker */ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" + + #define CPP_SPEC "%{pthread:-D_REENTRANT}" + +diff -Nur gcc-4.8.3.orig/gcc/config/arm/linux-eabi.h gcc-4.8.3/gcc/config/arm/linux-eabi.h +--- gcc-4.8.3.orig/gcc/config/arm/linux-eabi.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/config/arm/linux-eabi.h 2014-05-23 08:22:46.987415702 +0200 +@@ -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-4.8.3.orig/gcc/config/i386/linux64.h gcc-4.8.3/gcc/config/i386/linux64.h +--- gcc-4.8.3.orig/gcc/config/i386/linux64.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/config/i386/linux64.h 2014-05-23 08:22:46.987415702 +0200 +@@ -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-4.8.3.orig/gcc/config/i386/linux.h gcc-4.8.3/gcc/config/i386/linux.h +--- gcc-4.8.3.orig/gcc/config/i386/linux.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/config/i386/linux.h 2014-05-23 08:22:46.987415702 +0200 +@@ -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-4.8.3.orig/gcc/config/linux.h gcc-4.8.3/gcc/config/linux.h +--- gcc-4.8.3.orig/gcc/config/linux.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/config/linux.h 2014-05-23 08:22:46.987415702 +0200 +@@ -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,21 @@ + + #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) + + /* Determine whether the entire c99 runtime + is present in the runtime library. */ + #undef TARGET_C99_FUNCTIONS +-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC) ++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL) + + /* Whether we have sincos that follows the GNU extension. */ + #undef TARGET_HAS_SINCOS +@@ -107,3 +112,74 @@ + /* 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 +diff -Nur gcc-4.8.3.orig/gcc/config/linux.opt gcc-4.8.3/gcc/config/linux.opt +--- gcc-4.8.3.orig/gcc/config/linux.opt 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/config/linux.opt 2014-05-23 08:22:46.987415702 +0200 +@@ -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-4.8.3.orig/gcc/config/microblaze/linux.h gcc-4.8.3/gcc/config/microblaze/linux.h +--- gcc-4.8.3.orig/gcc/config/microblaze/linux.h 2013-03-14 16:43:23.000000000 +0100 ++++ gcc-4.8.3/gcc/config/microblaze/linux.h 2014-05-23 08:22:46.987415702 +0200 +@@ -25,7 +25,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-4.8.3.orig/gcc/config/mips/linux.h gcc-4.8.3/gcc/config/mips/linux.h +--- gcc-4.8.3.orig/gcc/config/mips/linux.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/config/mips/linux.h 2014-05-23 08:22:48.643418636 +0200 +@@ -18,3 +18,10 @@ + . */ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#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 ".so.1" +diff -Nur gcc-4.8.3.orig/gcc/config/rs6000/linux64.h gcc-4.8.3/gcc/config/rs6000/linux64.h +--- gcc-4.8.3.orig/gcc/config/rs6000/linux64.h 2014-04-04 17:10:24.000000000 +0200 ++++ gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-05-23 08:22:48.643418636 +0200 +@@ -374,17 +374,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-4.8.3.orig/gcc/config/rs6000/secureplt.h gcc-4.8.3/gcc/config/rs6000/secureplt.h +--- gcc-4.8.3.orig/gcc/config/rs6000/secureplt.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/config/rs6000/secureplt.h 2014-05-23 08:22:48.643418636 +0200 +@@ -18,3 +18,4 @@ + . */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -Nur gcc-4.8.3.orig/gcc/config/rs6000/sysv4.h gcc-4.8.3/gcc/config/rs6000/sysv4.h +--- gcc-4.8.3.orig/gcc/config/rs6000/sysv4.h 2014-04-04 16:50:31.000000000 +0200 ++++ gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-05-23 08:22:48.643418636 +0200 +@@ -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. */ + #define CC1_SPEC "%{G*} %(cc1_cpu)" \ +@@ -585,7 +588,8 @@ + + /* 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 "\ +@@ -763,15 +767,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} \ +@@ -894,6 +901,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-4.8.3.orig/gcc/config/sh/linux.h gcc-4.8.3/gcc/config/sh/linux.h +--- gcc-4.8.3.orig/gcc/config/sh/linux.h 2013-03-14 04:01:53.000000000 +0100 ++++ gcc-4.8.3/gcc/config/sh/linux.h 2014-05-23 08:22:48.643418636 +0200 +@@ -43,7 +43,14 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + ++#if TARGET_ENDIAN_DEFAULT == 0 /* 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-4.8.3.orig/gcc/config.gcc gcc-4.8.3/gcc/config.gcc +--- gcc-4.8.3.orig/gcc/config.gcc 2014-05-06 17:29:04.000000000 +0200 ++++ gcc-4.8.3/gcc/config.gcc 2014-05-23 08:22:49.895420854 +0200 +@@ -550,7 +550,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" + + # Common parts for widely ported systems. + case ${target} in +@@ -653,6 +653,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" + ;; +@@ -2135,6 +2138,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-4.8.3.orig/gcc/configure gcc-4.8.3/gcc/configure +--- gcc-4.8.3.orig/gcc/configure 2014-04-28 12:05:29.000000000 +0200 ++++ gcc-4.8.3/gcc/configure 2014-05-23 08:22:49.903420868 +0200 +@@ -26821,6 +26821,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. +@@ -26854,6 +26857,7 @@ + # ) 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" +@@ -26936,6 +26940,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-4.8.3.orig/gcc/configure.ac gcc-4.8.3/gcc/configure.ac +--- gcc-4.8.3.orig/gcc/configure.ac 2014-04-28 12:05:29.000000000 +0200 ++++ gcc-4.8.3/gcc/configure.ac 2014-05-23 08:22:49.903420868 +0200 +@@ -4750,6 +4750,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. +@@ -4783,6 +4786,7 @@ + # ) 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], +@@ -4848,6 +4852,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-4.8.3.orig/gcc/ginclude/stddef.h gcc-4.8.3/gcc/ginclude/stddef.h +--- gcc-4.8.3.orig/gcc/ginclude/stddef.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/ginclude/stddef.h 2014-05-23 08:22:49.903420868 +0200 +@@ -181,6 +181,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 +@@ -197,6 +198,7 @@ + #define ___int_size_t_h + #define _GCC_SIZE_T + #define _SIZET_ ++#define __DEFINED_size_t /* musl */ + #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ + || defined(__FreeBSD_kernel__) + /* __size_t is a typedef on FreeBSD 5, must not trash it. */ +@@ -214,6 +216,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-4.8.3.orig/libgcc/unwind-dw2-fde-dip.c gcc-4.8.3/libgcc/unwind-dw2-fde-dip.c +--- gcc-4.8.3.orig/libgcc/unwind-dw2-fde-dip.c 2013-02-04 20:06:20.000000000 +0100 ++++ gcc-4.8.3/libgcc/unwind-dw2-fde-dip.c 2014-05-23 08:22:49.955420959 +0200 +@@ -46,33 +46,13 @@ + #include "unwind-compat.h" + #include "gthr.h" + +-#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))) +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__BIONIC__) +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__FreeBSD__) && __FreeBSD__ >= 7 +-# define ElfW __ElfN +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__OpenBSD__) +-# define ElfW(type) Elf_##type +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(TARGET_DL_ITERATE_PHDR) \ +- && defined(__sun__) && defined(__svr4__) ++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) + # define USE_PT_GNU_EH_FRAME ++# ifdef __OpenBSD__ ++# define ElfW(type) Elf_##typ ++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7 ++# define ElfW __ElfN ++# endif + #endif + + #if defined(USE_PT_GNU_EH_FRAME) +diff -Nur gcc-4.8.3.orig/libgomp/config/posix/time.c gcc-4.8.3/libgomp/config/posix/time.c +--- gcc-4.8.3.orig/libgomp/config/posix/time.c 2013-01-14 19:18:49.000000000 +0100 ++++ gcc-4.8.3/libgomp/config/posix/time.c 2014-05-23 08:22:49.975420996 +0200 +@@ -28,6 +28,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 + #if TIME_WITH_SYS_TIME +diff -Nur gcc-4.8.3.orig/libitm/config/arm/hwcap.cc gcc-4.8.3/libitm/config/arm/hwcap.cc +--- gcc-4.8.3.orig/libitm/config/arm/hwcap.cc 2013-02-03 18:46:11.000000000 +0100 ++++ gcc-4.8.3/libitm/config/arm/hwcap.cc 2014-05-23 08:22:49.979421003 +0200 +@@ -40,7 +40,11 @@ + + #ifdef __linux__ + #include ++#ifdef __GLIBC__ + #include ++#else ++#include ++#endif + #include + + static void __attribute__((constructor)) +diff -Nur gcc-4.8.3.orig/libitm/config/linux/x86/tls.h gcc-4.8.3/libitm/config/linux/x86/tls.h +--- gcc-4.8.3.orig/libitm/config/linux/x86/tls.h 2013-02-03 18:46:11.000000000 +0100 ++++ gcc-4.8.3/libitm/config/linux/x86/tls.h 2014-05-23 08:22:49.999421038 +0200 +@@ -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-4.8.3.orig/libstdc++-v3/configure.host gcc-4.8.3/libstdc++-v3/configure.host +--- gcc-4.8.3.orig/libstdc++-v3/configure.host 2013-06-19 03:18:38.000000000 +0200 ++++ gcc-4.8.3/libstdc++-v3/configure.host 2014-05-23 08:22:50.015421065 +0200 +@@ -264,6 +264,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 +@@ -272,6 +279,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; diff --git a/toolchain/gcc/patches/4.8.4/uclibc-cmath.ppc b/toolchain/gcc/patches/4.8.4/uclibc-cmath.ppc new file mode 100644 index 000000000..81bd123fc --- /dev/null +++ b/toolchain/gcc/patches/4.8.4/uclibc-cmath.ppc @@ -0,0 +1,1878 @@ +diff -Nur gcc-4.8.3.orig/libstdc++-v3/include/c_global/cmath gcc-4.8.3/libstdc++-v3/include/c_global/cmath +--- gcc-4.8.3.orig/libstdc++-v3/include/c_global/cmath 2013-02-03 18:54:05.000000000 +0100 ++++ gcc-4.8.3/libstdc++-v3/include/c_global/cmath 2014-07-27 07:24:43.600272987 +0200 +@@ -1040,143 +1040,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.8.3.orig/libstdc++-v3/include/tr1/cmath gcc-4.8.3/libstdc++-v3/include/tr1/cmath +--- gcc-4.8.3.orig/libstdc++-v3/include/tr1/cmath 2013-02-03 18:54:05.000000000 +0100 ++++ gcc-4.8.3/libstdc++-v3/include/tr1/cmath 2014-07-26 12:58:43.652151897 +0200 +@@ -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 + +diff -Nur gcc-4.8.3.orig/libstdc++-v3/include/tr1/cmath.orig gcc-4.8.3/libstdc++-v3/include/tr1/cmath.orig +--- gcc-4.8.3.orig/libstdc++-v3/include/tr1/cmath.orig 1970-01-01 01:00:00.000000000 +0100 ++++ gcc-4.8.3/libstdc++-v3/include/tr1/cmath.orig 2013-02-03 18:54:05.000000000 +0100 +@@ -0,0 +1,1440 @@ ++// TR1 cmath -*- C++ -*- ++ ++// Copyright (C) 2006-2013 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library is free ++// software; you can redistribute it and/or modify it under the ++// terms of the GNU General Public License as published by the ++// Free Software Foundation; either version 3, or (at your option) ++// any later version. ++ ++// This library is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++ ++// Under Section 7 of GPL version 3, you are granted additional ++// permissions described in the GCC Runtime Library Exception, version ++// 3.1, as published by the Free Software Foundation. ++ ++// You should have received a copy of the GNU General Public License and ++// a copy of the GCC Runtime Library Exception along with this program; ++// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++// . ++ ++/** @file tr1/cmath ++ * This is a TR1 C++ Library header. ++ */ ++ ++#ifndef _GLIBCXX_TR1_CMATH ++#define _GLIBCXX_TR1_CMATH 1 ++ ++#pragma GCC system_header ++ ++#include ++ ++#ifdef _GLIBCXX_USE_C99_MATH_TR1 ++ ++#undef acosh ++#undef acoshf ++#undef acoshl ++#undef asinh ++#undef asinhf ++#undef asinhl ++#undef atanh ++#undef atanhf ++#undef atanhl ++#undef cbrt ++#undef cbrtf ++#undef cbrtl ++#undef copysign ++#undef copysignf ++#undef copysignl ++#undef erf ++#undef erff ++#undef erfl ++#undef erfc ++#undef erfcf ++#undef erfcl ++#undef exp2 ++#undef exp2f ++#undef exp2l ++#undef expm1 ++#undef expm1f ++#undef expm1l ++#undef fdim ++#undef fdimf ++#undef fdiml ++#undef fma ++#undef fmaf ++#undef fmal ++#undef fmax ++#undef fmaxf ++#undef fmaxl ++#undef fmin ++#undef fminf ++#undef fminl ++#undef hypot ++#undef hypotf ++#undef hypotl ++#undef ilogb ++#undef ilogbf ++#undef ilogbl ++#undef lgamma ++#undef lgammaf ++#undef lgammal ++#undef llrint ++#undef llrintf ++#undef llrintl ++#undef llround ++#undef llroundf ++#undef llroundl ++#undef log1p ++#undef log1pf ++#undef log1pl ++#undef log2 ++#undef log2f ++#undef log2l ++#undef logb ++#undef logbf ++#undef logbl ++#undef lrint ++#undef lrintf ++#undef lrintl ++#undef lround ++#undef lroundf ++#undef lroundl ++#undef nan ++#undef nanf ++#undef nanl ++#undef nearbyint ++#undef nearbyintf ++#undef nearbyintl ++#undef nextafter ++#undef nextafterf ++#undef nextafterl ++#undef nexttoward ++#undef nexttowardf ++#undef nexttowardl ++#undef remainder ++#undef remainderf ++#undef remainderl ++#undef remquo ++#undef remquof ++#undef remquol ++#undef rint ++#undef rintf ++#undef rintl ++#undef round ++#undef roundf ++#undef roundl ++#undef scalbln ++#undef scalblnf ++#undef scalblnl ++#undef scalbn ++#undef scalbnf ++#undef scalbnl ++#undef tgamma ++#undef tgammaf ++#undef tgammal ++#undef trunc ++#undef truncf ++#undef truncl ++ ++#endif ++ ++namespace std _GLIBCXX_VISIBILITY(default) ++{ ++namespace tr1 ++{ ++_GLIBCXX_BEGIN_NAMESPACE_VERSION ++ ++#if _GLIBCXX_USE_C99_MATH_TR1 ++ ++ // types ++ using ::double_t; ++ using ::float_t; ++ ++ // functions ++ using ::acosh; ++ using ::acoshf; ++ using ::acoshl; ++ ++ using ::asinh; ++ using ::asinhf; ++ using ::asinhl; ++ ++ using ::atanh; ++ using ::atanhf; ++ using ::atanhl; ++ ++ using ::cbrt; ++ using ::cbrtf; ++ using ::cbrtl; ++ ++ using ::copysign; ++ using ::copysignf; ++ using ::copysignl; ++ ++ using ::erf; ++ using ::erff; ++ using ::erfl; ++ ++ using ::erfc; ++ using ::erfcf; ++ using ::erfcl; ++ ++ using ::exp2; ++ using ::exp2f; ++ using ::exp2l; ++ ++ using ::expm1; ++ using ::expm1f; ++ using ::expm1l; ++ ++ using ::fdim; ++ using ::fdimf; ++ using ::fdiml; ++ ++ using ::fma; ++ using ::fmaf; ++ using ::fmal; ++ ++ using ::fmax; ++ using ::fmaxf; ++ using ::fmaxl; ++ ++ using ::fmin; ++ using ::fminf; ++ using ::fminl; ++ ++ using ::hypot; ++ using ::hypotf; ++ using ::hypotl; ++ ++ using ::ilogb; ++ using ::ilogbf; ++ using ::ilogbl; ++ ++ using ::lgamma; ++ using ::lgammaf; ++ using ::lgammal; ++ ++ using ::llrint; ++ using ::llrintf; ++ using ::llrintl; ++ ++ using ::llround; ++ using ::llroundf; ++ using ::llroundl; ++ ++ using ::log1p; ++ using ::log1pf; ++ using ::log1pl; ++ ++ using ::log2; ++ using ::log2f; ++ using ::log2l; ++ ++ using ::logb; ++ using ::logbf; ++ using ::logbl; ++ ++ using ::lrint; ++ using ::lrintf; ++ using ::lrintl; ++ ++ using ::lround; ++ using ::lroundf; ++ using ::lroundl; ++ ++ using ::nan; ++ using ::nanf; ++ using ::nanl; ++ ++ using ::nearbyint; ++ using ::nearbyintf; ++ using ::nearbyintl; ++ ++ using ::nextafter; ++ using ::nextafterf; ++ using ::nextafterl; ++ ++ using ::nexttoward; ++ using ::nexttowardf; ++ using ::nexttowardl; ++ ++ using ::remainder; ++ using ::remainderf; ++ using ::remainderl; ++ ++ using ::remquo; ++ using ::remquof; ++ using ::remquol; ++ ++ using ::rint; ++ using ::rintf; ++ using ::rintl; ++ ++ using ::round; ++ using ::roundf; ++ using ::roundl; ++ ++ using ::scalbln; ++ using ::scalblnf; ++ using ::scalblnl; ++ ++ using ::scalbn; ++ using ::scalbnf; ++ using ::scalbnl; ++ ++ using ::tgamma; ++ using ::tgammaf; ++ using ::tgammal; ++ ++ using ::trunc; ++ using ::truncf; ++ using ::truncl; ++ ++#endif ++ ++#if _GLIBCXX_USE_C99_MATH ++#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC ++ ++ /// Function template definitions [8.16.3]. ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ fpclassify(_Tp __f) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, ++ FP_SUBNORMAL, FP_ZERO, __type(__f)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ isfinite(_Tp __f) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_isfinite(__type(__f)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ isinf(_Tp __f) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_isinf(__type(__f)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ isnan(_Tp __f) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_isnan(__type(__f)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ isnormal(_Tp __f) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_isnormal(__type(__f)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ signbit(_Tp __f) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_signbit(__type(__f)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ isgreater(_Tp __f1, _Tp __f2) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_isgreater(__type(__f1), __type(__f2)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ isgreaterequal(_Tp __f1, _Tp __f2) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_isgreaterequal(__type(__f1), __type(__f2)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ isless(_Tp __f1, _Tp __f2) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_isless(__type(__f1), __type(__f2)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ islessequal(_Tp __f1, _Tp __f2) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_islessequal(__type(__f1), __type(__f2)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ islessgreater(_Tp __f1, _Tp __f2) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_islessgreater(__type(__f1), __type(__f2)); ++ } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, ++ int>::__type ++ isunordered(_Tp __f1, _Tp __f2) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __builtin_isunordered(__type(__f1), __type(__f2)); ++ } ++ ++#endif ++#endif ++ ++#if _GLIBCXX_USE_C99_MATH_TR1 ++ ++ /// Additional overloads [8.16.4]. ++ using std::acos; ++ ++ inline float ++ acosh(float __x) ++ { return __builtin_acoshf(__x); } ++ ++ inline long double ++ acosh(long double __x) ++ { return __builtin_acoshl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ acosh(_Tp __x) ++ { return __builtin_acosh(__x); } ++ ++ using std::asin; ++ ++ inline float ++ asinh(float __x) ++ { return __builtin_asinhf(__x); } ++ ++ inline long double ++ asinh(long double __x) ++ { return __builtin_asinhl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ asinh(_Tp __x) ++ { return __builtin_asinh(__x); } ++ ++ using std::atan; ++ using std::atan2; ++ ++ inline float ++ atanh(float __x) ++ { return __builtin_atanhf(__x); } ++ ++ inline long double ++ atanh(long double __x) ++ { return __builtin_atanhl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ atanh(_Tp __x) ++ { return __builtin_atanh(__x); } ++ ++ inline float ++ cbrt(float __x) ++ { return __builtin_cbrtf(__x); } ++ ++ inline long double ++ cbrt(long double __x) ++ { return __builtin_cbrtl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ cbrt(_Tp __x) ++ { return __builtin_cbrt(__x); } ++ ++ using std::ceil; ++ ++ inline float ++ copysign(float __x, float __y) ++ { return __builtin_copysignf(__x, __y); } ++ ++ inline long double ++ copysign(long double __x, long double __y) ++ { return __builtin_copysignl(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ copysign(_Tp __x, _Up __y) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return copysign(__type(__x), __type(__y)); ++ } ++ ++ using std::cos; ++ using std::cosh; ++ ++ inline float ++ erf(float __x) ++ { return __builtin_erff(__x); } ++ ++ inline long double ++ erf(long double __x) ++ { return __builtin_erfl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ erf(_Tp __x) ++ { return __builtin_erf(__x); } ++ ++ inline float ++ erfc(float __x) ++ { return __builtin_erfcf(__x); } ++ ++ inline long double ++ erfc(long double __x) ++ { return __builtin_erfcl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ erfc(_Tp __x) ++ { return __builtin_erfc(__x); } ++ ++ using std::exp; ++ ++ inline float ++ exp2(float __x) ++ { return __builtin_exp2f(__x); } ++ ++ inline long double ++ exp2(long double __x) ++ { return __builtin_exp2l(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ exp2(_Tp __x) ++ { return __builtin_exp2(__x); } ++ ++ inline float ++ expm1(float __x) ++ { return __builtin_expm1f(__x); } ++ ++ inline long double ++ expm1(long double __x) ++ { return __builtin_expm1l(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ expm1(_Tp __x) ++ { return __builtin_expm1(__x); } ++ ++ // Note: we deal with fabs in a special way, because an using std::fabs ++ // would bring in also the overloads for complex types, which in C++0x ++ // mode have a different return type. ++ // With __CORRECT_ISO_CPP_MATH_H_PROTO, math.h imports std::fabs in the ++ // global namespace after the declarations of the float / double / long ++ // double overloads but before the std::complex overloads. ++ using ::fabs; ++ ++#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO ++ inline float ++ fabs(float __x) ++ { return __builtin_fabsf(__x); } ++ ++ inline long double ++ fabs(long double __x) ++ { return __builtin_fabsl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ fabs(_Tp __x) ++ { return __builtin_fabs(__x); } ++#endif ++ ++ inline float ++ fdim(float __x, float __y) ++ { return __builtin_fdimf(__x, __y); } ++ ++ inline long double ++ fdim(long double __x, long double __y) ++ { return __builtin_fdiml(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ fdim(_Tp __x, _Up __y) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return fdim(__type(__x), __type(__y)); ++ } ++ ++ using std::floor; ++ ++ inline float ++ fma(float __x, float __y, float __z) ++ { return __builtin_fmaf(__x, __y, __z); } ++ ++ inline long double ++ fma(long double __x, long double __y, long double __z) ++ { return __builtin_fmal(__x, __y, __z); } ++ ++ template ++ inline typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type ++ fma(_Tp __x, _Up __y, _Vp __z) ++ { ++ typedef typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type __type; ++ return fma(__type(__x), __type(__y), __type(__z)); ++ } ++ ++ inline float ++ fmax(float __x, float __y) ++ { return __builtin_fmaxf(__x, __y); } ++ ++ inline long double ++ fmax(long double __x, long double __y) ++ { return __builtin_fmaxl(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ fmax(_Tp __x, _Up __y) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return fmax(__type(__x), __type(__y)); ++ } ++ ++ inline float ++ fmin(float __x, float __y) ++ { return __builtin_fminf(__x, __y); } ++ ++ inline long double ++ fmin(long double __x, long double __y) ++ { return __builtin_fminl(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ fmin(_Tp __x, _Up __y) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return fmin(__type(__x), __type(__y)); ++ } ++ ++ using std::fmod; ++ using std::frexp; ++ ++ inline float ++ hypot(float __x, float __y) ++ { return __builtin_hypotf(__x, __y); } ++ ++ inline long double ++ hypot(long double __x, long double __y) ++ { return __builtin_hypotl(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ hypot(_Tp __y, _Up __x) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return hypot(__type(__y), __type(__x)); ++ } ++ ++ inline int ++ ilogb(float __x) ++ { return __builtin_ilogbf(__x); } ++ ++ inline int ++ ilogb(long double __x) ++ { return __builtin_ilogbl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ int>::__type ++ ilogb(_Tp __x) ++ { return __builtin_ilogb(__x); } ++ ++ using std::ldexp; ++ ++ inline float ++ lgamma(float __x) ++ { return __builtin_lgammaf(__x); } ++ ++ inline long double ++ lgamma(long double __x) ++ { return __builtin_lgammal(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ lgamma(_Tp __x) ++ { return __builtin_lgamma(__x); } ++ ++ inline long long ++ llrint(float __x) ++ { return __builtin_llrintf(__x); } ++ ++ inline long long ++ llrint(long double __x) ++ { return __builtin_llrintl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ long long>::__type ++ llrint(_Tp __x) ++ { return __builtin_llrint(__x); } ++ ++ inline long long ++ llround(float __x) ++ { return __builtin_llroundf(__x); } ++ ++ inline long long ++ llround(long double __x) ++ { return __builtin_llroundl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ long long>::__type ++ llround(_Tp __x) ++ { return __builtin_llround(__x); } ++ ++ using std::log; ++ using std::log10; ++ ++ inline float ++ log1p(float __x) ++ { return __builtin_log1pf(__x); } ++ ++ inline long double ++ log1p(long double __x) ++ { return __builtin_log1pl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ log1p(_Tp __x) ++ { return __builtin_log1p(__x); } ++ ++ // DR 568. ++ inline float ++ log2(float __x) ++ { return __builtin_log2f(__x); } ++ ++ inline long double ++ log2(long double __x) ++ { return __builtin_log2l(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ log2(_Tp __x) ++ { return __builtin_log2(__x); } ++ ++ inline float ++ logb(float __x) ++ { return __builtin_logbf(__x); } ++ ++ inline long double ++ logb(long double __x) ++ { return __builtin_logbl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ logb(_Tp __x) ++ { ++ return __builtin_logb(__x); ++ } ++ ++ inline long ++ lrint(float __x) ++ { return __builtin_lrintf(__x); } ++ ++ inline long ++ lrint(long double __x) ++ { return __builtin_lrintl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ long>::__type ++ lrint(_Tp __x) ++ { return __builtin_lrint(__x); } ++ ++ inline long ++ lround(float __x) ++ { return __builtin_lroundf(__x); } ++ ++ inline long ++ lround(long double __x) ++ { return __builtin_lroundl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ long>::__type ++ lround(_Tp __x) ++ { return __builtin_lround(__x); } ++ ++ inline float ++ nearbyint(float __x) ++ { return __builtin_nearbyintf(__x); } ++ ++ inline long double ++ nearbyint(long double __x) ++ { return __builtin_nearbyintl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ nearbyint(_Tp __x) ++ { return __builtin_nearbyint(__x); } ++ ++ inline float ++ nextafter(float __x, float __y) ++ { return __builtin_nextafterf(__x, __y); } ++ ++ inline long double ++ nextafter(long double __x, long double __y) ++ { return __builtin_nextafterl(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ nextafter(_Tp __x, _Up __y) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return nextafter(__type(__x), __type(__y)); ++ } ++ ++ inline float ++ nexttoward(float __x, long double __y) ++ { return __builtin_nexttowardf(__x, __y); } ++ ++ inline long double ++ nexttoward(long double __x, long double __y) ++ { return __builtin_nexttowardl(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ nexttoward(_Tp __x, long double __y) ++ { return __builtin_nexttoward(__x, __y); } ++ ++ // DR 550. What should the return type of pow(float,int) be? ++ // NB: C++0x and TR1 != C++03. ++ // using std::pow; ++ ++ inline float ++ remainder(float __x, float __y) ++ { return __builtin_remainderf(__x, __y); } ++ ++ inline long double ++ remainder(long double __x, long double __y) ++ { return __builtin_remainderl(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ remainder(_Tp __x, _Up __y) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return remainder(__type(__x), __type(__y)); ++ } ++ ++ inline float ++ remquo(float __x, float __y, int* __pquo) ++ { return __builtin_remquof(__x, __y, __pquo); } ++ ++ inline long double ++ remquo(long double __x, long double __y, int* __pquo) ++ { return __builtin_remquol(__x, __y, __pquo); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ remquo(_Tp __x, _Up __y, int* __pquo) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return remquo(__type(__x), __type(__y), __pquo); ++ } ++ ++ inline float ++ rint(float __x) ++ { return __builtin_rintf(__x); } ++ ++ inline long double ++ rint(long double __x) ++ { return __builtin_rintl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ rint(_Tp __x) ++ { return __builtin_rint(__x); } ++ ++ inline float ++ round(float __x) ++ { return __builtin_roundf(__x); } ++ ++ inline long double ++ round(long double __x) ++ { return __builtin_roundl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ round(_Tp __x) ++ { return __builtin_round(__x); } ++ ++ inline float ++ scalbln(float __x, long __ex) ++ { return __builtin_scalblnf(__x, __ex); } ++ ++ inline long double ++ scalbln(long double __x, long __ex) ++ { return __builtin_scalblnl(__x, __ex); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ scalbln(_Tp __x, long __ex) ++ { return __builtin_scalbln(__x, __ex); } ++ ++ inline float ++ scalbn(float __x, int __ex) ++ { return __builtin_scalbnf(__x, __ex); } ++ ++ inline long double ++ scalbn(long double __x, int __ex) ++ { return __builtin_scalbnl(__x, __ex); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ scalbn(_Tp __x, int __ex) ++ { return __builtin_scalbn(__x, __ex); } ++ ++ using std::sin; ++ using std::sinh; ++ using std::sqrt; ++ using std::tan; ++ using std::tanh; ++ ++ inline float ++ tgamma(float __x) ++ { return __builtin_tgammaf(__x); } ++ ++ inline long double ++ tgamma(long double __x) ++ { return __builtin_tgammal(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ tgamma(_Tp __x) ++ { return __builtin_tgamma(__x); } ++ ++ inline float ++ trunc(float __x) ++ { return __builtin_truncf(__x); } ++ ++ inline long double ++ trunc(long double __x) ++ { return __builtin_truncl(__x); } ++ ++ template ++ inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, ++ double>::__type ++ trunc(_Tp __x) ++ { return __builtin_trunc(__x); } ++ ++#endif ++_GLIBCXX_END_NAMESPACE_VERSION ++} ++} ++ ++namespace std _GLIBCXX_VISIBILITY(default) ++{ ++namespace tr1 ++{ ++_GLIBCXX_BEGIN_NAMESPACE_VERSION ++ ++ // DR 550. What should the return type of pow(float,int) be? ++ // NB: C++0x and TR1 != C++03. ++ inline double ++ pow(double __x, double __y) ++ { return std::pow(__x, __y); } ++ ++ inline float ++ pow(float __x, float __y) ++ { return std::pow(__x, __y); } ++ ++ inline long double ++ pow(long double __x, long double __y) ++ { return std::pow(__x, __y); } ++ ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type ++ pow(_Tp __x, _Up __y) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; ++ return std::pow(__type(__x), __type(__y)); ++ } ++ ++_GLIBCXX_END_NAMESPACE_VERSION ++} ++} ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++namespace std _GLIBCXX_VISIBILITY(default) ++{ ++namespace tr1 ++{ ++_GLIBCXX_BEGIN_NAMESPACE_VERSION ++ ++ /** ++ * @defgroup tr1_math_spec_func Mathematical Special Functions ++ * @ingroup numerics ++ * ++ * A collection of advanced mathematical special functions. ++ * @{ ++ */ ++ ++ inline float ++ assoc_laguerref(unsigned int __n, unsigned int __m, float __x) ++ { return __detail::__assoc_laguerre(__n, __m, __x); } ++ ++ inline long double ++ assoc_laguerrel(unsigned int __n, unsigned int __m, long double __x) ++ { ++ return __detail::__assoc_laguerre(__n, __m, __x); ++ } ++ ++ /// 5.2.1.1 Associated Laguerre polynomials. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ assoc_laguerre(unsigned int __n, unsigned int __m, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__assoc_laguerre<__type>(__n, __m, __x); ++ } ++ ++ inline float ++ assoc_legendref(unsigned int __l, unsigned int __m, float __x) ++ { return __detail::__assoc_legendre_p(__l, __m, __x); } ++ ++ inline long double ++ assoc_legendrel(unsigned int __l, unsigned int __m, long double __x) ++ { return __detail::__assoc_legendre_p(__l, __m, __x); } ++ ++ /// 5.2.1.2 Associated Legendre functions. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ assoc_legendre(unsigned int __l, unsigned int __m, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__assoc_legendre_p<__type>(__l, __m, __x); ++ } ++ ++ inline float ++ betaf(float __x, float __y) ++ { return __detail::__beta(__x, __y); } ++ ++ inline long double ++ betal(long double __x, long double __y) ++ { return __detail::__beta(__x, __y); } ++ ++ /// 5.2.1.3 Beta functions. ++ template ++ inline typename __gnu_cxx::__promote_2<_Tpx, _Tpy>::__type ++ beta(_Tpx __x, _Tpy __y) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tpx, _Tpy>::__type __type; ++ return __detail::__beta<__type>(__x, __y); ++ } ++ ++ inline float ++ comp_ellint_1f(float __k) ++ { return __detail::__comp_ellint_1(__k); } ++ ++ inline long double ++ comp_ellint_1l(long double __k) ++ { return __detail::__comp_ellint_1(__k); } ++ ++ /// 5.2.1.4 Complete elliptic integrals of the first kind. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ comp_ellint_1(_Tp __k) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__comp_ellint_1<__type>(__k); ++ } ++ ++ inline float ++ comp_ellint_2f(float __k) ++ { return __detail::__comp_ellint_2(__k); } ++ ++ inline long double ++ comp_ellint_2l(long double __k) ++ { return __detail::__comp_ellint_2(__k); } ++ ++ /// 5.2.1.5 Complete elliptic integrals of the second kind. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ comp_ellint_2(_Tp __k) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__comp_ellint_2<__type>(__k); ++ } ++ ++ inline float ++ comp_ellint_3f(float __k, float __nu) ++ { return __detail::__comp_ellint_3(__k, __nu); } ++ ++ inline long double ++ comp_ellint_3l(long double __k, long double __nu) ++ { return __detail::__comp_ellint_3(__k, __nu); } ++ ++ /// 5.2.1.6 Complete elliptic integrals of the third kind. ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Tpn>::__type ++ comp_ellint_3(_Tp __k, _Tpn __nu) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Tpn>::__type __type; ++ return __detail::__comp_ellint_3<__type>(__k, __nu); ++ } ++ ++ inline float ++ conf_hypergf(float __a, float __c, float __x) ++ { return __detail::__conf_hyperg(__a, __c, __x); } ++ ++ inline long double ++ conf_hypergl(long double __a, long double __c, long double __x) ++ { return __detail::__conf_hyperg(__a, __c, __x); } ++ ++ /// 5.2.1.7 Confluent hypergeometric functions. ++ template ++ inline typename __gnu_cxx::__promote_3<_Tpa, _Tpc, _Tp>::__type ++ conf_hyperg(_Tpa __a, _Tpc __c, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote_3<_Tpa, _Tpc, _Tp>::__type __type; ++ return __detail::__conf_hyperg<__type>(__a, __c, __x); ++ } ++ ++ inline float ++ cyl_bessel_if(float __nu, float __x) ++ { return __detail::__cyl_bessel_i(__nu, __x); } ++ ++ inline long double ++ cyl_bessel_il(long double __nu, long double __x) ++ { return __detail::__cyl_bessel_i(__nu, __x); } ++ ++ /// 5.2.1.8 Regular modified cylindrical Bessel functions. ++ template ++ inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type ++ cyl_bessel_i(_Tpnu __nu, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type; ++ return __detail::__cyl_bessel_i<__type>(__nu, __x); ++ } ++ ++ inline float ++ cyl_bessel_jf(float __nu, float __x) ++ { return __detail::__cyl_bessel_j(__nu, __x); } ++ ++ inline long double ++ cyl_bessel_jl(long double __nu, long double __x) ++ { return __detail::__cyl_bessel_j(__nu, __x); } ++ ++ /// 5.2.1.9 Cylindrical Bessel functions (of the first kind). ++ template ++ inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type ++ cyl_bessel_j(_Tpnu __nu, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type; ++ return __detail::__cyl_bessel_j<__type>(__nu, __x); ++ } ++ ++ inline float ++ cyl_bessel_kf(float __nu, float __x) ++ { return __detail::__cyl_bessel_k(__nu, __x); } ++ ++ inline long double ++ cyl_bessel_kl(long double __nu, long double __x) ++ { return __detail::__cyl_bessel_k(__nu, __x); } ++ ++ /// 5.2.1.10 Irregular modified cylindrical Bessel functions. ++ template ++ inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type ++ cyl_bessel_k(_Tpnu __nu, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type; ++ return __detail::__cyl_bessel_k<__type>(__nu, __x); ++ } ++ ++ inline float ++ cyl_neumannf(float __nu, float __x) ++ { return __detail::__cyl_neumann_n(__nu, __x); } ++ ++ inline long double ++ cyl_neumannl(long double __nu, long double __x) ++ { return __detail::__cyl_neumann_n(__nu, __x); } ++ ++ /// 5.2.1.11 Cylindrical Neumann functions. ++ template ++ inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type ++ cyl_neumann(_Tpnu __nu, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type; ++ return __detail::__cyl_neumann_n<__type>(__nu, __x); ++ } ++ ++ inline float ++ ellint_1f(float __k, float __phi) ++ { return __detail::__ellint_1(__k, __phi); } ++ ++ inline long double ++ ellint_1l(long double __k, long double __phi) ++ { return __detail::__ellint_1(__k, __phi); } ++ ++ /// 5.2.1.12 Incomplete elliptic integrals of the first kind. ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type ++ ellint_1(_Tp __k, _Tpp __phi) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type __type; ++ return __detail::__ellint_1<__type>(__k, __phi); ++ } ++ ++ inline float ++ ellint_2f(float __k, float __phi) ++ { return __detail::__ellint_2(__k, __phi); } ++ ++ inline long double ++ ellint_2l(long double __k, long double __phi) ++ { return __detail::__ellint_2(__k, __phi); } ++ ++ /// 5.2.1.13 Incomplete elliptic integrals of the second kind. ++ template ++ inline typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type ++ ellint_2(_Tp __k, _Tpp __phi) ++ { ++ typedef typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type __type; ++ return __detail::__ellint_2<__type>(__k, __phi); ++ } ++ ++ inline float ++ ellint_3f(float __k, float __nu, float __phi) ++ { return __detail::__ellint_3(__k, __nu, __phi); } ++ ++ inline long double ++ ellint_3l(long double __k, long double __nu, long double __phi) ++ { return __detail::__ellint_3(__k, __nu, __phi); } ++ ++ /// 5.2.1.14 Incomplete elliptic integrals of the third kind. ++ template ++ inline typename __gnu_cxx::__promote_3<_Tp, _Tpn, _Tpp>::__type ++ ellint_3(_Tp __k, _Tpn __nu, _Tpp __phi) ++ { ++ typedef typename __gnu_cxx::__promote_3<_Tp, _Tpn, _Tpp>::__type __type; ++ return __detail::__ellint_3<__type>(__k, __nu, __phi); ++ } ++ ++ inline float ++ expintf(float __x) ++ { return __detail::__expint(__x); } ++ ++ inline long double ++ expintl(long double __x) ++ { return __detail::__expint(__x); } ++ ++ /// 5.2.1.15 Exponential integrals. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ expint(_Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__expint<__type>(__x); ++ } ++ ++ inline float ++ hermitef(unsigned int __n, float __x) ++ { return __detail::__poly_hermite(__n, __x); } ++ ++ inline long double ++ hermitel(unsigned int __n, long double __x) ++ { return __detail::__poly_hermite(__n, __x); } ++ ++ /// 5.2.1.16 Hermite polynomials. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ hermite(unsigned int __n, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__poly_hermite<__type>(__n, __x); ++ } ++ ++ inline float ++ hypergf(float __a, float __b, float __c, float __x) ++ { return __detail::__hyperg(__a, __b, __c, __x); } ++ ++ inline long double ++ hypergl(long double __a, long double __b, long double __c, long double __x) ++ { return __detail::__hyperg(__a, __b, __c, __x); } ++ ++ /// 5.2.1.17 Hypergeometric functions. ++ template ++ inline typename __gnu_cxx::__promote_4<_Tpa, _Tpb, _Tpc, _Tp>::__type ++ hyperg(_Tpa __a, _Tpb __b, _Tpc __c, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote_4<_Tpa, _Tpb, _Tpc, _Tp>::__type __type; ++ return __detail::__hyperg<__type>(__a, __b, __c, __x); ++ } ++ ++ inline float ++ laguerref(unsigned int __n, float __x) ++ { return __detail::__laguerre(__n, __x); } ++ ++ inline long double ++ laguerrel(unsigned int __n, long double __x) ++ { return __detail::__laguerre(__n, __x); } ++ ++ /// 5.2.1.18 Laguerre polynomials. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ laguerre(unsigned int __n, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__laguerre<__type>(__n, __x); ++ } ++ ++ inline float ++ legendref(unsigned int __n, float __x) ++ { return __detail::__poly_legendre_p(__n, __x); } ++ ++ inline long double ++ legendrel(unsigned int __n, long double __x) ++ { return __detail::__poly_legendre_p(__n, __x); } ++ ++ /// 5.2.1.19 Legendre polynomials. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ legendre(unsigned int __n, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__poly_legendre_p<__type>(__n, __x); ++ } ++ ++ inline float ++ riemann_zetaf(float __x) ++ { return __detail::__riemann_zeta(__x); } ++ ++ inline long double ++ riemann_zetal(long double __x) ++ { return __detail::__riemann_zeta(__x); } ++ ++ /// 5.2.1.20 Riemann zeta function. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ riemann_zeta(_Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__riemann_zeta<__type>(__x); ++ } ++ ++ inline float ++ sph_besself(unsigned int __n, float __x) ++ { return __detail::__sph_bessel(__n, __x); } ++ ++ inline long double ++ sph_bessell(unsigned int __n, long double __x) ++ { return __detail::__sph_bessel(__n, __x); } ++ ++ /// 5.2.1.21 Spherical Bessel functions. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ sph_bessel(unsigned int __n, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__sph_bessel<__type>(__n, __x); ++ } ++ ++ inline float ++ sph_legendref(unsigned int __l, unsigned int __m, float __theta) ++ { return __detail::__sph_legendre(__l, __m, __theta); } ++ ++ inline long double ++ sph_legendrel(unsigned int __l, unsigned int __m, long double __theta) ++ { return __detail::__sph_legendre(__l, __m, __theta); } ++ ++ /// 5.2.1.22 Spherical associated Legendre functions. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ sph_legendre(unsigned int __l, unsigned int __m, _Tp __theta) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__sph_legendre<__type>(__l, __m, __theta); ++ } ++ ++ inline float ++ sph_neumannf(unsigned int __n, float __x) ++ { return __detail::__sph_neumann(__n, __x); } ++ ++ inline long double ++ sph_neumannl(unsigned int __n, long double __x) ++ { return __detail::__sph_neumann(__n, __x); } ++ ++ /// 5.2.1.23 Spherical Neumann functions. ++ template ++ inline typename __gnu_cxx::__promote<_Tp>::__type ++ sph_neumann(unsigned int __n, _Tp __x) ++ { ++ typedef typename __gnu_cxx::__promote<_Tp>::__type __type; ++ return __detail::__sph_neumann<__type>(__n, __x); ++ } ++ ++ /* @} */ // tr1_math_spec_func ++_GLIBCXX_END_NAMESPACE_VERSION ++} ++} ++ ++#endif // _GLIBCXX_TR1_CMATH -- cgit v1.2.3