diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-08-16 00:08:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-18 11:44:55 +0100 |
commit | a8fef8bee7212d42b075d200a7901222086fa3c0 (patch) | |
tree | 108cbbc4ff5503c4c7d39b95b10c127f1c631f7c /meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | |
parent | 2d54561f7462dba931902f0f959ff50de3430950 (diff) | |
download | poky-a8fef8bee7212d42b075d200a7901222086fa3c0.tar.gz |
gcc: Upgrade to 10.2.0
Drop 0036-Enable-CET-in-cross-compiler-if-possible.patch and
pr96130.patch they are already in 10.2
(From OE-Core rev: 35eda14fbdc38ae5e686c2d30a2c1d5569bd3088)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 243 |
1 files changed, 243 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch new file mode 100644 index 0000000000..e357976330 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | |||
@@ -0,0 +1,243 @@ | |||
1 | From 8fc016a53c22c19feccbfa13ebdf19090dc67058 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 | ||
4 | Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER | ||
5 | relative to SYSTEMLIBS_DIR | ||
6 | |||
7 | This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER | ||
8 | relative to SYSTEMLIBS_DIR which can be set in generated headers | ||
9 | This breaks the assumption of hardcoded multilib in gcc | ||
10 | Change is only for the supported architectures in OE including | ||
11 | SH, sparc, alpha for possible future support (if any) | ||
12 | |||
13 | Removes the do_headerfix task in metadata | ||
14 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | Upstream-Status: Inappropriate [OE configuration] | ||
18 | --- | ||
19 | gcc/config/alpha/linux-elf.h | 4 ++-- | ||
20 | gcc/config/arm/linux-eabi.h | 4 ++-- | ||
21 | gcc/config/arm/linux-elf.h | 2 +- | ||
22 | gcc/config/i386/linux.h | 2 +- | ||
23 | gcc/config/i386/linux64.h | 6 +++--- | ||
24 | gcc/config/linux.h | 8 ++++---- | ||
25 | gcc/config/mips/linux.h | 12 ++++++------ | ||
26 | gcc/config/riscv/linux.h | 2 +- | ||
27 | gcc/config/rs6000/linux64.h | 15 +++++---------- | ||
28 | gcc/config/sh/linux.h | 2 +- | ||
29 | gcc/config/sparc/linux.h | 2 +- | ||
30 | gcc/config/sparc/linux64.h | 4 ++-- | ||
31 | 12 files changed, 29 insertions(+), 34 deletions(-) | ||
32 | |||
33 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h | ||
34 | index e25fcac3c59..01aca0c6542 100644 | ||
35 | --- a/gcc/config/alpha/linux-elf.h | ||
36 | +++ b/gcc/config/alpha/linux-elf.h | ||
37 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see | ||
38 | #define EXTRA_SPECS \ | ||
39 | { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, | ||
40 | |||
41 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
42 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | ||
43 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
44 | +#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0" | ||
45 | #if DEFAULT_LIBC == LIBC_UCLIBC | ||
46 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | ||
47 | #elif DEFAULT_LIBC == LIBC_GLIBC | ||
48 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h | ||
49 | index 5bdcfa0c5d3..0c0332f317f 100644 | ||
50 | --- a/gcc/config/arm/linux-eabi.h | ||
51 | +++ b/gcc/config/arm/linux-eabi.h | ||
52 | @@ -65,8 +65,8 @@ | ||
53 | GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ | ||
54 | |||
55 | #undef GLIBC_DYNAMIC_LINKER | ||
56 | -#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" | ||
57 | -#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" | ||
58 | +#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR "ld-linux.so.3" | ||
59 | +#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR "ld-linux-armhf.so.3" | ||
60 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT | ||
61 | |||
62 | #define GLIBC_DYNAMIC_LINKER \ | ||
63 | diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h | ||
64 | index 0ec3aa53189..abfa9566d74 100644 | ||
65 | --- a/gcc/config/arm/linux-elf.h | ||
66 | +++ b/gcc/config/arm/linux-elf.h | ||
67 | @@ -60,7 +60,7 @@ | ||
68 | |||
69 | #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" | ||
70 | |||
71 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
72 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
73 | |||
74 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ | ||
75 | %{static:-Bstatic} \ | ||
76 | diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h | ||
77 | index 9f823f125ed..e0390b7d5e3 100644 | ||
78 | --- a/gcc/config/i386/linux.h | ||
79 | +++ b/gcc/config/i386/linux.h | ||
80 | @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see | ||
81 | <http://www.gnu.org/licenses/>. */ | ||
82 | |||
83 | #define GNU_USER_LINK_EMULATION "elf_i386" | ||
84 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
85 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
86 | |||
87 | #undef MUSL_DYNAMIC_LINKER | ||
88 | #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" | ||
89 | diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h | ||
90 | index 6cb68d1ccfa..7de09ec857c 100644 | ||
91 | --- a/gcc/config/i386/linux64.h | ||
92 | +++ b/gcc/config/i386/linux64.h | ||
93 | @@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | ||
94 | #define GNU_USER_LINK_EMULATION64 "elf_x86_64" | ||
95 | #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" | ||
96 | |||
97 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | ||
98 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" | ||
99 | -#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" | ||
100 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" | ||
101 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" | ||
102 | +#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" | ||
103 | |||
104 | #undef MUSL_DYNAMIC_LINKER32 | ||
105 | #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" | ||
106 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | ||
107 | index 95654bcdb5a..0c1a8118a26 100644 | ||
108 | --- a/gcc/config/linux.h | ||
109 | +++ b/gcc/config/linux.h | ||
110 | @@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | ||
111 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or | ||
112 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets | ||
113 | supporting both 32-bit and 64-bit compilation. */ | ||
114 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | ||
115 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" | ||
116 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" | ||
117 | -#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0" | ||
118 | +#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0" | ||
119 | +#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" | ||
120 | +#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" | ||
121 | +#define UCLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ldx32-uClibc.so.0" | ||
122 | #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" | ||
123 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" | ||
124 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" | ||
125 | diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h | ||
126 | index 54446e58e5f..4786ee304c1 100644 | ||
127 | --- a/gcc/config/mips/linux.h | ||
128 | +++ b/gcc/config/mips/linux.h | ||
129 | @@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see | ||
130 | #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" | ||
131 | |||
132 | #define GLIBC_DYNAMIC_LINKER32 \ | ||
133 | - "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}" | ||
134 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" | ||
135 | #define GLIBC_DYNAMIC_LINKER64 \ | ||
136 | - "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}" | ||
137 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" | ||
138 | #define GLIBC_DYNAMIC_LINKERN32 \ | ||
139 | - "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}" | ||
140 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" | ||
141 | |||
142 | #undef UCLIBC_DYNAMIC_LINKER32 | ||
143 | #define UCLIBC_DYNAMIC_LINKER32 \ | ||
144 | - "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" | ||
145 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}" | ||
146 | #undef UCLIBC_DYNAMIC_LINKER64 | ||
147 | #define UCLIBC_DYNAMIC_LINKER64 \ | ||
148 | - "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}" | ||
149 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld64-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld64-uClibc.so.0}" | ||
150 | #define UCLIBC_DYNAMIC_LINKERN32 \ | ||
151 | - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" | ||
152 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}" | ||
153 | |||
154 | #undef MUSL_DYNAMIC_LINKER32 | ||
155 | #define MUSL_DYNAMIC_LINKER32 \ | ||
156 | diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h | ||
157 | index 4afef7c228c..01997330741 100644 | ||
158 | --- a/gcc/config/riscv/linux.h | ||
159 | +++ b/gcc/config/riscv/linux.h | ||
160 | @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see | ||
161 | GNU_USER_TARGET_OS_CPP_BUILTINS(); \ | ||
162 | } while (0) | ||
163 | |||
164 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" | ||
165 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" | ||
166 | |||
167 | #define MUSL_ABI_SUFFIX \ | ||
168 | "%{mabi=ilp32:-sf}" \ | ||
169 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h | ||
170 | index 34776c8421e..967c1c43c63 100644 | ||
171 | --- a/gcc/config/rs6000/linux64.h | ||
172 | +++ b/gcc/config/rs6000/linux64.h | ||
173 | @@ -419,24 +419,19 @@ extern int dot_symbols; | ||
174 | #undef LINK_OS_DEFAULT_SPEC | ||
175 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" | ||
176 | |||
177 | -#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1" | ||
178 | - | ||
179 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" | ||
180 | #ifdef LINUX64_DEFAULT_ABI_ELFv2 | ||
181 | -#define GLIBC_DYNAMIC_LINKER64 \ | ||
182 | -"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \ | ||
183 | -":%(dynamic_linker_prefix)/lib64/ld64.so.2}" | ||
184 | +#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:" SYSTEMLIBS_DIR "ld64.so.1;:" SYSTEMLIBS_DIR "ld64.so.2}" | ||
185 | #else | ||
186 | -#define GLIBC_DYNAMIC_LINKER64 \ | ||
187 | -"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \ | ||
188 | -":%(dynamic_linker_prefix)/lib64/ld64.so.1}" | ||
189 | +#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:" SYSTEMLIBS_DIR "ld64.so.2;:" SYSTEMLIBS_DIR "ld64.so.1}" | ||
190 | #endif | ||
191 | |||
192 | #undef MUSL_DYNAMIC_LINKER32 | ||
193 | #define MUSL_DYNAMIC_LINKER32 \ | ||
194 | - "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" | ||
195 | + SYSTEMLIBS_DIR "ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" | ||
196 | #undef MUSL_DYNAMIC_LINKER64 | ||
197 | #define MUSL_DYNAMIC_LINKER64 \ | ||
198 | - "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" | ||
199 | + SYSTEMLIBS_DIR "ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" | ||
200 | |||
201 | #undef DEFAULT_ASM_ENDIAN | ||
202 | #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) | ||
203 | diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h | ||
204 | index c1d0441d488..81373eb8336 100644 | ||
205 | --- a/gcc/config/sh/linux.h | ||
206 | +++ b/gcc/config/sh/linux.h | ||
207 | @@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see | ||
208 | "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \ | ||
209 | "%{mfdpic:-fdpic}.so.1" | ||
210 | |||
211 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
212 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
213 | |||
214 | #undef SUBTARGET_LINK_EMUL_SUFFIX | ||
215 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" | ||
216 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h | ||
217 | index 81201e67a2f..8b6fc577594 100644 | ||
218 | --- a/gcc/config/sparc/linux.h | ||
219 | +++ b/gcc/config/sparc/linux.h | ||
220 | @@ -84,7 +84,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); | ||
221 | When the -shared link option is used a final link is not being | ||
222 | done. */ | ||
223 | |||
224 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
225 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
226 | |||
227 | #undef LINK_SPEC | ||
228 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ | ||
229 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h | ||
230 | index a1a0efd8f28..85d1084afc2 100644 | ||
231 | --- a/gcc/config/sparc/linux64.h | ||
232 | +++ b/gcc/config/sparc/linux64.h | ||
233 | @@ -84,8 +84,8 @@ along with GCC; see the file COPYING3. If not see | ||
234 | When the -shared link option is used a final link is not being | ||
235 | done. */ | ||
236 | |||
237 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | ||
238 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" | ||
239 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" | ||
240 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux.so.2" | ||
241 | |||
242 | #ifdef SPARC_BI_ARCH | ||
243 | |||