3 @@ -559,7 +559,7 @@ case ${target} in
7 -tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
8 +tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
10 # Common parts for widely ported systems.
12 @@ -662,6 +662,9 @@ case ${target} in
14 tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
17 + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
20 tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
22 --- a/gcc/config/linux.h
23 +++ b/gcc/config/linux.h
24 @@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
25 #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
26 #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
27 #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
28 +#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
30 #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
31 #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
32 #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
33 +#define OPTION_MUSL (linux_libc == LIBC_MUSL)
36 #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
37 @@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI
38 uClibc or Bionic is the default C library and whether
39 -muclibc or -mglibc or -mbionic has been passed to change the default. */
41 -#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
42 - "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
43 +#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
44 + "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
46 #if DEFAULT_LIBC == LIBC_GLIBC
47 -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
48 - CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
49 +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
50 + CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
51 #elif DEFAULT_LIBC == LIBC_UCLIBC
52 -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
53 - CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
54 +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
55 + CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
56 #elif DEFAULT_LIBC == LIBC_BIONIC
57 -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
58 - CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
59 +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
60 + CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
61 +#elif DEFAULT_LIBC == LIBC_MUSL
62 +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
63 + CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
65 #error "Unsupported DEFAULT_LIBC"
66 #endif /* DEFAULT_LIBC */
67 @@ -84,21 +89,21 @@ see the files COPYING3 and COPYING.RUNTI
69 #define GNU_USER_DYNAMIC_LINKER \
70 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
71 - BIONIC_DYNAMIC_LINKER)
72 + BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
73 #define GNU_USER_DYNAMIC_LINKER32 \
74 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
75 - BIONIC_DYNAMIC_LINKER32)
76 + BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
77 #define GNU_USER_DYNAMIC_LINKER64 \
78 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
79 - BIONIC_DYNAMIC_LINKER64)
80 + BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
81 #define GNU_USER_DYNAMIC_LINKERX32 \
82 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
83 - BIONIC_DYNAMIC_LINKERX32)
84 + BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
86 /* Determine whether the entire c99 runtime
87 is present in the runtime library. */
88 #undef TARGET_C99_FUNCTIONS
89 -#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
90 +#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
92 /* Whether we have sincos that follows the GNU extension. */
93 #undef TARGET_HAS_SINCOS
94 @@ -107,3 +112,74 @@ see the files COPYING3 and COPYING.RUNTI
95 /* Whether we have Bionic libc runtime */
96 #undef TARGET_HAS_BIONIC
97 #define TARGET_HAS_BIONIC (OPTION_BIONIC)
99 +/* musl avoids problematic includes by rearranging the include directories.
100 + * Unfortunately, this is mostly duplicated from cppdefault.c */
101 +#if DEFAULT_LIBC == LIBC_MUSL
102 +#define INCLUDE_DEFAULTS_MUSL_GPP \
103 + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
104 + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
105 + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
106 + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
107 + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
108 + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
110 +#ifdef LOCAL_INCLUDE_DIR
111 +#define INCLUDE_DEFAULTS_MUSL_LOCAL \
112 + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
113 + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
115 +#define INCLUDE_DEFAULTS_MUSL_LOCAL
118 +#ifdef PREFIX_INCLUDE_DIR
119 +#define INCLUDE_DEFAULTS_MUSL_PREFIX \
120 + { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
122 +#define INCLUDE_DEFAULTS_MUSL_PREFIX
125 +#ifdef CROSS_INCLUDE_DIR
126 +#define INCLUDE_DEFAULTS_MUSL_CROSS \
127 + { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
129 +#define INCLUDE_DEFAULTS_MUSL_CROSS
132 +#ifdef TOOL_INCLUDE_DIR
133 +#define INCLUDE_DEFAULTS_MUSL_TOOL \
134 + { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
136 +#define INCLUDE_DEFAULTS_MUSL_TOOL
139 +#ifdef NATIVE_SYSTEM_HEADER_DIR
140 +#define INCLUDE_DEFAULTS_MUSL_NATIVE \
141 + { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
142 + { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
144 +#define INCLUDE_DEFAULTS_MUSL_NATIVE
147 +#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
148 +# undef INCLUDE_DEFAULTS_MUSL_LOCAL
149 +# define INCLUDE_DEFAULTS_MUSL_LOCAL
150 +# undef INCLUDE_DEFAULTS_MUSL_NATIVE
151 +# define INCLUDE_DEFAULTS_MUSL_NATIVE
153 +# undef INCLUDE_DEFAULTS_MUSL_CROSS
154 +# define INCLUDE_DEFAULTS_MUSL_CROSS
157 +#undef INCLUDE_DEFAULTS
158 +#define INCLUDE_DEFAULTS \
160 + INCLUDE_DEFAULTS_MUSL_GPP \
161 + INCLUDE_DEFAULTS_MUSL_PREFIX \
162 + INCLUDE_DEFAULTS_MUSL_CROSS \
163 + INCLUDE_DEFAULTS_MUSL_TOOL \
164 + INCLUDE_DEFAULTS_MUSL_NATIVE \
165 + { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
166 + { 0, 0, 0, 0, 0, 0 } \
169 --- a/gcc/config/linux.opt
170 +++ b/gcc/config/linux.opt
171 @@ -30,3 +30,7 @@ Use GNU C library
173 Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
177 +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
179 --- a/gcc/ginclude/stddef.h
180 +++ b/gcc/ginclude/stddef.h
181 @@ -181,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
185 +#ifndef __DEFINED_size_t /* musl */
186 #define __size_t__ /* BeOS */
187 #define __SIZE_T__ /* Cray Unicos/Mk */
189 @@ -197,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
190 #define ___int_size_t_h
193 +#define __DEFINED_size_t /* musl */
194 #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
195 || defined(__FreeBSD_kernel__)
196 /* __size_t is a typedef on FreeBSD 5, must not trash it. */
197 @@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t;
198 typedef long ssize_t;
199 #endif /* __BEOS__ */
200 #endif /* !(defined (__GNUG__) && defined (size_t)) */
201 +#endif /* __DEFINED_size_t */
202 #endif /* __size_t */
204 #endif /* _GCC_SIZE_T */