| # HG changeset patch |
| # Parent e5b4564f249f8634194bdabef4b3057d0e54ee97 |
| Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. |
| Upstream-Status: backport [partial] |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| |
| Index: gcc-4.9.0/gcc/config.gcc |
| =================================================================== |
| --- gcc-4.9.0.orig/gcc/config.gcc 2014-04-22 22:44:17.153567150 -0700 |
| +++ gcc-4.9.0/gcc/config.gcc 2014-04-23 23:54:31.427357051 -0700 |
| @@ -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" |
| ;; |
| @@ -2328,6 +2331,11 @@ |
| 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 |
| Index: gcc-4.9.0/gcc/config/linux.h |
| =================================================================== |
| --- gcc-4.9.0.orig/gcc/config/linux.h 2014-01-02 14:23:26.000000000 -0800 |
| +++ gcc-4.9.0/gcc/config/linux.h 2014-04-24 00:11:29.034028895 -0700 |
| @@ -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,16 +89,16 @@ |
| |
| #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 |
| @@ -127,3 +132,74 @@ |
| # define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function |
| |
| #endif |
| + |
| +/* 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 |
| Index: gcc-4.9.0/gcc/config/linux.opt |
| =================================================================== |
| --- gcc-4.9.0.orig/gcc/config/linux.opt 2014-01-02 14:23:26.000000000 -0800 |
| +++ gcc-4.9.0/gcc/config/linux.opt 2014-04-22 22:44:17.280233817 -0700 |
| @@ -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 |
| Index: gcc-4.9.0/gcc/ginclude/stddef.h |
| =================================================================== |
| --- gcc-4.9.0.orig/gcc/ginclude/stddef.h 2014-01-02 14:23:26.000000000 -0800 |
| +++ gcc-4.9.0/gcc/ginclude/stddef.h 2014-04-22 22:44:17.280233817 -0700 |
| @@ -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 */ |
| Index: gcc-4.9.0/gcc/config/rs6000/secureplt.h |
| =================================================================== |
| --- gcc-4.9.0.orig/gcc/config/rs6000/secureplt.h 2014-01-02 14:23:26.000000000 -0800 |
| +++ gcc-4.9.0/gcc/config/rs6000/secureplt.h 2014-04-23 23:55:15.114024175 -0700 |
| @@ -18,3 +18,4 @@ |
| <http://www.gnu.org/licenses/>. */ |
| |
| #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" |
| +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" |
| Index: gcc-4.9.0/gcc/config/rs6000/sysv4.h |
| =================================================================== |
| --- gcc-4.9.0.orig/gcc/config/rs6000/sysv4.h 2014-04-23 23:52:13.854023015 -0700 |
| +++ gcc-4.9.0/gcc/config/rs6000/sysv4.h 2014-04-24 00:10:55.550695334 -0700 |
| @@ -538,6 +538,10 @@ |
| #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)" \ |
| "%{meabi: %{!mcall-*: -mcall-sysv }} \ |
| @@ -585,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 "\ |
| @@ -894,6 +899,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 }, \ |