summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-09-04 18:29:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 14:58:10 +0100
commit4bed6fe63d784dc0fd858ff35dfa83256017b84b (patch)
treed6e65a592d2513068de61f786971e5e856a101e0 /meta/recipes-devtools/gcc
parent57428a8f146841755d3b9eaef1382f60813e5a3a (diff)
downloadpoky-4bed6fe63d784dc0fd858ff35dfa83256017b84b.tar.gz
gcc-9.2: Fix risc-v dynamic linker relocation
Accidentally dropped in 9.2 update Reported-by: Ricardo Salveti <ricardo@foundries.io> (From OE-Core rev: bd21f36faeceb83ab629bd34a4e53a6947d6a469) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch23
1 files changed, 17 insertions, 6 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 21908bce9b..66fb24d4cd 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,7 +1,7 @@
1From a93743732b2125aebd9a6d65e999d7506b01d6b3 Mon Sep 17 00:00:00 2001 1From 72fc3975bcd720b2f8040fa87cd23d3db4c5975a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:24:50 +0400 3Date: Fri, 29 Mar 2013 09:24:50 +0400
4Subject: [PATCH 11/36] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 4Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
5 relative to SYSTEMLIBS_DIR 5 relative to SYSTEMLIBS_DIR
6 6
7This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 7This patch defines 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
32diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h 33diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
33index 824861befec..6afacce3292 100644 34index 824861befec..6afacce3292 100644
@@ -152,6 +153,19 @@ 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 \
156diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
157index 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}" \
155diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h 169diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
156index 9946d3fed94..45a9a7cae59 100644 170index 9946d3fed94..45a9a7cae59 100644
157--- a/gcc/config/rs6000/linux64.h 171--- a/gcc/config/rs6000/linux64.h
@@ -227,6 +241,3 @@ index 789d1df4bd5..b920c680fb1 100644
227 241
228 #ifdef SPARC_BI_ARCH 242 #ifdef SPARC_BI_ARCH
229 243
230--
2312.22.1
232