217 lines
8.7 KiB
Diff
217 lines
8.7 KiB
Diff
From a6c649571d49c972e6d207577780ada7e9b6bad5 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Tue, 8 Dec 2015 08:31:52 +0000
|
|
Subject: [PATCH 45/57] Support for arm-linux-musl.
|
|
|
|
Fix musl ldso for all arches
|
|
|
|
Upstream-Status: backport [partial]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
gcc/config/aarch64/aarch64-linux.h | 1 +
|
|
gcc/config/arm/linux-eabi.h | 17 +++++++++++++++++
|
|
gcc/config/i386/linux.h | 1 +
|
|
gcc/config/i386/linux64.h | 5 +++++
|
|
gcc/config/mips/linux.h | 8 +++++++-
|
|
gcc/config/rs6000/linux64.h | 13 +++++++++----
|
|
gcc/config/rs6000/sysv4.h | 10 +++++++---
|
|
libitm/config/arm/hwcap.cc | 4 ++++
|
|
libitm/config/linux/x86/tls.h | 8 ++++++--
|
|
9 files changed, 57 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
|
|
index f9e65fc..1b2d0c0 100644
|
|
--- a/gcc/config/aarch64/aarch64-linux.h
|
|
+++ b/gcc/config/aarch64/aarch64-linux.h
|
|
@@ -22,6 +22,7 @@
|
|
#define GCC_AARCH64_LINUX_H
|
|
|
|
#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
|
|
+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
|
|
|
|
#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
|
|
|
|
diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
|
|
index 048a062..adb9c44 100644
|
|
--- a/gcc/config/arm/linux-eabi.h
|
|
+++ b/gcc/config/arm/linux-eabi.h
|
|
@@ -81,6 +81,23 @@
|
|
#undef TARGET_FIX_V4BX_SPEC
|
|
#define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}"
|
|
|
|
+/* For ARM musl currently supports four dynamic linkers:
|
|
+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
|
|
+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
|
|
+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
|
|
+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
|
|
+ musl does not support the legacy OABI mode.
|
|
+ All the dynamic linkers live in /lib.
|
|
+ We default to soft-float, EL. */
|
|
+#undef MUSL_DYNAMIC_LINKER
|
|
+#if TARGET_BIG_ENDIAN_DEFAULT
|
|
+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
|
|
+#else
|
|
+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
|
|
+#endif
|
|
+#define MUSL_DYNAMIC_LINKER \
|
|
+ SYSTEMLIBS_DIR "ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
|
|
+
|
|
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
|
|
use the GNU/Linux version, not the generic BPABI version. */
|
|
#undef LINK_SPEC
|
|
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
|
|
index 21ba2b2..e2b81e5 100644
|
|
--- a/gcc/config/i386/linux.h
|
|
+++ b/gcc/config/i386/linux.h
|
|
@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. If not see
|
|
|
|
#define GNU_USER_LINK_EMULATION "elf_i386"
|
|
#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
|
|
+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1"
|
|
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
|
|
index 6185cce..5a3a977 100644
|
|
--- a/gcc/config/i386/linux64.h
|
|
+++ b/gcc/config/i386/linux64.h
|
|
@@ -30,3 +30,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
|
|
#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
|
|
#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2"
|
|
+
|
|
+#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-i386.so.1"
|
|
+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-x86_64.so.1"
|
|
+#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1"
|
|
+
|
|
diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
|
|
index c306afb..b899388 100644
|
|
--- a/gcc/config/mips/linux.h
|
|
+++ b/gcc/config/mips/linux.h
|
|
@@ -21,6 +21,12 @@ along with GCC; see the file COPYING3. If not see
|
|
#define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
|
|
#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
|
|
|
|
+#undef MUSL_DYNAMIC_LINKER32
|
|
+#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1"
|
|
+#undef MUSL_DYNAMIC_LINKER64
|
|
+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1"
|
|
+#define MUSL_DYNAMIC_LINKERN32 SYSTEMLIBS_DIR "ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1"
|
|
+
|
|
#define GLIBC_DYNAMIC_LINKER32 \
|
|
"%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
|
|
#define GLIBC_DYNAMIC_LINKER64 \
|
|
@@ -40,4 +46,4 @@ along with GCC; see the file COPYING3. If not see
|
|
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
|
|
#define GNU_USER_DYNAMIC_LINKERN32 \
|
|
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
|
|
- BIONIC_DYNAMIC_LINKERN32)
|
|
+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
|
|
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
|
|
index 31c4338..679da4b 100644
|
|
--- a/gcc/config/rs6000/linux64.h
|
|
+++ b/gcc/config/rs6000/linux64.h
|
|
@@ -365,17 +365,22 @@ extern int dot_symbols;
|
|
#endif
|
|
#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
|
|
#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0"
|
|
+#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-powerpc.so.1"
|
|
+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-powerpc64.so.1"
|
|
+
|
|
#if DEFAULT_LIBC == LIBC_UCLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
|
|
#elif DEFAULT_LIBC == LIBC_GLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
|
|
+#elif DEFAULT_LIBC == LIBC_MUSL
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
|
|
#else
|
|
#error "Unsupported DEFAULT_LIBC"
|
|
#endif
|
|
#define GNU_USER_DYNAMIC_LINKER32 \
|
|
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
|
|
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
|
|
#define GNU_USER_DYNAMIC_LINKER64 \
|
|
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
|
|
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
|
|
|
|
#undef DEFAULT_ASM_ENDIAN
|
|
#if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
|
|
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
|
index 7cd07e0..8794fa5 100644
|
|
--- a/gcc/config/rs6000/sysv4.h
|
|
+++ b/gcc/config/rs6000/sysv4.h
|
|
@@ -763,15 +763,19 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
|
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
|
#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
|
|
+
|
|
#if DEFAULT_LIBC == LIBC_UCLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
|
|
+#elif DEFAULT_LIBC == LIBC_MUSL
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
|
|
#elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
|
|
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
|
|
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
|
|
#else
|
|
#error "Unsupported DEFAULT_LIBC"
|
|
#endif
|
|
#define GNU_USER_DYNAMIC_LINKER \
|
|
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
|
|
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
|
|
|
|
#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
|
|
%{rdynamic:-export-dynamic} \
|
|
diff --git a/libitm/config/arm/hwcap.cc b/libitm/config/arm/hwcap.cc
|
|
index a1c2cfd..dd4fad2 100644
|
|
--- a/libitm/config/arm/hwcap.cc
|
|
+++ b/libitm/config/arm/hwcap.cc
|
|
@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
|
|
|
|
#ifdef __linux__
|
|
#include <unistd.h>
|
|
+#ifdef __GLIBC__
|
|
#include <sys/fcntl.h>
|
|
+#else
|
|
+#include <fcntl.h>
|
|
+#endif
|
|
#include <elf.h>
|
|
|
|
static void __attribute__((constructor))
|
|
diff --git a/libitm/config/linux/x86/tls.h b/libitm/config/linux/x86/tls.h
|
|
index e731ab7..54ad8b6 100644
|
|
--- a/libitm/config/linux/x86/tls.h
|
|
+++ b/libitm/config/linux/x86/tls.h
|
|
@@ -25,16 +25,19 @@
|
|
#ifndef LIBITM_X86_TLS_H
|
|
#define LIBITM_X86_TLS_H 1
|
|
|
|
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
|
|
+#if defined(__GLIBC_PREREQ)
|
|
+#if __GLIBC_PREREQ(2, 10)
|
|
/* Use slots in the TCB head rather than __thread lookups.
|
|
GLIBC has reserved words 10 through 13 for TM. */
|
|
#define HAVE_ARCH_GTM_THREAD 1
|
|
#define HAVE_ARCH_GTM_THREAD_DISP 1
|
|
#endif
|
|
+#endif
|
|
|
|
#include "config/generic/tls.h"
|
|
|
|
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
|
|
+#if defined(__GLIBC_PREREQ)
|
|
+#if __GLIBC_PREREQ(2, 10)
|
|
namespace GTM HIDDEN {
|
|
|
|
#ifdef __x86_64__
|
|
@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct abi_dispatch *x)
|
|
|
|
} // namespace GTM
|
|
#endif /* >= GLIBC 2.10 */
|
|
+#endif
|
|
|
|
#endif // LIBITM_X86_TLS_H
|
|
--
|
|
2.7.4
|
|
|