From df82dd95d88092151bf019966528ab4d24ea5a6d Mon Sep 17 00:00:00 2001 From: rofl0r Date: Mon, 2 Nov 2015 15:36:19 +0000 Subject: [PATCH] add patches for gcc 4.9.3 at least mips support is broken, but microblazed and possibly other archs work. while building mips the following error was encountered: Mode = sf\|df Suffix = si\|2\|3 /tmp/musl-cross-make/gcc-4.9.3/build0/./gcc/xgcc -B/tmp/musl-cross-make/gcc-4.9.3/build0/./gcc/ -B/tmp/musl-cross-make/output/mips-linux-musl/bin/ -B/tmp/musl-cross-make/output/mips-linux-musl/lib/ -isystem /tmp/musl-cross-make/output/mips-linux-musl/include -isystem /tmp/musl-cross-make/output/mips-linux-musl/sys-include -g -O2 -O0 -g0 -minterlink-mips16 -O2 -g -O2 -O0 -g0 -minterlink-mips16 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector -Dinhibit_libc -fPIC -I. -I. -I../.././gcc -I../../../libgcc -I../../../libgcc/. -I../../../libgcc/../gcc -I../../../libgcc/../include -DHAVE_CC_TLS -o subsf3.o -MT subsf3.o -MD -MP -MF subsf3.dep subsf3 -c ../../../libgcc/config/hardfp.c -fvisibility=hidden -DHIDE_EXPORTS -Wno-missing-prototypes xgcc: error: subsf3: No such file or directory make[3]: *** [subsf3.o] Error 1 this seems like a bug in a shell command that's invoked during the build, possibly a sed command using GNU-only syntax. --- patches/gcc-4.9.3/aarch64.diff | 12 ++ patches/gcc-4.9.3/arm.diff | 46 +++++ patches/gcc-4.9.3/gcc-autoconf-musl.diff | 62 +++++++ patches/gcc-4.9.3/gcc-config-musl.diff | 207 +++++++++++++++++++++++ patches/gcc-4.9.3/gcc-ssp.diff | 12 ++ patches/gcc-4.9.3/gomp-posix.diff | 16 ++ patches/gcc-4.9.3/kill-fixincludes.diff | 17 ++ patches/gcc-4.9.3/libstdc++-generic.diff | 31 ++++ patches/gcc-4.9.3/microblaze-size_t.diff | 39 +++++ patches/gcc-4.9.3/microblaze.diff | 31 ++++ patches/gcc-4.9.3/mips-unwind.diff | 12 ++ patches/gcc-4.9.3/mips.diff | 18 ++ patches/gcc-4.9.3/powerpc.diff | 108 ++++++++++++ patches/gcc-4.9.3/sh.diff | 18 ++ patches/gcc-4.9.3/unwind-dliterate.diff | 43 +++++ patches/gcc-4.9.3/x86.diff | 55 ++++++ 16 files changed, 727 insertions(+) create mode 100644 patches/gcc-4.9.3/aarch64.diff create mode 100644 patches/gcc-4.9.3/arm.diff create mode 100644 patches/gcc-4.9.3/gcc-autoconf-musl.diff create mode 100644 patches/gcc-4.9.3/gcc-config-musl.diff create mode 100644 patches/gcc-4.9.3/gcc-ssp.diff create mode 100644 patches/gcc-4.9.3/gomp-posix.diff create mode 100644 patches/gcc-4.9.3/kill-fixincludes.diff create mode 100644 patches/gcc-4.9.3/libstdc++-generic.diff create mode 100644 patches/gcc-4.9.3/microblaze-size_t.diff create mode 100644 patches/gcc-4.9.3/microblaze.diff create mode 100644 patches/gcc-4.9.3/mips-unwind.diff create mode 100644 patches/gcc-4.9.3/mips.diff create mode 100644 patches/gcc-4.9.3/powerpc.diff create mode 100644 patches/gcc-4.9.3/sh.diff create mode 100644 patches/gcc-4.9.3/unwind-dliterate.diff create mode 100644 patches/gcc-4.9.3/x86.diff diff --git a/patches/gcc-4.9.3/aarch64.diff b/patches/gcc-4.9.3/aarch64.diff new file mode 100644 index 0000000..90eb4fa --- /dev/null +++ b/patches/gcc-4.9.3/aarch64.diff @@ -0,0 +1,12 @@ +diff -r 7c6d89fb1832 gcc/config/aarch64/aarch64-linux.h +--- a/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:32:28 2015 -0400 ++++ b/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:32:30 2015 -0400 +@@ -23,6 +23,8 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" + ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" ++ + #define CPP_SPEC "%{pthread:-D_REENTRANT}" + + #define LINUX_TARGET_LINK_SPEC "%{h*} \ diff --git a/patches/gcc-4.9.3/arm.diff b/patches/gcc-4.9.3/arm.diff new file mode 100644 index 0000000..777e0f6 --- /dev/null +++ b/patches/gcc-4.9.3/arm.diff @@ -0,0 +1,46 @@ +# HG changeset patch +# Parent 92d83561106d17ca896328fcb4ec36cd4e2e9e16 +Support for arm-linux-musl. + +diff -r 92d83561106d gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Sun Jul 26 15:32:23 2015 -0400 ++++ b/gcc/config/arm/linux-eabi.h Sun Jul 26 15:32:25 2015 -0400 +@@ -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 -r 92d83561106d libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Sun Jul 26 15:32:23 2015 -0400 ++++ b/libitm/config/arm/hwcap.cc Sun Jul 26 15:32:25 2015 -0400 +@@ -40,7 +40,11 @@ + + #ifdef __linux__ + #include ++#ifdef __GLIBC__ + #include ++#else ++#include ++#endif + #include + + static void __attribute__((constructor)) diff --git a/patches/gcc-4.9.3/gcc-autoconf-musl.diff b/patches/gcc-4.9.3/gcc-autoconf-musl.diff new file mode 100644 index 0000000..dba0077 --- /dev/null +++ b/patches/gcc-4.9.3/gcc-autoconf-musl.diff @@ -0,0 +1,62 @@ +diff -r 3baeaed6c155 gcc/configure +--- a/gcc/configure Sun Jul 26 15:32:15 2015 -0400 ++++ b/gcc/configure Sun Jul 26 15:32:17 2015 -0400 +@@ -27449,6 +27449,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. +@@ -27481,6 +27484,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" +@@ -27570,6 +27574,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 -r 3baeaed6c155 gcc/configure.ac +--- a/gcc/configure.ac Sun Jul 26 15:32:15 2015 -0400 ++++ b/gcc/configure.ac Sun Jul 26 15:32:17 2015 -0400 +@@ -5076,6 +5076,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. +@@ -5102,6 +5105,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], +@@ -5168,6 +5172,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 --git a/patches/gcc-4.9.3/gcc-config-musl.diff b/patches/gcc-4.9.3/gcc-config-musl.diff new file mode 100644 index 0000000..e635573 --- /dev/null +++ b/patches/gcc-4.9.3/gcc-config-musl.diff @@ -0,0 +1,207 @@ +# HG changeset patch +# Parent fef9a6ed009159f294d8524a0bc1dda731990754 +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + +diff -r fef9a6ed0091 gcc/config.gcc +--- a/gcc/config.gcc Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config.gcc Sun Jul 26 15:32:11 2015 -0400 +@@ -594,7 +594,7 @@ + esac + + # Common C libraries. +-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" ++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" + + # 32-bit x86 processors supported by --with-arch=. Each processor + # MUST be separated by exactly one space. +@@ -719,6 +719,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" + ;; +diff -r fef9a6ed0091 gcc/config/linux.h +--- a/gcc/config/linux.h Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config/linux.h Sun Jul 26 15:32:11 2015 -0400 +@@ -32,10 +32,12 @@ + #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) + #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) + #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) ++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) + #else + #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) + #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) + #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) ++#define OPTION_MUSL (linux_libc == LIBC_MUSL) + #endif + + #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ +@@ -53,18 +55,21 @@ + uClibc or Bionic is the default C library and whether + -muclibc or -mglibc or -mbionic has been passed to change the default. */ + +-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ +- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" ++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ ++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" + + #if DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) + #elif DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) + #elif DEFAULT_LIBC == LIBC_BIONIC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) + #else + #error "Unsupported DEFAULT_LIBC" + #endif /* DEFAULT_LIBC */ +@@ -84,21 +89,92 @@ + + #define GNU_USER_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ +- BIONIC_DYNAMIC_LINKER) ++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + #define GNU_USER_DYNAMIC_LINKER32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ +- BIONIC_DYNAMIC_LINKER32) ++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ +- BIONIC_DYNAMIC_LINKER64) ++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + #define GNU_USER_DYNAMIC_LINKERX32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ +- BIONIC_DYNAMIC_LINKERX32) ++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) + + /* Whether we have Bionic libc runtime */ + #undef TARGET_HAS_BIONIC + #define TARGET_HAS_BIONIC (OPTION_BIONIC) + ++/* musl avoids problematic includes by rearranging the include directories. ++ * Unfortunately, this is mostly duplicated from cppdefault.c */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define INCLUDE_DEFAULTS_MUSL_GPP \ ++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ ++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, ++ ++#ifdef LOCAL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_LOCAL \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_LOCAL ++#endif ++ ++#ifdef PREFIX_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_PREFIX ++#endif ++ ++#ifdef CROSS_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_CROSS \ ++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#ifdef TOOL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_TOOL \ ++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_TOOL ++#endif ++ ++#ifdef NATIVE_SYSTEM_HEADER_DIR ++#define INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_NATIVE ++#endif ++ ++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) ++# undef INCLUDE_DEFAULTS_MUSL_LOCAL ++# define INCLUDE_DEFAULTS_MUSL_LOCAL ++# undef INCLUDE_DEFAULTS_MUSL_NATIVE ++# define INCLUDE_DEFAULTS_MUSL_NATIVE ++#else ++# undef INCLUDE_DEFAULTS_MUSL_CROSS ++# define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#undef INCLUDE_DEFAULTS ++#define INCLUDE_DEFAULTS \ ++ { \ ++ INCLUDE_DEFAULTS_MUSL_GPP \ ++ INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ INCLUDE_DEFAULTS_MUSL_CROSS \ ++ INCLUDE_DEFAULTS_MUSL_TOOL \ ++ INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ ++ { 0, 0, 0, 0, 0, 0 } \ ++ } ++#endif ++ + #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ + /* This is a *uclinux* target. We don't define below macros to normal linux + versions, because doing so would require *uclinux* targets to include +diff -r fef9a6ed0091 gcc/config/linux.opt +--- a/gcc/config/linux.opt Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config/linux.opt Sun Jul 26 15:32:11 2015 -0400 +@@ -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 -r fef9a6ed0091 gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/ginclude/stddef.h Sun Jul 26 15:32:11 2015 -0400 +@@ -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 --git a/patches/gcc-4.9.3/gcc-ssp.diff b/patches/gcc-4.9.3/gcc-ssp.diff new file mode 100644 index 0000000..7846623 --- /dev/null +++ b/patches/gcc-4.9.3/gcc-ssp.diff @@ -0,0 +1,12 @@ +diff -r 581c4dd64733 gcc/gcc.c +--- a/gcc/gcc.c Sun Jul 26 15:32:17 2015 -0400 ++++ b/gcc/gcc.c Sun Jul 26 15:32:19 2015 -0400 +@@ -670,7 +670,7 @@ + + #ifndef LINK_SSP_SPEC + #ifdef TARGET_LIBC_PROVIDES_SSP +-#define LINK_SSP_SPEC "%{fstack-protector:}" ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all:-lssp_nonshared}" + #else + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-strong|fstack-protector-all:-lssp_nonshared -lssp}" + #endif diff --git a/patches/gcc-4.9.3/gomp-posix.diff b/patches/gcc-4.9.3/gomp-posix.diff new file mode 100644 index 0000000..7b80fdf --- /dev/null +++ b/patches/gcc-4.9.3/gomp-posix.diff @@ -0,0 +1,16 @@ +# HG changeset patch +# Parent 47dcb1f7b3a9c1b5d6b9d56303e7603fbe5a51f9 +A fix for libgomp to correctly request a POSIX version for time support. + +diff -r 47dcb1f7b3a9 libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Sun Jul 26 15:32:11 2015 -0400 ++++ b/libgomp/config/posix/time.c Sun Jul 26 15:32:13 2015 -0400 +@@ -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 --git a/patches/gcc-4.9.3/kill-fixincludes.diff b/patches/gcc-4.9.3/kill-fixincludes.diff new file mode 100644 index 0000000..b8f8d0c --- /dev/null +++ b/patches/gcc-4.9.3/kill-fixincludes.diff @@ -0,0 +1,17 @@ +# HG changeset patch +# Parent 9f2f4e02fced4d4810910db6cced26ed0d47c23f +Get rid of ever-broken fixincludes on musl. + +diff -r 9f2f4e02fced fixincludes/mkfixinc.sh +--- a/fixincludes/mkfixinc.sh Sun Jul 26 15:32:19 2015 -0400 ++++ b/fixincludes/mkfixinc.sh Sun Jul 26 15:32:21 2015 -0400 +@@ -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 --git a/patches/gcc-4.9.3/libstdc++-generic.diff b/patches/gcc-4.9.3/libstdc++-generic.diff new file mode 100644 index 0000000..de7acff --- /dev/null +++ b/patches/gcc-4.9.3/libstdc++-generic.diff @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent 889b7d97216603795ba8c5f4da8e616bef8feb9d +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + +diff -r 889b7d972166 libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Sun Jul 26 15:30:11 2015 -0400 ++++ b/libstdc++-v3/configure.host Sun Jul 26 15:32:09 2015 -0400 +@@ -266,6 +266,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 +@@ -274,6 +281,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; diff --git a/patches/gcc-4.9.3/microblaze-size_t.diff b/patches/gcc-4.9.3/microblaze-size_t.diff new file mode 100644 index 0000000..9ddc092 --- /dev/null +++ b/patches/gcc-4.9.3/microblaze-size_t.diff @@ -0,0 +1,39 @@ +From 478ee0c03a08e2ef9371fd88d516738936943e78 Mon Sep 17 00:00:00 2001 +From: David Holsgrove +Date: Fri, 28 Sep 2012 16:32:03 +1000 +Subject: [PATCH 06/11] [Patch, microblaze]: Add SIZE_TYPE and PTRDIFF_TYPE to + microblaze.h + +Fixes warnings like; + +warning: format '%zX' expects argument of type 'size_t', +but argument 3 has type 'unsigned int' [-Wformat] + +Changelog + +2013-03-18 David Holsgrove + + * gcc/config/microblaze/microblaze.h: Define SIZE_TYPE + and PTRDIFF_TYPE. + +Signed-off-by: David Holsgrove +--- + gcc/config/microblaze/microblaze.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff -r 97f8346ce240 gcc/config/microblaze/microblaze.h +--- a/gcc/config/microblaze/microblaze.h Sun Jul 26 15:32:32 2015 -0400 ++++ b/gcc/config/microblaze/microblaze.h Sun Jul 26 15:32:34 2015 -0400 +@@ -218,6 +218,12 @@ + #undef PTRDIFF_TYPE + #define PTRDIFF_TYPE "int" + ++#undef SIZE_TYPE ++#define SIZE_TYPE "unsigned int" ++ ++#undef PTRDIFF_TYPE ++#define PTRDIFF_TYPE "int" ++ + #define CONSTANT_ALIGNMENT(EXP, ALIGN) \ + ((TREE_CODE (EXP) == STRING_CST || TREE_CODE (EXP) == CONSTRUCTOR) \ + && (ALIGN) < BITS_PER_WORD \ diff --git a/patches/gcc-4.9.3/microblaze.diff b/patches/gcc-4.9.3/microblaze.diff new file mode 100644 index 0000000..ac5a87f --- /dev/null +++ b/patches/gcc-4.9.3/microblaze.diff @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent d548cc2d1cfea3241205efc347caec8ad78c21d4 +Microblaze support (again). + +diff -r d548cc2d1cfe gcc/config/microblaze/linux.h +--- a/gcc/config/microblaze/linux.h Sun Jul 26 15:32:30 2015 -0400 ++++ b/gcc/config/microblaze/linux.h Sun Jul 26 15:32:32 2015 -0400 +@@ -28,7 +28,22 @@ + #undef TLS_NEEDS_GOT + #define TLS_NEEDS_GOT 1 + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++ ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" ++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER ++#else ++#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER ++#endif ++ ++ + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ + { "dynamic_linker", DYNAMIC_LINKER } diff --git a/patches/gcc-4.9.3/mips-unwind.diff b/patches/gcc-4.9.3/mips-unwind.diff new file mode 100644 index 0000000..bd4c4db --- /dev/null +++ b/patches/gcc-4.9.3/mips-unwind.diff @@ -0,0 +1,12 @@ +--- gcc-4.7.4.org/libgcc/config/mips/linux-unwind.h ++++ gcc-4.7.4/libgcc/config/mips/linux-unwind.h +@@ -28,7 +28,8 @@ + state data appropriately. See unwind-dw2.c for the structs. */ + + #include +-#include ++#include ++#include + + /* The third parameter to the signal handler points to something with + * this structure defined in asm/ucontext.h, but the name clashes with diff --git a/patches/gcc-4.9.3/mips.diff b/patches/gcc-4.9.3/mips.diff new file mode 100644 index 0000000..9ccc516 --- /dev/null +++ b/patches/gcc-4.9.3/mips.diff @@ -0,0 +1,18 @@ +# HG changeset patch +# Parent 270d6afd029dd396b69553e1d96f35d2ebdd2f99 +Support for mips-linux-musl. + +diff -r 270d6afd029d gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Sun Jul 26 15:32:25 2015 -0400 ++++ b/gcc/config/mips/linux.h Sun Jul 26 15:32:26 2015 -0400 +@@ -23,3 +23,10 @@ + #undef UCLIBC_DYNAMIC_LINKER + #define UCLIBC_DYNAMIC_LINKER \ + "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" ++ ++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" diff --git a/patches/gcc-4.9.3/powerpc.diff b/patches/gcc-4.9.3/powerpc.diff new file mode 100644 index 0000000..92276e2 --- /dev/null +++ b/patches/gcc-4.9.3/powerpc.diff @@ -0,0 +1,108 @@ +# HG changeset patch +# Parent 3974ad9269f7e4c5605e0bb38db7418a69e6ee95 +Support for powerpc-linux-musl. + +diff -r 3974ad9269f7 gcc/config.gcc +--- a/gcc/config.gcc Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config.gcc Sun Jul 26 15:32:28 2015 -0400 +@@ -2344,6 +2344,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 -r 3974ad9269f7 gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/linux64.h Sun Jul 26 15:32:28 2015 -0400 +@@ -371,17 +371,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 -r 3974ad9269f7 gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/secureplt.h Sun Jul 26 15:32:28 2015 -0400 +@@ -18,3 +18,4 @@ + . */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -r 3974ad9269f7 gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/sysv4.h Sun Jul 26 15:32:28 2015 -0400 +@@ -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 --git a/patches/gcc-4.9.3/sh.diff b/patches/gcc-4.9.3/sh.diff new file mode 100644 index 0000000..f7be443 --- /dev/null +++ b/patches/gcc-4.9.3/sh.diff @@ -0,0 +1,18 @@ +diff -r c5b39ce7672b gcc/config/sh/linux.h +--- a/gcc/config/sh/linux.h Fri Sep 28 16:32:03 2012 +1000 ++++ b/gcc/config/sh/linux.h Sun Jul 26 15:32:36 2015 -0400 +@@ -43,7 +43,14 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + ++#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ ++#define MUSL_DYNAMIC_LINKER_E "eb" ++#else ++#define MUSL_DYNAMIC_LINKER_E ++#endif ++ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" + + #undef SUBTARGET_LINK_EMUL_SUFFIX + #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" diff --git a/patches/gcc-4.9.3/unwind-dliterate.diff b/patches/gcc-4.9.3/unwind-dliterate.diff new file mode 100644 index 0000000..2add290 --- /dev/null +++ b/patches/gcc-4.9.3/unwind-dliterate.diff @@ -0,0 +1,43 @@ +diff -r ddc4b4034e51 libgcc/unwind-dw2-fde-dip.c +--- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:32:13 2015 -0400 ++++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:32:15 2015 -0400 +@@ -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))) ++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) + # define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && 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__) +-# define USE_PT_GNU_EH_FRAME ++# ifdef __OpenBSD__ ++# define ElfW(type) Elf_##type ++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7 ++# define ElfW __ElfN ++# endif + #endif + + #if defined(USE_PT_GNU_EH_FRAME) diff --git a/patches/gcc-4.9.3/x86.diff b/patches/gcc-4.9.3/x86.diff new file mode 100644 index 0000000..f62f27e --- /dev/null +++ b/patches/gcc-4.9.3/x86.diff @@ -0,0 +1,55 @@ +# HG changeset patch +# Parent ab9383ed51ae0c261e0c860fc6b953eb57976eef +Support for i386-linux-musl and x86_64-linux-musl. + +diff -r ab9383ed51ae gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/gcc/config/i386/linux.h Sun Jul 26 15:32:23 2015 -0400 +@@ -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 -r ab9383ed51ae gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/gcc/config/i386/linux64.h Sun Jul 26 15:32:23 2015 -0400 +@@ -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 -r ab9383ed51ae libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/libitm/config/linux/x86/tls.h Sun Jul 26 15:32:23 2015 -0400 +@@ -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