diff options
author | Ricardo Salveti <ricardo@foundries.io> | 2019-07-03 13:04:41 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-05 12:00:20 +0100 |
commit | e005972786ef2481393e93ae3b784c2c3bd44d87 (patch) | |
tree | fad36f2485b75041051fc00e58f87c7295be5c13 /meta/recipes-devtools | |
parent | 1b7876b0608bff9e8fcd2c334d1634db21ef7325 (diff) | |
download | poky-e005972786ef2481393e93ae3b784c2c3bd44d87.tar.gz |
gcc-9.1: add back GLIBC_DYNAMIC_LINKER riscv changes
The riscv GLIBC_DYNAMIC_LINKER changes were dropped during the gcc 9.1
update, breaking usrmerge support.
(From OE-Core rev: 87a59a79292d2673d084e148a8161a676d87bf18)
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index f23a314c13..1ff85c8073 100644 --- a/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 492f008dce784749e39e1c396aeea6fa1d977374 Mon Sep 17 00:00:00 2001 | 1 | From 0e13b09ae400d8c8755e2869c72a158ed0dbc0b6 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 | 3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 |
4 | Subject: [PATCH 12/37] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER | 4 | Subject: [PATCH 12/37] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER |
@@ -23,11 +23,12 @@ Upstream-Status: Inappropriate [OE configuration] | |||
23 | gcc/config/i386/linux64.h | 6 +++--- | 23 | gcc/config/i386/linux64.h | 6 +++--- |
24 | gcc/config/linux.h | 8 ++++---- | 24 | gcc/config/linux.h | 8 ++++---- |
25 | gcc/config/mips/linux.h | 12 ++++++------ | 25 | gcc/config/mips/linux.h | 12 ++++++------ |
26 | gcc/config/riscv/linux.h | 2 +- | ||
26 | gcc/config/rs6000/linux64.h | 15 +++++---------- | 27 | gcc/config/rs6000/linux64.h | 15 +++++---------- |
27 | gcc/config/sh/linux.h | 2 +- | 28 | gcc/config/sh/linux.h | 2 +- |
28 | gcc/config/sparc/linux.h | 2 +- | 29 | gcc/config/sparc/linux.h | 2 +- |
29 | gcc/config/sparc/linux64.h | 4 ++-- | 30 | gcc/config/sparc/linux64.h | 4 ++-- |
30 | 11 files changed, 28 insertions(+), 33 deletions(-) | 31 | 12 files changed, 29 insertions(+), 34 deletions(-) |
31 | 32 | ||
32 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h | 33 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h |
33 | index 824861befec..6afacce3292 100644 | 34 | index 824861befec..6afacce3292 100644 |
@@ -152,11 +153,24 @@ index 6f79ac9c01a..25de96f9561 100644 | |||
152 | 153 | ||
153 | #undef MUSL_DYNAMIC_LINKER32 | 154 | #undef MUSL_DYNAMIC_LINKER32 |
154 | #define 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 58dd18b89f3..112ba9cd764 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}" \ | ||
155 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h | 169 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h |
156 | index bcc540b5ff2..982ca274621 100644 | 170 | index 5380f6a6a6f..c0f2dc1f43e 100644 |
157 | --- a/gcc/config/rs6000/linux64.h | 171 | --- a/gcc/config/rs6000/linux64.h |
158 | +++ b/gcc/config/rs6000/linux64.h | 172 | +++ b/gcc/config/rs6000/linux64.h |
159 | @@ -428,24 +428,19 @@ extern int dot_symbols; | 173 | @@ -435,24 +435,19 @@ extern int dot_symbols; |
160 | #undef LINK_OS_DEFAULT_SPEC | 174 | #undef LINK_OS_DEFAULT_SPEC |
161 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" | 175 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" |
162 | 176 | ||
@@ -200,10 +214,10 @@ index c9897b7aca5..82f275319cc 100644 | |||
200 | #undef SUBTARGET_LINK_EMUL_SUFFIX | 214 | #undef SUBTARGET_LINK_EMUL_SUFFIX |
201 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" | 215 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" |
202 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h | 216 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h |
203 | index 2db9ea2172e..1979cfff5d3 100644 | 217 | index 08476f1d94d..80440e712ad 100644 |
204 | --- a/gcc/config/sparc/linux.h | 218 | --- a/gcc/config/sparc/linux.h |
205 | +++ b/gcc/config/sparc/linux.h | 219 | +++ b/gcc/config/sparc/linux.h |
206 | @@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); | 220 | @@ -84,7 +84,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); |
207 | When the -shared link option is used a final link is not being | 221 | When the -shared link option is used a final link is not being |
208 | done. */ | 222 | done. */ |
209 | 223 | ||
@@ -213,7 +227,7 @@ index 2db9ea2172e..1979cfff5d3 100644 | |||
213 | #undef LINK_SPEC | 227 | #undef LINK_SPEC |
214 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ | 228 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ |
215 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h | 229 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h |
216 | index 21e13001951..d39c38a531f 100644 | 230 | index 789d1df4bd5..b920c680fb1 100644 |
217 | --- a/gcc/config/sparc/linux64.h | 231 | --- a/gcc/config/sparc/linux64.h |
218 | +++ b/gcc/config/sparc/linux64.h | 232 | +++ b/gcc/config/sparc/linux64.h |
219 | @@ -84,8 +84,8 @@ along with GCC; see the file COPYING3. If not see | 233 | @@ -84,8 +84,8 @@ along with GCC; see the file COPYING3. If not see |