diff -r cfc01b6ff516 gcc/config/aarch64/aarch64-linux.h --- a/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:46:29 2015 -0400 +++ b/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:46:32 2015 -0400 @@ -29,6 +29,8 @@ #undef CC1_SPEC #define CC1_SPEC GNU_USER_TARGET_CC1_SPEC ASAN_CC1_SPEC +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" + #define CPP_SPEC "%{pthread:-D_REENTRANT}" #define LINUX_TARGET_LINK_SPEC "%{h*} \ # HG changeset patch # Parent 214669757bc7960ef2132bcc15302c4a8de0f35a Support for arm-linux-musl. diff -r 214669757bc7 gcc/config/arm/linux-eabi.h --- a/gcc/config/arm/linux-eabi.h Sun Jul 26 15:46:23 2015 -0400 +++ b/gcc/config/arm/linux-eabi.h Sun Jul 26 15:46: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 214669757bc7 libitm/config/arm/hwcap.cc --- a/libitm/config/arm/hwcap.cc Sun Jul 26 15:46:23 2015 -0400 +++ b/libitm/config/arm/hwcap.cc Sun Jul 26 15:46:25 2015 -0400 @@ -40,7 +40,11 @@ #ifdef __linux__ #include +#ifdef __GLIBC__ #include +#else +#include +#endif #include static void __attribute__((constructor)) diff -r 0fe1d86c73d6 gcc/configure --- a/gcc/configure Sun Jul 26 15:46:15 2015 -0400 +++ b/gcc/configure Sun Jul 26 15:46:17 2015 -0400 @@ -27742,6 +27742,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. @@ -27774,6 +27777,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" @@ -27870,6 +27874,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 0fe1d86c73d6 gcc/configure.ac --- a/gcc/configure.ac Sun Jul 26 15:46:15 2015 -0400 +++ b/gcc/configure.ac Sun Jul 26 15:46:17 2015 -0400 @@ -5229,6 +5229,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. @@ -5255,6 +5258,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], @@ -5328,6 +5332,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 # HG changeset patch # Parent 698e2b270f3f50fc0036f507a7926e4d68d47be0 Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. diff -r 698e2b270f3f gcc/config.gcc --- a/gcc/config.gcc Sun Jul 26 15:46:09 2015 -0400 +++ b/gcc/config.gcc Sun Jul 26 15:46:11 2015 -0400 @@ -575,7 +575,7 @@ esac # Common C libraries. -tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" +tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" # 32-bit x86 processors supported by --with-arch=. Each processor # MUST be separated by exactly one space. @@ -720,6 +720,9 @@ *-*-*uclibc*) tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" ;; + *-*-*musl*) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" + ;; *) tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" ;; diff -r 698e2b270f3f gcc/config/linux.h --- a/gcc/config/linux.h Sun Jul 26 15:46:09 2015 -0400 +++ b/gcc/config/linux.h Sun Jul 26 15:46: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 698e2b270f3f gcc/config/linux.opt --- a/gcc/config/linux.opt Sun Jul 26 15:46:09 2015 -0400 +++ b/gcc/config/linux.opt Sun Jul 26 15:46: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 698e2b270f3f gcc/ginclude/stddef.h --- a/gcc/ginclude/stddef.h Sun Jul 26 15:46:09 2015 -0400 +++ b/gcc/ginclude/stddef.h Sun Jul 26 15:46:11 2015 -0400 @@ -184,6 +184,7 @@ #ifndef _GCC_SIZE_T #ifndef _SIZET_ #ifndef __size_t +#ifndef __DEFINED_size_t /* musl */ #define __size_t__ /* BeOS */ #define __SIZE_T__ /* Cray Unicos/Mk */ #define _SIZE_T @@ -200,6 +201,7 @@ #define ___int_size_t_h #define _GCC_SIZE_T #define _SIZET_ +#define __DEFINED_size_t /* musl */ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ || defined(__DragonFly__) \ || defined(__FreeBSD_kernel__) @@ -218,6 +220,7 @@ typedef long ssize_t; #endif /* __BEOS__ */ #endif /* !(defined (__GNUG__) && defined (size_t)) */ +#endif /* __DEFINED_size_t */ #endif /* __size_t */ #endif /* _SIZET_ */ #endif /* _GCC_SIZE_T */ diff -r ec6a0ac94411 gcc/gcc.c --- a/gcc/gcc.c Sun Jul 26 15:46:17 2015 -0400 +++ b/gcc/gcc.c Sun Jul 26 15:46:19 2015 -0400 @@ -729,7 +729,7 @@ #ifndef LINK_SSP_SPEC #ifdef TARGET_LIBC_PROVIDES_SSP #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ - "|fstack-protector-strong|fstack-protector-explicit:}" + "|fstack-protector-strong|fstack-protector-explicit:-lssp_nonshared}" #else #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ "|fstack-protector-strong|fstack-protector-explicit" \ # HG changeset patch # Parent 8d7ec347907e575fb2ec5231262dc39a226cec85 A fix for libgomp to correctly request a POSIX version for time support. diff -r 8d7ec347907e libgomp/config/posix/time.c --- a/libgomp/config/posix/time.c Sun Jul 26 15:46:11 2015 -0400 +++ b/libgomp/config/posix/time.c Sun Jul 26 15:46:13 2015 -0400 @@ -29,6 +29,8 @@ The following implementation uses the most simple POSIX routines. If present, POSIX 4 clocks should be used instead. */ +#define _POSIX_C_SOURCE 199309L /* for clocks */ + #include "libgomp.h" #include #if TIME_WITH_SYS_TIME Do not use weak references on any targets for gthread. Necessary on musl, safe elsewhere. diff -r d2b373a6ad39 libgcc/gthr.h --- a/libgcc/gthr.h Thu Jan 29 18:59:33 2015 -0500 +++ b/libgcc/gthr.h Thu Jan 29 19:00:03 2015 -0500 @@ -136,10 +136,8 @@ /* The pe-coff weak support isn't fully compatible to ELF's weak. For static libraries it might would work, but as we need to deal with shared versions too, we disable it for mingw-targets. */ -#ifdef __MINGW32__ #undef GTHREAD_USE_WEAK #define GTHREAD_USE_WEAK 0 -#endif #ifndef GTHREAD_USE_WEAK #define GTHREAD_USE_WEAK 1 # HG changeset patch # Parent e5ca78175ea789ef9eba70ef090abdacd1975224 Get rid of ever-broken fixincludes on musl. diff -r e5ca78175ea7 fixincludes/mkfixinc.sh --- a/fixincludes/mkfixinc.sh Sun Jul 26 15:46:19 2015 -0400 +++ b/fixincludes/mkfixinc.sh Sun Jul 26 15:46: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} # HG changeset patch # Parent 9b5795e98965ab4820a65ceeae0de644d0c5a9bb Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. diff -r 9b5795e98965 libstdc++-v3/configure.host --- a/libstdc++-v3/configure.host Sun Jul 26 15:42:47 2015 -0400 +++ b/libstdc++-v3/configure.host Sun Jul 26 15:46:09 2015 -0400 @@ -274,6 +274,13 @@ os_include_dir="os/bsd/freebsd" ;; gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) + # check for musl by target + case "${host_os}" in + *-musl*) + os_include_dir="os/generic" + ;; + *) + if [ "$uclibc" = "yes" ]; then os_include_dir="os/uclibc" elif [ "$bionic" = "yes" ]; then @@ -282,6 +289,9 @@ os_include_dir="os/gnu-linux" fi ;; + + esac + ;; hpux*) os_include_dir="os/hpux" ;; # HG changeset patch # Parent 25bb57ef02c8b09bbc585f0ea719b7f128a1ef18 Microblaze support (again). diff -r 25bb57ef02c8 gcc/config/microblaze/linux.h --- a/gcc/config/microblaze/linux.h Sun Jul 26 15:46:32 2015 -0400 +++ b/gcc/config/microblaze/linux.h Sun Jul 26 15:46:34 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 } 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 d2ca267e7e1a gcc/config/microblaze/microblaze.h --- a/gcc/config/microblaze/microblaze.h Sun Jul 26 15:46:34 2015 -0400 +++ b/gcc/config/microblaze/microblaze.h Sun Jul 26 15:46:36 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 \ # HG changeset patch # Parent dba79de517c5c94376a8ee105b0661cba1484617 Support for mips-linux-musl. diff -r dba79de517c5 gcc/config/mips/linux.h --- a/gcc/config/mips/linux.h Sun Jul 26 15:46:25 2015 -0400 +++ b/gcc/config/mips/linux.h Sun Jul 26 15:46:27 2015 -0400 @@ -31,6 +31,13 @@ #undef UCLIBC_DYNAMIC_LINKER32 #define UCLIBC_DYNAMIC_LINKER32 \ "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" + +#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ +#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" +#else +#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" +#endif +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" #undef UCLIBC_DYNAMIC_LINKER64 #define UCLIBC_DYNAMIC_LINKER64 \ "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}" # HG changeset patch # Parent 6becd1fa75bd2bef8af8ca711b089083d6d1192f Support for powerpc-linux-musl. diff -r 6becd1fa75bd gcc/config.gcc --- a/gcc/config.gcc Sun Jul 26 15:46:27 2015 -0400 +++ b/gcc/config.gcc Sun Jul 26 15:46:29 2015 -0400 @@ -2410,6 +2410,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 6becd1fa75bd gcc/config/rs6000/linux64.h --- a/gcc/config/rs6000/linux64.h Sun Jul 26 15:46:27 2015 -0400 +++ b/gcc/config/rs6000/linux64.h Sun Jul 26 15:46:29 2015 -0400 @@ -365,17 +365,21 @@ #endif #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" #if DEFAULT_LIBC == LIBC_UCLIBC -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" #elif DEFAULT_LIBC == LIBC_GLIBC -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" +#elif DEFAULT_LIBC == LIBC_MUSL +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" #else #error "Unsupported DEFAULT_LIBC" #endif #define GNU_USER_DYNAMIC_LINKER32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) #define GNU_USER_DYNAMIC_LINKER64 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) #undef DEFAULT_ASM_ENDIAN #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) diff -r 6becd1fa75bd gcc/config/rs6000/secureplt.h --- a/gcc/config/rs6000/secureplt.h Sun Jul 26 15:46:27 2015 -0400 +++ b/gcc/config/rs6000/secureplt.h Sun Jul 26 15:46:29 2015 -0400 @@ -18,3 +18,4 @@ . */ #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" diff -r 6becd1fa75bd gcc/config/rs6000/sysv4.h --- a/gcc/config/rs6000/sysv4.h Sun Jul 26 15:46:27 2015 -0400 +++ b/gcc/config/rs6000/sysv4.h Sun Jul 26 15:46:29 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. */ #undef CC1_SPEC @@ -586,7 +589,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 "\ @@ -764,15 +768,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} \ @@ -895,6 +902,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 -r 2318e0db0d53 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:46:38 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 -r 9c90643665ae libgcc/unwind-dw2-fde-dip.c --- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:46:13 2015 -0400 +++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:46:15 2015 -0400 @@ -46,6 +46,10 @@ #include "unwind-compat.h" #include "gthr.h" +#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) +# define USE_PT_GNU_EH_FRAME +#endif + #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) Fix hidden visibility of libgcc.a symbols when building gcc stage 2 with --disable-shared, as per musl ml: http://www.openwall.com/lists/musl/2014/01/12/4 diff -Naur gcc-4.7.3.orig/libgcc/Makefile.in gcc-4.7.3/libgcc/Makefile.in --- gcc-4.7.3.orig/libgcc/Makefile.in 2012-12-04 14:09:59.000000000 -0500 +++ gcc-4.7.3/libgcc/Makefile.in 2014-02-27 08:33:31.537611370 -0500 @@ -388,7 +388,7 @@ else # Not enable_shared. iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) -vis_hide = +vis_hide = @vis_hide@ gen-hide-list = echo > \$@ endif # HG changeset patch # Parent 36af6268b2f02afd6e00a03c100dd0a8d9e3dbe6 Support for i386-linux-musl and x86_64-linux-musl. diff -r 36af6268b2f0 gcc/config/i386/linux.h --- a/gcc/config/i386/linux.h Sun Jul 26 15:46:21 2015 -0400 +++ b/gcc/config/i386/linux.h Sun Jul 26 15:46: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 36af6268b2f0 gcc/config/i386/linux64.h --- a/gcc/config/i386/linux64.h Sun Jul 26 15:46:21 2015 -0400 +++ b/gcc/config/i386/linux64.h Sun Jul 26 15:46: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 36af6268b2f0 libitm/config/linux/x86/tls.h --- a/libitm/config/linux/x86/tls.h Sun Jul 26 15:46:21 2015 -0400 +++ b/libitm/config/linux/x86/tls.h Sun Jul 26 15:46: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