| From ba2e308f7993099708ef3d8cbf2db5f134f08941 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 |
| |
| Upstream-Status: Inappropriate [OE configuration] |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| gcc/config/aarch64/aarch64-linux.h | 4 ++-- |
| gcc/config/alpha/linux-elf.h | 4 ++-- |
| gcc/config/arm/linux-eabi.h | 6 +++--- |
| gcc/config/arm/linux-elf.h | 2 +- |
| gcc/config/i386/linux.h | 4 ++-- |
| gcc/config/i386/linux64.h | 12 ++++++------ |
| gcc/config/linux.h | 8 ++++---- |
| gcc/config/loongarch/gnu-user.h | 4 ++-- |
| gcc/config/microblaze/linux.h | 4 ++-- |
| gcc/config/mips/linux.h | 18 +++++++++--------- |
| gcc/config/nios2/linux.h | 4 ++-- |
| gcc/config/riscv/linux.h | 4 ++-- |
| gcc/config/rs6000/linux64.h | 15 +++++---------- |
| gcc/config/rs6000/sysv4.h | 4 ++-- |
| gcc/config/s390/linux.h | 8 ++++---- |
| gcc/config/sh/linux.h | 4 ++-- |
| gcc/config/sparc/linux.h | 2 +- |
| gcc/config/sparc/linux64.h | 4 ++-- |
| 18 files changed, 53 insertions(+), 58 deletions(-) |
| |
| diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h |
| index 4277f03da2a..e4c92c03291 100644 |
| --- a/gcc/config/aarch64/aarch64-linux.h |
| +++ b/gcc/config/aarch64/aarch64-linux.h |
| @@ -21,10 +21,10 @@ |
| #ifndef GCC_AARCH64_LINUX_H |
| #define GCC_AARCH64_LINUX_H |
| |
| -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" |
| +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" |
| |
| #undef MUSL_DYNAMIC_LINKER |
| -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" |
| +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" |
| |
| #undef ASAN_CC1_SPEC |
| #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" |
| diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h |
| index 03f783f2ad1..4fa02668aa7 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 a119875599d..dce7f59eeea 100644 |
| --- a/gcc/config/arm/linux-eabi.h |
| +++ b/gcc/config/arm/linux-eabi.h |
| @@ -62,8 +62,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 \ |
| @@ -86,7 +86,7 @@ |
| #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" |
| #endif |
| #define MUSL_DYNAMIC_LINKER \ |
| - "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1" |
| + SYSTEMLIBS_DIR "ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.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. */ |
| diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h |
| index 7b7b7cbbe14..98ef2267117 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 bbb7cc7115e..7d9272040ee 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" |
| +#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 2bd9f48e271..dbbe7ca5440 100644 |
| --- a/gcc/config/i386/linux64.h |
| +++ b/gcc/config/i386/linux64.h |
| @@ -27,13 +27,13 @@ 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" |
| +#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-i386.so.1" |
| #undef MUSL_DYNAMIC_LINKER64 |
| -#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" |
| +#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-x86_64.so.1" |
| #undef MUSL_DYNAMIC_LINKERX32 |
| -#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" |
| +#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" |
| diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
| index e3aca79cccc..6491c6b84f5 100644 |
| --- a/gcc/config/linux.h |
| +++ b/gcc/config/linux.h |
| @@ -86,10 +86,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/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h |
| index aecaa02a199..62f88f7f9a2 100644 |
| --- a/gcc/config/loongarch/gnu-user.h |
| +++ b/gcc/config/loongarch/gnu-user.h |
| @@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. If not see |
| |
| #undef GLIBC_DYNAMIC_LINKER |
| #define GLIBC_DYNAMIC_LINKER \ |
| - "/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1" |
| + SYSTEMLIBS_DIR "ld-linux-loongarch-" ABI_SPEC ".so.1" |
| |
| #undef MUSL_DYNAMIC_LINKER |
| #define MUSL_DYNAMIC_LINKER \ |
| - "/lib" ABI_GRLEN_SPEC "/ld-musl-loongarch-" ABI_SPEC ".so.1" |
| + SYSTEMLIBS_DIR "ld-musl-loongarch-" ABI_SPEC ".so.1" |
| |
| #undef GNU_USER_TARGET_LINK_SPEC |
| #define GNU_USER_TARGET_LINK_SPEC \ |
| diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h |
| index e2e2c421c52..6f26480e3b5 100644 |
| --- a/gcc/config/microblaze/linux.h |
| +++ b/gcc/config/microblaze/linux.h |
| @@ -28,7 +28,7 @@ |
| #undef TLS_NEEDS_GOT |
| #define TLS_NEEDS_GOT 1 |
| |
| -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" |
| +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "/ld.so.1" |
| #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" |
| |
| #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ |
| @@ -38,7 +38,7 @@ |
| #endif |
| |
| #undef MUSL_DYNAMIC_LINKER |
| -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" |
| +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" |
| |
| #undef SUBTARGET_EXTRA_SPECS |
| #define SUBTARGET_EXTRA_SPECS \ |
| diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h |
| index 5add34ea134..34692b433b8 100644 |
| --- a/gcc/config/mips/linux.h |
| +++ b/gcc/config/mips/linux.h |
| @@ -22,29 +22,29 @@ 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 \ |
| - "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" |
| + SYSTEMLIBS_DIR "ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" |
| #undef MUSL_DYNAMIC_LINKER64 |
| #define MUSL_DYNAMIC_LINKER64 \ |
| - "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" |
| + SYSTEMLIBS_DIR "ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" |
| #define MUSL_DYNAMIC_LINKERN32 \ |
| - "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" |
| + SYSTEMLIBS_DIR "ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" |
| |
| #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" |
| #define GNU_USER_DYNAMIC_LINKERN32 \ |
| diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h |
| index 2ce097ebbce..1d45d7b4962 100644 |
| --- a/gcc/config/nios2/linux.h |
| +++ b/gcc/config/nios2/linux.h |
| @@ -29,10 +29,10 @@ |
| #undef CPP_SPEC |
| #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" |
| |
| -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1" |
| +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-nios2.so.1" |
| |
| #undef MUSL_DYNAMIC_LINKER |
| -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-nios2.so.1" |
| +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-nios2.so.1" |
| |
| #undef LINK_SPEC |
| #define LINK_SPEC LINK_SPEC_ENDIAN \ |
| diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h |
| index b9557a75dc7..e10ca1f97e7 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}" \ |
| @@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. If not see |
| "%{mabi=lp64d:}" |
| |
| #undef MUSL_DYNAMIC_LINKER |
| -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1" |
| +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1" |
| |
| /* Because RISC-V only has word-sized atomics, it requries libatomic where |
| others do not. So link libatomic by default, as needed. */ |
| diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h |
| index 9e457033d11..2ddab7c99c1 100644 |
| --- a/gcc/config/rs6000/linux64.h |
| +++ b/gcc/config/rs6000/linux64.h |
| @@ -339,24 +339,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/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h |
| index ae932fc22f0..26db003cb3a 100644 |
| --- a/gcc/config/rs6000/sysv4.h |
| +++ b/gcc/config/rs6000/sysv4.h |
| @@ -771,10 +771,10 @@ GNU_USER_TARGET_CC1_SPEC |
| |
| #define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","") |
| |
| -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" |
| +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1" |
| #undef MUSL_DYNAMIC_LINKER |
| #define MUSL_DYNAMIC_LINKER \ |
| - "/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" |
| |
| #ifndef GNU_USER_DYNAMIC_LINKER |
| #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER |
| diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h |
| index 02aa1edaff8..fab268d61f4 100644 |
| --- a/gcc/config/s390/linux.h |
| +++ b/gcc/config/s390/linux.h |
| @@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. If not see |
| #define MULTILIB_DEFAULTS { "m31" } |
| #endif |
| |
| -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
| -#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" |
| +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" |
| +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64.so.1" |
| |
| #undef MUSL_DYNAMIC_LINKER32 |
| -#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390.so.1" |
| +#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-s390.so.1" |
| #undef MUSL_DYNAMIC_LINKER64 |
| -#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1" |
| +#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-s390x.so.1" |
| |
| #undef LINK_SPEC |
| #define LINK_SPEC \ |
| diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h |
| index 29f5902b98b..83d1e53e6e2 100644 |
| --- a/gcc/config/sh/linux.h |
| +++ b/gcc/config/sh/linux.h |
| @@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. If not see |
| |
| #undef MUSL_DYNAMIC_LINKER |
| #define MUSL_DYNAMIC_LINKER \ |
| - "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \ |
| + SYSTEMLIBS_DIR "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 0e33b3cac2c..84f29adbb35 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 f1cc0a19e49..94bc2032803 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 |
| |