123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403 |
- From 4de00af67b57b5440bdf61ab364ad959ad0aeee7 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]
- 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 5e4553d79f5..877e8841eb2 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 17f16a55910..0a7be38fa63 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 50cc0bc6d08..17c18b27145 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 \
- @@ -89,7 +89,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 df3da67c4f0..37456e9d5a4 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 5d99ee56d5b..a76022c9ccc 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 8681e36f10d..ddce49b6b60 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 74f70793d90..4ce173384ef 100644
- --- a/gcc/config/linux.h
- +++ b/gcc/config/linux.h
- @@ -99,10 +99,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 664dc9206ad..082bd7cfc6f 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 5b1a365eda4..2e63df1ae9c 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 230b7789bb8..d96d134bfcf 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 f5dd813acad..7a13e1c9799 100644
- --- a/gcc/config/nios2/linux.h
- +++ b/gcc/config/nios2/linux.h
- @@ -29,8 +29,8 @@
- #undef CPP_SPEC
- #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-
- -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1"
- -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-nios2.so.1"
- +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-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 38803723ba9..d5ef8a96a19 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 b2a7afabc73..364c1a5b155 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 7e2519de5d4..a73954d9de5 100644
- --- a/gcc/config/rs6000/sysv4.h
- +++ b/gcc/config/rs6000/sysv4.h
- @@ -779,10 +779,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 d7b7e7a7b02..0139b4d06ca 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 d96d077c99e..7d27f9893ee 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 6a809e9092d..60603765ad6 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 d08a2ef96fe..e6955da0a5b 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
-
|