|
@@ -1,199 +0,0 @@
|
|
|
---- a/gcc/config.gcc
|
|
|
-+++ b/gcc/config.gcc
|
|
|
-@@ -595,7 +595,7 @@ case ${target} in
|
|
|
- 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 @@ case ${target} in
|
|
|
- *-*-*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"
|
|
|
- ;;
|
|
|
---- a/gcc/config/linux.h
|
|
|
-+++ b/gcc/config/linux.h
|
|
|
-@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
|
|
|
- #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 @@ see the files COPYING3 and COPYING.RUNTI
|
|
|
- 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 @@ see the files COPYING3 and COPYING.RUNTI
|
|
|
-
|
|
|
- #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
|
|
|
---- a/gcc/config/linux.opt
|
|
|
-+++ b/gcc/config/linux.opt
|
|
|
-@@ -30,3 +30,7 @@ Use GNU C library
|
|
|
- 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
|
|
|
---- a/gcc/ginclude/stddef.h
|
|
|
-+++ b/gcc/ginclude/stddef.h
|
|
|
-@@ -181,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
|
|
|
- #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 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
|
|
|
- #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 __SIZE_TYPE__ size_t;
|
|
|
- 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 */
|