summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo@foundries.io>2019-03-26 15:07:35 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-29 08:28:53 +0000
commit95a31636804c237a88fe11f696363ecc3f45fa87 (patch)
tree7e9e4dc74b9bab484d4ed0025ac76c4ad2f69935 /meta
parentc545daa7cb2f22501c3f1c5d34b51101f5260307 (diff)
downloadpoky-95a31636804c237a88fe11f696363ecc3f45fa87.tar.gz
gcc-8.3: add back GLIBC_DYNAMIC_LINKER riscv changes
The riscv GLIBC_DYNAMIC_LINKER changes were dropped during the gcc 8.3 update, breaking usrmerge support. (From OE-Core rev: 299ec755de5d568f284d98c77863da4636e3fd05) Signed-off-by: Ricardo Salveti <ricardo@foundries.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch18
1 files changed, 16 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 91a55c556f..d3be10f207 100644
--- a/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,4 +1,4 @@
1From 4a697387eeab14ece2796c01382cca30e8467ffa Mon Sep 17 00:00:00 2001 1From 6f8649936df3677109b8396f563c716ae8b237fe 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 12/40] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 4Subject: [PATCH 12/40] 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 | 16 ++++++---------- 27 gcc/config/rs6000/linux64.h | 16 ++++++----------
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, 29 insertions(+), 33 deletions(-) 31 12 files changed, 30 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 36b74dc1993..02373578af8 100644 34index 36b74dc1993..02373578af8 100644
@@ -152,6 +153,19 @@ index 2dfd0c18b90..12057c51b5e 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 aa8a28d5d31..ebf9551c955 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 44eab40a234..54aa8d957e7 100644 170index 44eab40a234..54aa8d957e7 100644
157--- a/gcc/config/rs6000/linux64.h 171--- a/gcc/config/rs6000/linux64.h