summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch')
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch212
1 files changed, 212 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch b/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
new file mode 100644
index 0000000000..7f7307b1e0
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
@@ -0,0 +1,212 @@
1From a32a7901315bf01d0605e43cb7d0427a6d7e4b75 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 8 Dec 2015 08:31:52 +0000
4Subject: [PATCH 45/46] Support for arm-linux-musl.
5
6Upstream-Status: backport [partial]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 gcc/config/aarch64/aarch64-linux.h | 1 +
10 gcc/config/arm/linux-eabi.h | 17 +++++++++++++++++
11 gcc/config/i386/linux.h | 1 +
12 gcc/config/i386/linux64.h | 5 +++++
13 gcc/config/mips/linux.h | 6 +++++-
14 gcc/config/rs6000/linux64.h | 13 +++++++++----
15 gcc/config/rs6000/sysv4.h | 10 +++++++---
16 libitm/config/arm/hwcap.cc | 4 ++++
17 libitm/config/linux/x86/tls.h | 8 ++++++--
18 9 files changed, 55 insertions(+), 10 deletions(-)
19
20diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
21index f9e65fc..1b2d0c0 100644
22--- a/gcc/config/aarch64/aarch64-linux.h
23+++ b/gcc/config/aarch64/aarch64-linux.h
24@@ -22,6 +22,7 @@
25 #define GCC_AARCH64_LINUX_H
26
27 #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
28+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
29
30 #define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
31
32diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
33index 048a062..adb9c44 100644
34--- a/gcc/config/arm/linux-eabi.h
35+++ b/gcc/config/arm/linux-eabi.h
36@@ -81,6 +81,23 @@
37 #undef TARGET_FIX_V4BX_SPEC
38 #define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}"
39
40+/* For ARM musl currently supports four dynamic linkers:
41+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
42+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
43+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
44+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
45+ musl does not support the legacy OABI mode.
46+ All the dynamic linkers live in /lib.
47+ We default to soft-float, EL. */
48+#undef MUSL_DYNAMIC_LINKER
49+#if TARGET_BIG_ENDIAN_DEFAULT
50+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
51+#else
52+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
53+#endif
54+#define MUSL_DYNAMIC_LINKER \
55+ SYSTEMLIBS_DIR "ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
56+
57 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
58 use the GNU/Linux version, not the generic BPABI version. */
59 #undef LINK_SPEC
60diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
61index 21ba2b2..e2b81e5 100644
62--- a/gcc/config/i386/linux.h
63+++ b/gcc/config/i386/linux.h
64@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. If not see
65
66 #define GNU_USER_LINK_EMULATION "elf_i386"
67 #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
68+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1"
69diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
70index 6185cce..5a3a977 100644
71--- a/gcc/config/i386/linux64.h
72+++ b/gcc/config/i386/linux64.h
73@@ -30,3 +30,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
74 #define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
75 #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
76 #define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2"
77+
78+#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-i386.so.1"
79+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-x86_64.so.1"
80+#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1"
81+
82diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
83index c306afb..44d4c12 100644
84--- a/gcc/config/mips/linux.h
85+++ b/gcc/config/mips/linux.h
86@@ -21,6 +21,10 @@ along with GCC; see the file COPYING3. If not see
87 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
88 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
89
90+#define MUSL_DYNAMIC_LINKERN32 SYSTEMLIBS_DIR "ld-musl-mips.so.1"
91+#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-mips.so.1"
92+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-mips.so.1"
93+
94 #define GLIBC_DYNAMIC_LINKER32 \
95 "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
96 #define GLIBC_DYNAMIC_LINKER64 \
97@@ -40,4 +44,4 @@ along with GCC; see the file COPYING3. If not see
98 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
99 #define GNU_USER_DYNAMIC_LINKERN32 \
100 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
101- BIONIC_DYNAMIC_LINKERN32)
102+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
103diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
104index 31c4338..679da4b 100644
105--- a/gcc/config/rs6000/linux64.h
106+++ b/gcc/config/rs6000/linux64.h
107@@ -365,17 +365,22 @@ extern int dot_symbols;
108 #endif
109 #define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
110 #define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0"
111+#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-powerpc.so.1"
112+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-powerpc64.so.1"
113+
114 #if DEFAULT_LIBC == LIBC_UCLIBC
115-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
116+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
117 #elif DEFAULT_LIBC == LIBC_GLIBC
118-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
119+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
120+#elif DEFAULT_LIBC == LIBC_MUSL
121+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
122 #else
123 #error "Unsupported DEFAULT_LIBC"
124 #endif
125 #define GNU_USER_DYNAMIC_LINKER32 \
126- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
127+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
128 #define GNU_USER_DYNAMIC_LINKER64 \
129- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
130+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
131
132 #undef DEFAULT_ASM_ENDIAN
133 #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
134diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
135index 7cd07e0..8794fa5 100644
136--- a/gcc/config/rs6000/sysv4.h
137+++ b/gcc/config/rs6000/sysv4.h
138@@ -763,15 +763,19 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
139
140 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
141 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
142+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
143+
144 #if DEFAULT_LIBC == LIBC_UCLIBC
145-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
146+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
147+#elif DEFAULT_LIBC == LIBC_MUSL
148+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
149 #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
150-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
151+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
152 #else
153 #error "Unsupported DEFAULT_LIBC"
154 #endif
155 #define GNU_USER_DYNAMIC_LINKER \
156- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
157+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
158
159 #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
160 %{rdynamic:-export-dynamic} \
161diff --git a/libitm/config/arm/hwcap.cc b/libitm/config/arm/hwcap.cc
162index a1c2cfd..dd4fad2 100644
163--- a/libitm/config/arm/hwcap.cc
164+++ b/libitm/config/arm/hwcap.cc
165@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
166
167 #ifdef __linux__
168 #include <unistd.h>
169+#ifdef __GLIBC__
170 #include <sys/fcntl.h>
171+#else
172+#include <fcntl.h>
173+#endif
174 #include <elf.h>
175
176 static void __attribute__((constructor))
177diff --git a/libitm/config/linux/x86/tls.h b/libitm/config/linux/x86/tls.h
178index e731ab7..54ad8b6 100644
179--- a/libitm/config/linux/x86/tls.h
180+++ b/libitm/config/linux/x86/tls.h
181@@ -25,16 +25,19 @@
182 #ifndef LIBITM_X86_TLS_H
183 #define LIBITM_X86_TLS_H 1
184
185-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
186+#if defined(__GLIBC_PREREQ)
187+#if __GLIBC_PREREQ(2, 10)
188 /* Use slots in the TCB head rather than __thread lookups.
189 GLIBC has reserved words 10 through 13 for TM. */
190 #define HAVE_ARCH_GTM_THREAD 1
191 #define HAVE_ARCH_GTM_THREAD_DISP 1
192 #endif
193+#endif
194
195 #include "config/generic/tls.h"
196
197-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
198+#if defined(__GLIBC_PREREQ)
199+#if __GLIBC_PREREQ(2, 10)
200 namespace GTM HIDDEN {
201
202 #ifdef __x86_64__
203@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct abi_dispatch *x)
204
205 } // namespace GTM
206 #endif /* >= GLIBC 2.10 */
207+#endif
208
209 #endif // LIBITM_X86_TLS_H
210--
2112.6.3
212
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-22 05:25:37 +0000