summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-03-30 05:19:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-30 21:24:02 +0100
commit53b5dc0dda3fa7703e8f6a68b05b565ecee9e41f (patch)
tree3693da257142879717857418b60bc8b145569bef /meta
parentdd31bcafb86936cee121674b2792129aca639547 (diff)
downloadpoky-53b5dc0dda3fa7703e8f6a68b05b565ecee9e41f.tar.gz
gcc: Fix musl ldso name for mips64
Now we have mips64 port of musl and there is a name for ldso, backport the fix from upstream gcc master (From OE-Core rev: fd37da3a559e0c494c7481849746ec12d492a7b2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch26
1 files changed, 15 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch b/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
index 7f7307b1e0..3c1115aa86 100644
--- a/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
@@ -1,7 +1,9 @@
1From a32a7901315bf01d0605e43cb7d0427a6d7e4b75 Mon Sep 17 00:00:00 2001 1From a6c649571d49c972e6d207577780ada7e9b6bad5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 8 Dec 2015 08:31:52 +0000 3Date: Tue, 8 Dec 2015 08:31:52 +0000
4Subject: [PATCH 45/46] Support for arm-linux-musl. 4Subject: [PATCH 45/57] Support for arm-linux-musl.
5
6Fix musl ldso for all arches
5 7
6Upstream-Status: backport [partial] 8Upstream-Status: backport [partial]
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -10,12 +12,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 gcc/config/arm/linux-eabi.h | 17 +++++++++++++++++ 12 gcc/config/arm/linux-eabi.h | 17 +++++++++++++++++
11 gcc/config/i386/linux.h | 1 + 13 gcc/config/i386/linux.h | 1 +
12 gcc/config/i386/linux64.h | 5 +++++ 14 gcc/config/i386/linux64.h | 5 +++++
13 gcc/config/mips/linux.h | 6 +++++- 15 gcc/config/mips/linux.h | 8 +++++++-
14 gcc/config/rs6000/linux64.h | 13 +++++++++---- 16 gcc/config/rs6000/linux64.h | 13 +++++++++----
15 gcc/config/rs6000/sysv4.h | 10 +++++++--- 17 gcc/config/rs6000/sysv4.h | 10 +++++++---
16 libitm/config/arm/hwcap.cc | 4 ++++ 18 libitm/config/arm/hwcap.cc | 4 ++++
17 libitm/config/linux/x86/tls.h | 8 ++++++-- 19 libitm/config/linux/x86/tls.h | 8 ++++++--
18 9 files changed, 55 insertions(+), 10 deletions(-) 20 9 files changed, 57 insertions(+), 10 deletions(-)
19 21
20diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h 22diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
21index f9e65fc..1b2d0c0 100644 23index f9e65fc..1b2d0c0 100644
@@ -80,21 +82,23 @@ index 6185cce..5a3a977 100644
80+#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" 82+#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1"
81+ 83+
82diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h 84diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
83index c306afb..44d4c12 100644 85index c306afb..b899388 100644
84--- a/gcc/config/mips/linux.h 86--- a/gcc/config/mips/linux.h
85+++ b/gcc/config/mips/linux.h 87+++ b/gcc/config/mips/linux.h
86@@ -21,6 +21,10 @@ along with GCC; see the file COPYING3. If not see 88@@ -21,6 +21,12 @@ along with GCC; see the file COPYING3. If not see
87 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" 89 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
88 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" 90 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
89 91
90+#define MUSL_DYNAMIC_LINKERN32 SYSTEMLIBS_DIR "ld-musl-mips.so.1" 92+#undef MUSL_DYNAMIC_LINKER32
91+#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-mips.so.1" 93+#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1"
92+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-mips.so.1" 94+#undef MUSL_DYNAMIC_LINKER64
95+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1"
96+#define MUSL_DYNAMIC_LINKERN32 SYSTEMLIBS_DIR "ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1"
93+ 97+
94 #define GLIBC_DYNAMIC_LINKER32 \ 98 #define GLIBC_DYNAMIC_LINKER32 \
95 "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" 99 "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
96 #define GLIBC_DYNAMIC_LINKER64 \ 100 #define GLIBC_DYNAMIC_LINKER64 \
97@@ -40,4 +44,4 @@ along with GCC; see the file COPYING3. If not see 101@@ -40,4 +46,4 @@ along with GCC; see the file COPYING3. If not see
98 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" 102 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
99 #define GNU_USER_DYNAMIC_LINKERN32 \ 103 #define GNU_USER_DYNAMIC_LINKERN32 \
100 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ 104 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
@@ -208,5 +212,5 @@ index e731ab7..54ad8b6 100644
208 212
209 #endif // LIBITM_X86_TLS_H 213 #endif // LIBITM_X86_TLS_H
210-- 214--
2112.6.3 2152.7.4
212 216