From 8e9d6efecdc8c42f47e3a012dee764b13c3dad59 Mon Sep 17 00:00:00 2001
|
From: Khem Raj <raj.khem@gmail.com>
|
Date: Fri, 29 Mar 2013 09:24:50 +0400
|
Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
|
relative to SYSTEMLIBS_DIR
|
|
This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
|
relative to SYSTEMLIBS_DIR which can be set in generated headers
|
This breaks the assumption of hardcoded multilib in gcc
|
Change is only for the supported architectures in OE including
|
SH, sparc, alpha for possible future support (if any)
|
|
Removes the do_headerfix task in metadata
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Upstream-Status: Inappropriate [OE configuration]
|
---
|
gcc/config/alpha/linux-elf.h | 4 ++--
|
gcc/config/arm/linux-eabi.h | 4 ++--
|
gcc/config/arm/linux-elf.h | 2 +-
|
gcc/config/i386/linux.h | 2 +-
|
gcc/config/i386/linux64.h | 6 +++---
|
gcc/config/linux.h | 8 ++++----
|
gcc/config/mips/linux.h | 12 ++++++------
|
gcc/config/riscv/linux.h | 2 +-
|
gcc/config/rs6000/linux64.h | 15 +++++----------
|
gcc/config/sh/linux.h | 2 +-
|
gcc/config/sparc/linux.h | 2 +-
|
gcc/config/sparc/linux64.h | 4 ++--
|
12 files changed, 29 insertions(+), 34 deletions(-)
|
|
diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
|
index c1dae8ca2cf..3ce2b76c1a4 100644
|
--- a/gcc/config/alpha/linux-elf.h
|
+++ b/gcc/config/alpha/linux-elf.h
|
@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see
|
#define EXTRA_SPECS \
|
{ "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
|
|
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
|
+#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0"
|
#if DEFAULT_LIBC == LIBC_UCLIBC
|
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
|
#elif DEFAULT_LIBC == LIBC_GLIBC
|
diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
|
index 85d0136e76e..6bd95855827 100644
|
--- a/gcc/config/arm/linux-eabi.h
|
+++ b/gcc/config/arm/linux-eabi.h
|
@@ -65,8 +65,8 @@
|
GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
|
|
#undef GLIBC_DYNAMIC_LINKER
|
-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
|
-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
|
+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR "ld-linux.so.3"
|
+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR "ld-linux-armhf.so.3"
|
#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
|
|
#define GLIBC_DYNAMIC_LINKER \
|
diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
|
index 0c1c4e70b6b..6bd643ade11 100644
|
--- a/gcc/config/arm/linux-elf.h
|
+++ b/gcc/config/arm/linux-elf.h
|
@@ -60,7 +60,7 @@
|
|
#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
|
|
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
|
|
#define LINUX_TARGET_LINK_SPEC "%{h*} \
|
%{static:-Bstatic} \
|
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
|
index 04b274f1654..7aafcf3ac2d 100644
|
--- a/gcc/config/i386/linux.h
|
+++ b/gcc/config/i386/linux.h
|
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see
|
<http://www.gnu.org/licenses/>. */
|
|
#define GNU_USER_LINK_EMULATION "elf_i386"
|
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
|
|
#undef MUSL_DYNAMIC_LINKER
|
#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
|
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
|
index b3822ced528..92d303e80d6 100644
|
--- a/gcc/config/i386/linux64.h
|
+++ b/gcc/config/i386/linux64.h
|
@@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
#define GNU_USER_LINK_EMULATION64 "elf_x86_64"
|
#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
|
|
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
|
-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
|
+#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"
|
|
#undef MUSL_DYNAMIC_LINKER32
|
#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
|
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
|
index 4e1db60fced..87efc5f69fe 100644
|
--- a/gcc/config/linux.h
|
+++ b/gcc/config/linux.h
|
@@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
|
GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
|
supporting both 32-bit and 64-bit compilation. */
|
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
|
-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
|
-#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
|
+#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0"
|
+#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
|
+#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0"
|
+#define UCLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ldx32-uClibc.so.0"
|
#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
|
#define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
|
#define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
|
diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
|
index 44a85e410d9..8d41b5574f6 100644
|
--- a/gcc/config/mips/linux.h
|
+++ b/gcc/config/mips/linux.h
|
@@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see
|
#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
|
|
#define GLIBC_DYNAMIC_LINKER32 \
|
- "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
|
+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
|
#define GLIBC_DYNAMIC_LINKER64 \
|
- "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
|
+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
|
#define GLIBC_DYNAMIC_LINKERN32 \
|
- "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
|
+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
|
|
#undef UCLIBC_DYNAMIC_LINKER32
|
#define UCLIBC_DYNAMIC_LINKER32 \
|
- "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
|
+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}"
|
#undef UCLIBC_DYNAMIC_LINKER64
|
#define UCLIBC_DYNAMIC_LINKER64 \
|
- "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
|
+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld64-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld64-uClibc.so.0}"
|
#define UCLIBC_DYNAMIC_LINKERN32 \
|
- "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
|
+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}"
|
|
#undef MUSL_DYNAMIC_LINKER32
|
#define MUSL_DYNAMIC_LINKER32 \
|
diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
|
index 9238de5bc92..7136a83260a 100644
|
--- a/gcc/config/riscv/linux.h
|
+++ b/gcc/config/riscv/linux.h
|
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see
|
GNU_USER_TARGET_OS_CPP_BUILTINS(); \
|
} while (0)
|
|
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1"
|
+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1"
|
|
#define MUSL_ABI_SUFFIX \
|
"%{mabi=ilp32:-sf}" \
|
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
|
index e3f2cd254f6..a11e01faa3d 100644
|
--- a/gcc/config/rs6000/linux64.h
|
+++ b/gcc/config/rs6000/linux64.h
|
@@ -336,24 +336,19 @@ extern int dot_symbols;
|
#undef LINK_OS_DEFAULT_SPEC
|
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
|
|
-#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
|
-
|
+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1"
|
#ifdef LINUX64_DEFAULT_ABI_ELFv2
|
-#define GLIBC_DYNAMIC_LINKER64 \
|
-"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
|
-":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
|
+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:" SYSTEMLIBS_DIR "ld64.so.1;:" SYSTEMLIBS_DIR "ld64.so.2}"
|
#else
|
-#define GLIBC_DYNAMIC_LINKER64 \
|
-"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
|
-":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
|
+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:" SYSTEMLIBS_DIR "ld64.so.2;:" SYSTEMLIBS_DIR "ld64.so.1}"
|
#endif
|
|
#undef MUSL_DYNAMIC_LINKER32
|
#define MUSL_DYNAMIC_LINKER32 \
|
- "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
|
+ SYSTEMLIBS_DIR "ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
|
#undef MUSL_DYNAMIC_LINKER64
|
#define MUSL_DYNAMIC_LINKER64 \
|
- "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
|
+ SYSTEMLIBS_DIR "ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
|
|
#undef DEFAULT_ASM_ENDIAN
|
#if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
|
diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
|
index 7558d2f7195..3aaa6c3a078 100644
|
--- a/gcc/config/sh/linux.h
|
+++ b/gcc/config/sh/linux.h
|
@@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see
|
"/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
|
"%{mfdpic:-fdpic}.so.1"
|
|
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
|
|
#undef SUBTARGET_LINK_EMUL_SUFFIX
|
#define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
|
diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
|
index 2550d7ee8f0..a94f4cd8ba2 100644
|
--- a/gcc/config/sparc/linux.h
|
+++ b/gcc/config/sparc/linux.h
|
@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
|
When the -shared link option is used a final link is not being
|
done. */
|
|
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
|
|
#undef LINK_SPEC
|
#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
|
diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
|
index 95af8afa9b5..63127afb074 100644
|
--- a/gcc/config/sparc/linux64.h
|
+++ b/gcc/config/sparc/linux64.h
|
@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see
|
When the -shared link option is used a final link is not being
|
done. */
|
|
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
|
+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
|
+#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux.so.2"
|
|
#ifdef SPARC_BI_ARCH
|
|
