diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-25 22:17:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-26 23:30:16 +0100 |
commit | da2e04d0dd251c197e2d6c888fcf5951f5a31727 (patch) | |
tree | cc74484804bd9bd9568c0a1fb846ac388774ca65 /meta/recipes-devtools/gcc | |
parent | 0d4c97c24dd4bc25760bce00f3ff65e88508e882 (diff) | |
download | poky-da2e04d0dd251c197e2d6c888fcf5951f5a31727.tar.gz |
gcc: Merge three related patches together
The SYSTEMLIBS_DIR change was spread over three patches, merge these
together since there is no value in having them separate.
(From OE-Core rev: dd1fef1b520efaac6a21f26332c25bdcc0110c12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
4 files changed, 28 insertions, 77 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc index 9fd30f52a8..6fa344e961 100644 --- a/meta/recipes-devtools/gcc/gcc-11.2.inc +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc | |||
@@ -50,8 +50,6 @@ SRC_URI = "\ | |||
50 | file://0018-export-CPP.patch \ | 50 | file://0018-export-CPP.patch \ |
51 | file://0019-Ensure-target-gcc-headers-can-be-included.patch \ | 51 | file://0019-Ensure-target-gcc-headers-can-be-included.patch \ |
52 | file://0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ | 52 | file://0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ |
53 | file://0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ | ||
54 | file://0022-aarch64-Add-support-for-musl-ldso.patch \ | ||
55 | file://0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ | 53 | file://0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ |
56 | file://0024-handle-sysroot-support-for-nativesdk-gcc.patch \ | 54 | file://0024-handle-sysroot-support-for-nativesdk-gcc.patch \ |
57 | file://0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ | 55 | file://0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ |
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 index 4726267a80..0884730786 100644 --- 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 | |||
@@ -30,8 +30,7 @@ Upstream-Status: Inappropriate [OE configuration] | |||
30 | gcc/config/sparc/linux64.h | 4 ++-- | 30 | gcc/config/sparc/linux64.h | 4 ++-- |
31 | 12 files changed, 29 insertions(+), 34 deletions(-) | 31 | 12 files changed, 29 insertions(+), 34 deletions(-) |
32 | 32 | ||
33 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h | 33 | unchanged: |
34 | index c1dae8ca2cf..3ce2b76c1a4 100644 | ||
35 | --- a/gcc/config/alpha/linux-elf.h | 34 | --- a/gcc/config/alpha/linux-elf.h |
36 | +++ b/gcc/config/alpha/linux-elf.h | 35 | +++ b/gcc/config/alpha/linux-elf.h |
37 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see | 36 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see |
@@ -45,8 +44,7 @@ index c1dae8ca2cf..3ce2b76c1a4 100644 | |||
45 | #if DEFAULT_LIBC == LIBC_UCLIBC | 44 | #if DEFAULT_LIBC == LIBC_UCLIBC |
46 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | 45 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" |
47 | #elif DEFAULT_LIBC == LIBC_GLIBC | 46 | #elif DEFAULT_LIBC == LIBC_GLIBC |
48 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h | 47 | unchanged: |
49 | index 85d0136e76e..6bd95855827 100644 | ||
50 | --- a/gcc/config/arm/linux-eabi.h | 48 | --- a/gcc/config/arm/linux-eabi.h |
51 | +++ b/gcc/config/arm/linux-eabi.h | 49 | +++ b/gcc/config/arm/linux-eabi.h |
52 | @@ -65,8 +65,8 @@ | 50 | @@ -65,8 +65,8 @@ |
@@ -60,8 +58,7 @@ index 85d0136e76e..6bd95855827 100644 | |||
60 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT | 58 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT |
61 | 59 | ||
62 | #define GLIBC_DYNAMIC_LINKER \ | 60 | #define GLIBC_DYNAMIC_LINKER \ |
63 | diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h | 61 | unchanged: |
64 | index 0c1c4e70b6b..6bd643ade11 100644 | ||
65 | --- a/gcc/config/arm/linux-elf.h | 62 | --- a/gcc/config/arm/linux-elf.h |
66 | +++ b/gcc/config/arm/linux-elf.h | 63 | +++ b/gcc/config/arm/linux-elf.h |
67 | @@ -60,7 +60,7 @@ | 64 | @@ -60,7 +60,7 @@ |
@@ -73,8 +70,7 @@ index 0c1c4e70b6b..6bd643ade11 100644 | |||
73 | 70 | ||
74 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ | 71 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ |
75 | %{static:-Bstatic} \ | 72 | %{static:-Bstatic} \ |
76 | diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h | 73 | unchanged: |
77 | index 04b274f1654..7aafcf3ac2d 100644 | ||
78 | --- a/gcc/config/i386/linux.h | 74 | --- a/gcc/config/i386/linux.h |
79 | +++ b/gcc/config/i386/linux.h | 75 | +++ b/gcc/config/i386/linux.h |
80 | @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see | 76 | @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see |
@@ -86,8 +82,7 @@ index 04b274f1654..7aafcf3ac2d 100644 | |||
86 | 82 | ||
87 | #undef MUSL_DYNAMIC_LINKER | 83 | #undef MUSL_DYNAMIC_LINKER |
88 | #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" | 84 | #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 | 85 | unchanged: |
90 | index b3822ced528..92d303e80d6 100644 | ||
91 | --- a/gcc/config/i386/linux64.h | 86 | --- a/gcc/config/i386/linux64.h |
92 | +++ b/gcc/config/i386/linux64.h | 87 | +++ b/gcc/config/i386/linux64.h |
93 | @@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 88 | @@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
@@ -103,8 +98,7 @@ index b3822ced528..92d303e80d6 100644 | |||
103 | 98 | ||
104 | #undef MUSL_DYNAMIC_LINKER32 | 99 | #undef MUSL_DYNAMIC_LINKER32 |
105 | #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" | 100 | #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" |
106 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 101 | unchanged: |
107 | index 4e1db60fced..87efc5f69fe 100644 | ||
108 | --- a/gcc/config/linux.h | 102 | --- a/gcc/config/linux.h |
109 | +++ b/gcc/config/linux.h | 103 | +++ b/gcc/config/linux.h |
110 | @@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 104 | @@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
@@ -122,8 +116,7 @@ index 4e1db60fced..87efc5f69fe 100644 | |||
122 | #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" | 116 | #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" |
123 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" | 117 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" |
124 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" | 118 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" |
125 | diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h | 119 | unchanged: |
126 | index 44a85e410d9..8d41b5574f6 100644 | ||
127 | --- a/gcc/config/mips/linux.h | 120 | --- a/gcc/config/mips/linux.h |
128 | +++ b/gcc/config/mips/linux.h | 121 | +++ b/gcc/config/mips/linux.h |
129 | @@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see | 122 | @@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see |
@@ -153,8 +146,7 @@ index 44a85e410d9..8d41b5574f6 100644 | |||
153 | 146 | ||
154 | #undef MUSL_DYNAMIC_LINKER32 | 147 | #undef MUSL_DYNAMIC_LINKER32 |
155 | #define MUSL_DYNAMIC_LINKER32 \ | 148 | #define MUSL_DYNAMIC_LINKER32 \ |
156 | diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h | 149 | unchanged: |
157 | index 9238de5bc92..7136a83260a 100644 | ||
158 | --- a/gcc/config/riscv/linux.h | 150 | --- a/gcc/config/riscv/linux.h |
159 | +++ b/gcc/config/riscv/linux.h | 151 | +++ b/gcc/config/riscv/linux.h |
160 | @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see | 152 | @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see |
@@ -166,8 +158,7 @@ index 9238de5bc92..7136a83260a 100644 | |||
166 | 158 | ||
167 | #define MUSL_ABI_SUFFIX \ | 159 | #define MUSL_ABI_SUFFIX \ |
168 | "%{mabi=ilp32:-sf}" \ | 160 | "%{mabi=ilp32:-sf}" \ |
169 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h | 161 | unchanged: |
170 | index e3f2cd254f6..a11e01faa3d 100644 | ||
171 | --- a/gcc/config/rs6000/linux64.h | 162 | --- a/gcc/config/rs6000/linux64.h |
172 | +++ b/gcc/config/rs6000/linux64.h | 163 | +++ b/gcc/config/rs6000/linux64.h |
173 | @@ -336,24 +336,19 @@ extern int dot_symbols; | 164 | @@ -336,24 +336,19 @@ extern int dot_symbols; |
@@ -200,8 +191,7 @@ index e3f2cd254f6..a11e01faa3d 100644 | |||
200 | 191 | ||
201 | #undef DEFAULT_ASM_ENDIAN | 192 | #undef DEFAULT_ASM_ENDIAN |
202 | #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) | 193 | #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) |
203 | diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h | 194 | unchanged: |
204 | index 7558d2f7195..3aaa6c3a078 100644 | ||
205 | --- a/gcc/config/sh/linux.h | 195 | --- a/gcc/config/sh/linux.h |
206 | +++ b/gcc/config/sh/linux.h | 196 | +++ b/gcc/config/sh/linux.h |
207 | @@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see | 197 | @@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see |
@@ -213,8 +203,7 @@ index 7558d2f7195..3aaa6c3a078 100644 | |||
213 | 203 | ||
214 | #undef SUBTARGET_LINK_EMUL_SUFFIX | 204 | #undef SUBTARGET_LINK_EMUL_SUFFIX |
215 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" | 205 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" |
216 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h | 206 | unchanged: |
217 | index 2550d7ee8f0..a94f4cd8ba2 100644 | ||
218 | --- a/gcc/config/sparc/linux.h | 207 | --- a/gcc/config/sparc/linux.h |
219 | +++ b/gcc/config/sparc/linux.h | 208 | +++ b/gcc/config/sparc/linux.h |
220 | @@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); | 209 | @@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); |
@@ -226,8 +215,7 @@ index 2550d7ee8f0..a94f4cd8ba2 100644 | |||
226 | 215 | ||
227 | #undef LINK_SPEC | 216 | #undef LINK_SPEC |
228 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ | 217 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ |
229 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h | 218 | unchanged: |
230 | index 95af8afa9b5..63127afb074 100644 | ||
231 | --- a/gcc/config/sparc/linux64.h | 219 | --- a/gcc/config/sparc/linux64.h |
232 | +++ b/gcc/config/sparc/linux64.h | 220 | +++ b/gcc/config/sparc/linux64.h |
233 | @@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see | 221 | @@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see |
@@ -241,3 +229,19 @@ index 95af8afa9b5..63127afb074 100644 | |||
241 | 229 | ||
242 | #ifdef SPARC_BI_ARCH | 230 | #ifdef SPARC_BI_ARCH |
243 | 231 | ||
232 | diff -u b/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h | ||
233 | --- b/gcc/config/aarch64/aarch64-linux.h | ||
234 | +++ b/gcc/config/aarch64/aarch64-linux.h | ||
235 | @@ -21,10 +21,10 @@ | ||
236 | #ifndef GCC_AARCH64_LINUX_H | ||
237 | #define GCC_AARCH64_LINUX_H | ||
238 | |||
239 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
240 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
241 | |||
242 | #undef MUSL_DYNAMIC_LINKER | ||
243 | -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
244 | +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
245 | |||
246 | #undef ASAN_CC1_SPEC | ||
247 | #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch deleted file mode 100644 index 0f3b3869b0..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 7faad21154a76b200efcced9e12945057c94dff3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 28 Apr 2015 23:15:27 -0700 | ||
4 | Subject: [PATCH] Use SYSTEMLIBS_DIR replacement instead of hardcoding | ||
5 | base_libdir | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | gcc/config/aarch64/aarch64-linux.h | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h | ||
15 | index 7f2529a2a1d..5303b39186f 100644 | ||
16 | --- a/gcc/config/aarch64/aarch64-linux.h | ||
17 | +++ b/gcc/config/aarch64/aarch64-linux.h | ||
18 | @@ -21,7 +21,7 @@ | ||
19 | #ifndef GCC_AARCH64_LINUX_H | ||
20 | #define GCC_AARCH64_LINUX_H | ||
21 | |||
22 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
23 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
24 | |||
25 | #undef MUSL_DYNAMIC_LINKER | ||
26 | #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch deleted file mode 100644 index 41536a8a3b..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 96aa24a874331a318693e4fccc4bc4e7d3fbad2b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 28 Apr 2015 23:18:39 -0700 | ||
4 | Subject: [PATCH] aarch64: Add support for musl ldso | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | gcc/config/aarch64/aarch64-linux.h | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h | ||
14 | index 5303b39186f..4bcae7f3110 100644 | ||
15 | --- a/gcc/config/aarch64/aarch64-linux.h | ||
16 | +++ b/gcc/config/aarch64/aarch64-linux.h | ||
17 | @@ -24,7 +24,7 @@ | ||
18 | #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
19 | |||
20 | #undef MUSL_DYNAMIC_LINKER | ||
21 | -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
22 | +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | ||
23 | |||
24 | #undef ASAN_CC1_SPEC | ||
25 | #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" | ||