From 74fb3f1899358be46801dbe3a55b229463df04ab Mon Sep 17 00:00:00 2001 From: rofl0r Date: Mon, 2 Nov 2015 10:15:42 +0000 Subject: [PATCH] add patches for gcc 4.8.5 --- patches/gcc-4.8.5/aarch64.diff | 15 ++ patches/gcc-4.8.5/arm.diff | 46 ++++ patches/gcc-4.8.5/dwarf2.diff | 67 ++++++ patches/gcc-4.8.5/gcc-autoconf-musl.diff | 62 ++++++ patches/gcc-4.8.5/gcc-config-musl.diff | 212 +++++++++++++++++++ patches/gcc-4.8.5/gcc-ssp.diff | 11 + patches/gcc-4.8.5/gomp-posix.diff | 16 ++ patches/gcc-4.8.5/kill-fixincludes.diff | 17 ++ patches/gcc-4.8.5/libstdc++-generic.diff | 31 +++ patches/gcc-4.8.5/microblaze-size_t.diff | 39 ++++ patches/gcc-4.8.5/microblaze.diff | 31 +++ patches/gcc-4.8.5/mips.diff | 18 ++ patches/gcc-4.8.5/powerpc.diff | 108 ++++++++++ patches/gcc-4.8.5/sh.diff | 18 ++ patches/gcc-4.8.5/universal_initializer.diff | 104 +++++++++ patches/gcc-4.8.5/unwind-dliterate.diff | 43 ++++ patches/gcc-4.8.5/x86.diff | 55 +++++ 17 files changed, 893 insertions(+) create mode 100644 patches/gcc-4.8.5/aarch64.diff create mode 100644 patches/gcc-4.8.5/arm.diff create mode 100644 patches/gcc-4.8.5/dwarf2.diff create mode 100644 patches/gcc-4.8.5/gcc-autoconf-musl.diff create mode 100644 patches/gcc-4.8.5/gcc-config-musl.diff create mode 100644 patches/gcc-4.8.5/gcc-ssp.diff create mode 100644 patches/gcc-4.8.5/gomp-posix.diff create mode 100644 patches/gcc-4.8.5/kill-fixincludes.diff create mode 100644 patches/gcc-4.8.5/libstdc++-generic.diff create mode 100644 patches/gcc-4.8.5/microblaze-size_t.diff create mode 100644 patches/gcc-4.8.5/microblaze.diff create mode 100644 patches/gcc-4.8.5/mips.diff create mode 100644 patches/gcc-4.8.5/powerpc.diff create mode 100644 patches/gcc-4.8.5/sh.diff create mode 100644 patches/gcc-4.8.5/universal_initializer.diff create mode 100644 patches/gcc-4.8.5/unwind-dliterate.diff create mode 100644 patches/gcc-4.8.5/x86.diff diff --git a/patches/gcc-4.8.5/aarch64.diff b/patches/gcc-4.8.5/aarch64.diff new file mode 100644 index 0000000..fc2934e --- /dev/null +++ b/patches/gcc-4.8.5/aarch64.diff @@ -0,0 +1,15 @@ +diff -r 2fdeb2c3a347 gcc/config/aarch64/aarch64-linux.h +--- a/gcc/config/aarch64/aarch64-linux.h Thu Jan 29 13:41:57 2015 -0500 ++++ b/gcc/config/aarch64/aarch64-linux.h Thu Jan 29 13:41:59 2015 -0500 +@@ -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 --git a/patches/gcc-4.8.5/arm.diff b/patches/gcc-4.8.5/arm.diff new file mode 100644 index 0000000..ab8243d --- /dev/null +++ b/patches/gcc-4.8.5/arm.diff @@ -0,0 +1,46 @@ +# HG changeset patch +# Parent f7c8746386c494e1c21dd4e6ae3697c371fbe661 +Support for arm-linux-musl. + +diff -r f7c8746386c4 gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Thu Jan 29 13:41:50 2015 -0500 ++++ b/gcc/config/arm/linux-eabi.h Thu Jan 29 13:41:53 2015 -0500 +@@ -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 f7c8746386c4 libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Thu Jan 29 13:41:50 2015 -0500 ++++ b/libitm/config/arm/hwcap.cc Thu Jan 29 13:41:53 2015 -0500 +@@ -40,7 +40,11 @@ + + #ifdef __linux__ + #include ++#ifdef __GLIBC__ + #include ++#else ++#include ++#endif + #include + + static void __attribute__((constructor)) diff --git a/patches/gcc-4.8.5/dwarf2.diff b/patches/gcc-4.8.5/dwarf2.diff new file mode 100644 index 0000000..328272f --- /dev/null +++ b/patches/gcc-4.8.5/dwarf2.diff @@ -0,0 +1,67 @@ +GCC 4.8.x: default to DWARF2 instead of DWARF4 + +1) Dwarf4 debug info is 3-4 times bigger than Dwarf2, +2) it only helps C++11 debugging, +3) to be able to debug such programs, one needs bleeding edge tools like gdb 7.6. + with older versions, there is no error message at all, only a failure to show + the right source files (only _start/.init asm is shown). + +reversed patch from +http://repo.or.cz/w/official-gcc.git/patch/052166fd4a8051c7dc4c87d408be091c99aafd55 + +--- gcc-4.8.2.org/gcc/common.opt ++++ gcc-4.8.2/gcc/common.opt +@@ -977,7 +977,7 @@ + Map one directory name to another in debug information + + fdebug-types-section +-Common Report Var(flag_debug_types_section) Init(0) ++Common Report Var(flag_debug_types_section) Init(1) + Output .debug_types section when using DWARF v4 debuginfo. + + ; Nonzero for -fdefer-pop: don't pop args after each function call +@@ -2307,7 +2307,7 @@ + Generate debug information in COFF format + + gdwarf- +-Common Joined UInteger Var(dwarf_version) Init(4) Negative(gstabs) ++Common Joined UInteger Var(dwarf_version) Init(-1) Negative(gstabs) + Generate debug information in DWARF v2 (or later) format + + ggdb +@@ -2323,7 +2323,7 @@ + Generate DWARF pubnames and pubtypes sections. + + gno-record-gcc-switches +-Common RejectNegative Var(dwarf_record_gcc_switches,0) Init(1) ++Common RejectNegative Var(dwarf_record_gcc_switches,0) Init(0) + Don't record gcc command line switches in DWARF DW_AT_producer. + + grecord-gcc-switches +@@ -2347,7 +2347,7 @@ + Generate debug information in extended STABS format + + gno-strict-dwarf +-Common RejectNegative Var(dwarf_strict,0) Init(0) ++Common RejectNegative Var(dwarf_strict,0) Init(-1) + Emit DWARF additions beyond selected version + + gstrict-dwarf +--- gcc-4.8.2.org/gcc/toplev.c ++++ gcc-4.8.2/gcc/toplev.c +@@ -1363,6 +1363,15 @@ + } + } + ++ /* Unless over-ridden for the target, assume that all DWARF levels ++ may be emitted, if DWARF2_DEBUG is selected. */ ++ if (dwarf_strict < 0) ++ dwarf_strict = 0; ++ ++ /* And select a default dwarf level. */ ++ if (dwarf_version < 0) ++ dwarf_version = 2; ++ + /* A lot of code assumes write_symbols == NO_DEBUG if the debugging + level is 0. */ + if (debug_info_level == DINFO_LEVEL_NONE) diff --git a/patches/gcc-4.8.5/gcc-autoconf-musl.diff b/patches/gcc-4.8.5/gcc-autoconf-musl.diff new file mode 100644 index 0000000..1be2f71 --- /dev/null +++ b/patches/gcc-4.8.5/gcc-autoconf-musl.diff @@ -0,0 +1,62 @@ +diff -r 552906ada59b gcc/configure +--- a/gcc/configure Thu Jan 29 13:41:44 2015 -0500 ++++ b/gcc/configure Thu Jan 29 13:41:46 2015 -0500 +@@ -26852,6 +26852,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. +@@ -26885,6 +26888,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" +@@ -26967,6 +26971,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 552906ada59b gcc/configure.ac +--- a/gcc/configure.ac Thu Jan 29 13:41:44 2015 -0500 ++++ b/gcc/configure.ac Thu Jan 29 13:41:46 2015 -0500 +@@ -4776,6 +4776,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. +@@ -4809,6 +4812,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], +@@ -4874,6 +4878,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.8.5/gcc-config-musl.diff b/patches/gcc-4.8.5/gcc-config-musl.diff new file mode 100644 index 0000000..562ab31 --- /dev/null +++ b/patches/gcc-4.8.5/gcc-config-musl.diff @@ -0,0 +1,212 @@ +# HG changeset patch +# Parent 5bf31f896f61f266585ff2c7f6bf0a3b4b1eb05b +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + +diff -r 5bf31f896f61 gcc/config.gcc +--- a/gcc/config.gcc Thu Jan 29 13:41:37 2015 -0500 ++++ b/gcc/config.gcc Thu Jan 29 13:41:40 2015 -0500 +@@ -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" + ;; +diff -r 5bf31f896f61 gcc/config/linux.h +--- a/gcc/config/linux.h Thu Jan 29 13:41:37 2015 -0500 ++++ b/gcc/config/linux.h Thu Jan 29 13:41:40 2015 -0500 +@@ -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 -r 5bf31f896f61 gcc/config/linux.opt +--- a/gcc/config/linux.opt Thu Jan 29 13:41:37 2015 -0500 ++++ b/gcc/config/linux.opt Thu Jan 29 13:41:40 2015 -0500 +@@ -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 5bf31f896f61 gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Thu Jan 29 13:41:37 2015 -0500 ++++ b/gcc/ginclude/stddef.h Thu Jan 29 13:41:40 2015 -0500 +@@ -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.8.5/gcc-ssp.diff b/patches/gcc-4.8.5/gcc-ssp.diff new file mode 100644 index 0000000..1208e73 --- /dev/null +++ b/patches/gcc-4.8.5/gcc-ssp.diff @@ -0,0 +1,11 @@ +--- gcc-4.7.4.org/gcc/gcc.c ++++ gcc-4.7.4/gcc/gcc.c +@@ -603,7 +603,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-all:-lssp_nonshared -lssp}" + #endif diff --git a/patches/gcc-4.8.5/gomp-posix.diff b/patches/gcc-4.8.5/gomp-posix.diff new file mode 100644 index 0000000..9066354 --- /dev/null +++ b/patches/gcc-4.8.5/gomp-posix.diff @@ -0,0 +1,16 @@ +# HG changeset patch +# Parent 4445b9b84fe64451e022a77b1e8ac480210a31da +A fix for libgomp to correctly request a POSIX version for time support. + +diff -r 4445b9b84fe6 libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Thu Jan 29 13:41:40 2015 -0500 ++++ b/libgomp/config/posix/time.c Thu Jan 29 13:41:42 2015 -0500 +@@ -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.8.5/kill-fixincludes.diff b/patches/gcc-4.8.5/kill-fixincludes.diff new file mode 100644 index 0000000..a3422c3 --- /dev/null +++ b/patches/gcc-4.8.5/kill-fixincludes.diff @@ -0,0 +1,17 @@ +# HG changeset patch +# Parent 3428eef84c75b837b884abf7344fbd0261d5a646 +Get rid of ever-broken fixincludes on musl. + +diff -r 3428eef84c75 fixincludes/mkfixinc.sh +--- a/fixincludes/mkfixinc.sh Thu Jan 29 13:41:46 2015 -0500 ++++ b/fixincludes/mkfixinc.sh Thu Jan 29 13:41:48 2015 -0500 +@@ -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.8.5/libstdc++-generic.diff b/patches/gcc-4.8.5/libstdc++-generic.diff new file mode 100644 index 0000000..037d68d --- /dev/null +++ b/patches/gcc-4.8.5/libstdc++-generic.diff @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent ec1984833740e9cb3223001a8fa26c03b5dcc93c +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + +diff -r ec1984833740 libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Thu Jan 29 13:38:28 2015 -0500 ++++ b/libstdc++-v3/configure.host Thu Jan 29 13:41:38 2015 -0500 +@@ -263,6 +263,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 +@@ -271,6 +278,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; diff --git a/patches/gcc-4.8.5/microblaze-size_t.diff b/patches/gcc-4.8.5/microblaze-size_t.diff new file mode 100644 index 0000000..18e36e1 --- /dev/null +++ b/patches/gcc-4.8.5/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 d9fb78d89e6f gcc/config/microblaze/microblaze.h +--- a/gcc/config/microblaze/microblaze.h Thu Jan 29 13:42:01 2015 -0500 ++++ b/gcc/config/microblaze/microblaze.h Thu Jan 29 13:42:04 2015 -0500 +@@ -219,6 +219,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.8.5/microblaze.diff b/patches/gcc-4.8.5/microblaze.diff new file mode 100644 index 0000000..a12622f --- /dev/null +++ b/patches/gcc-4.8.5/microblaze.diff @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent eb020f66032d779cbaeda8acb97a73d3108189f5 +Microblaze support (again). + +diff -r eb020f66032d gcc/config/microblaze/linux.h +--- a/gcc/config/microblaze/linux.h Thu Jan 29 13:41:59 2015 -0500 ++++ b/gcc/config/microblaze/linux.h Thu Jan 29 13:42:01 2015 -0500 +@@ -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 --git a/patches/gcc-4.8.5/mips.diff b/patches/gcc-4.8.5/mips.diff new file mode 100644 index 0000000..38b7e6d --- /dev/null +++ b/patches/gcc-4.8.5/mips.diff @@ -0,0 +1,18 @@ +# HG changeset patch +# Parent 2951aeba3ac9a3f39653cbd56dff41c8f1569b2f +Support for mips-linux-musl. + +diff -r 2951aeba3ac9 gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Thu Jan 29 13:41:53 2015 -0500 ++++ b/gcc/config/mips/linux.h Thu Jan 29 13:41:55 2015 -0500 +@@ -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 --git a/patches/gcc-4.8.5/powerpc.diff b/patches/gcc-4.8.5/powerpc.diff new file mode 100644 index 0000000..50058dc --- /dev/null +++ b/patches/gcc-4.8.5/powerpc.diff @@ -0,0 +1,108 @@ +# HG changeset patch +# Parent 7626e1f2b51fb2ee53358cab627ef4d3206cd75a +Support for powerpc-linux-musl. + +diff -r 7626e1f2b51f gcc/config.gcc +--- a/gcc/config.gcc Thu Jan 29 13:41:55 2015 -0500 ++++ b/gcc/config.gcc Thu Jan 29 13:41:57 2015 -0500 +@@ -2138,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 -r 7626e1f2b51f gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Thu Jan 29 13:41:55 2015 -0500 ++++ b/gcc/config/rs6000/linux64.h Thu Jan 29 13:41:57 2015 -0500 +@@ -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 -r 7626e1f2b51f gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Thu Jan 29 13:41:55 2015 -0500 ++++ b/gcc/config/rs6000/secureplt.h Thu Jan 29 13:41:57 2015 -0500 +@@ -18,3 +18,4 @@ + . */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -r 7626e1f2b51f gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Thu Jan 29 13:41:55 2015 -0500 ++++ b/gcc/config/rs6000/sysv4.h Thu Jan 29 13:41:57 2015 -0500 +@@ -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.8.5/sh.diff b/patches/gcc-4.8.5/sh.diff new file mode 100644 index 0000000..00963e1 --- /dev/null +++ b/patches/gcc-4.8.5/sh.diff @@ -0,0 +1,18 @@ +diff -r c7fbc78957f6 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 Thu Jan 29 13:42:06 2015 -0500 +@@ -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.8.5/universal_initializer.diff b/patches/gcc-4.8.5/universal_initializer.diff new file mode 100644 index 0000000..0deca29 --- /dev/null +++ b/patches/gcc-4.8.5/universal_initializer.diff @@ -0,0 +1,104 @@ +Fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 +wrong warning when using the universal zero initializer {0} + +Backported to GCC 4.8.3 + +Subject: 2014-06-05 S. Gilles +X-Git-Url: http://repo.or.cz/w/official-gcc.git/commitdiff_plain/95cdf3fdf2d440eb7775def8e35ab970651c33d9?hp=14a3093e9943937cbc63dfbf4d51ca60f8325b29 +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211289 138bc75d-0d04-0410-961f-82ee72b054a4 + +diff -r be309b9bafc4 gcc/c/c-typeck.c +--- a/gcc/c/c-typeck.c Thu Jan 29 13:42:06 2015 -0500 ++++ b/gcc/c/c-typeck.c Thu Jan 29 13:42:08 2015 -0500 +@@ -62,9 +62,9 @@ + if expr.original_code == SIZEOF_EXPR. */ + tree c_last_sizeof_arg; + +-/* Nonzero if we've already printed a "missing braces around initializer" +- message within this initializer. */ +-static int missing_braces_mentioned; ++/* Nonzero if we might need to print a "missing braces around ++ initializer" message within this initializer. */ ++static int found_missing_braces; + + static int require_constant_value; + static int require_constant_elements; +@@ -6379,6 +6379,9 @@ + /* 1 if this constructor is erroneous so far. */ + static int constructor_erroneous; + ++/* 1 if this constructor is the universal zero initializer { 0 }. */ ++static int constructor_zeroinit; ++ + /* Structure for managing pending initializer elements, organized as an + AVL tree. */ + +@@ -6540,7 +6543,7 @@ + constructor_stack = 0; + constructor_range_stack = 0; + +- missing_braces_mentioned = 0; ++ found_missing_braces = 0; + + spelling_base = 0; + spelling_size = 0; +@@ -6635,6 +6638,7 @@ + constructor_type = type; + constructor_incremental = 1; + constructor_designated = 0; ++ constructor_zeroinit = 1; + designator_depth = 0; + designator_erroneous = 0; + +@@ -6832,11 +6836,8 @@ + set_nonincremental_init (braced_init_obstack); + } + +- if (implicit == 1 && warn_missing_braces && !missing_braces_mentioned) +- { +- missing_braces_mentioned = 1; +- warning_init (OPT_Wmissing_braces, "missing braces around initializer"); +- } ++ if (implicit == 1) ++ found_missing_braces = 1; + + if (TREE_CODE (constructor_type) == RECORD_TYPE + || TREE_CODE (constructor_type) == UNION_TYPE) +@@ -6969,16 +6970,23 @@ + } + } + ++ if (vec_safe_length (constructor_elements) != 1) ++ constructor_zeroinit = 0; ++ ++ /* Warn when some structs are initialized with direct aggregation. */ ++ if (!implicit && found_missing_braces && warn_missing_braces ++ && !constructor_zeroinit) ++ { ++ warning_init (OPT_Wmissing_braces, ++ "missing braces around initializer"); ++ } ++ + /* Warn when some struct elements are implicitly initialized to zero. */ + if (warn_missing_field_initializers + && constructor_type + && TREE_CODE (constructor_type) == RECORD_TYPE + && constructor_unfilled_fields) + { +- bool constructor_zeroinit = +- (vec_safe_length (constructor_elements) == 1 +- && integer_zerop ((*constructor_elements)[0].value)); +- + /* Do not warn for flexible array members or zero-length arrays. */ + while (constructor_unfilled_fields + && (!DECL_SIZE (constructor_unfilled_fields) +@@ -8093,6 +8101,9 @@ + designator_depth = 0; + designator_erroneous = 0; + ++ if (!implicit && value.value && !integer_zerop (value.value)) ++ constructor_zeroinit = 0; ++ + /* Handle superfluous braces around string cst as in + char x[] = {"foo"}; */ + if (string_flag diff --git a/patches/gcc-4.8.5/unwind-dliterate.diff b/patches/gcc-4.8.5/unwind-dliterate.diff new file mode 100644 index 0000000..988fc8e --- /dev/null +++ b/patches/gcc-4.8.5/unwind-dliterate.diff @@ -0,0 +1,43 @@ +diff -r 96e24a32862b libgcc/unwind-dw2-fde-dip.c +--- a/libgcc/unwind-dw2-fde-dip.c Thu Jan 29 13:41:42 2015 -0500 ++++ b/libgcc/unwind-dw2-fde-dip.c Thu Jan 29 13:41:44 2015 -0500 +@@ -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.8.5/x86.diff b/patches/gcc-4.8.5/x86.diff new file mode 100644 index 0000000..f8aa718 --- /dev/null +++ b/patches/gcc-4.8.5/x86.diff @@ -0,0 +1,55 @@ +# HG changeset patch +# Parent e2d9d64d6835b26cc5cb052112cfebce6280b00a +Support for i386-linux-musl and x86_64-linux-musl. + +diff -r e2d9d64d6835 gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Thu Jan 29 13:41:48 2015 -0500 ++++ b/gcc/config/i386/linux.h Thu Jan 29 13:41:51 2015 -0500 +@@ -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 e2d9d64d6835 gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Thu Jan 29 13:41:48 2015 -0500 ++++ b/gcc/config/i386/linux64.h Thu Jan 29 13:41:51 2015 -0500 +@@ -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 e2d9d64d6835 libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Thu Jan 29 13:41:48 2015 -0500 ++++ b/libitm/config/linux/x86/tls.h Thu Jan 29 13:41:51 2015 -0500 +@@ -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