From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7877) id 93ADB3858408; Mon, 20 Nov 2023 02:27:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93ADB3858408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1700447228; bh=IYbuSpZ7ifNorN6oI0l8nVvlKH7lZiIYjoEaLEqMhII=; h=From:To:Subject:Date:From; b=aJ5V1Q3rgM5ealQ4CujseLzstISvfbBIvdy9I7CvSkmINesaNR11YYq9UCyrq45jo zqLN4Xz85QjvKl50w2GZsVS+GLSyICxPysbqHLBAdcmfI9j+j3negLNnNlgCVYyy4h 9zoXUyR8DKSf6jgeGt0kIRZN55Y+C5fqv/2OrH84= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: LuluCheng To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-8084] LoongArch: Fix MUSL_DYNAMIC_LINKER X-Act-Checkin: gcc X-Git-Author: Peng Fan X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: c118ae444e1773819c73bff8bf02e84609b85164 X-Git-Newrev: 13c5de145f027ade74ad1d890aa6118662a0c024 Message-Id: <20231120022708.93ADB3858408@sourceware.org> Date: Mon, 20 Nov 2023 02:27:08 +0000 (GMT) List-Id: https://gcc.gnu.org/g:13c5de145f027ade74ad1d890aa6118662a0c024 commit r13-8084-g13c5de145f027ade74ad1d890aa6118662a0c024 Author: Peng Fan Date: Wed Apr 19 16:23:42 2023 +0800 LoongArch: Fix MUSL_DYNAMIC_LINKER The system based on musl has no '/lib64', so change it. https://wiki.musl-libc.org/guidelines-for-distributions.html, "Multilib/multi-arch" section of this introduces it. gcc/ * config/loongarch/gnu-user.h (MUSL_DYNAMIC_LINKER): Redefine. Signed-off-by: Peng Fan Suggested-by: Xi Ruoyao (cherry picked from commit a80c68a08604b0ac625ac7fc59eae40b551b1176) Diff: --- gcc/config/loongarch/gnu-user.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h index aecaa02a199..fa1a5211419 100644 --- a/gcc/config/loongarch/gnu-user.h +++ b/gcc/config/loongarch/gnu-user.h @@ -33,9 +33,14 @@ along with GCC; see the file COPYING3. If not see #define GLIBC_DYNAMIC_LINKER \ "/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1" +#define MUSL_ABI_SPEC \ + "%{mabi=lp64d:-lp64d}" \ + "%{mabi=lp64f:-lp64f}" \ + "%{mabi=lp64s:-lp64s}" + #undef MUSL_DYNAMIC_LINKER #define MUSL_DYNAMIC_LINKER \ - "/lib" ABI_GRLEN_SPEC "/ld-musl-loongarch-" ABI_SPEC ".so.1" + "/lib/ld-musl-loongarch" ABI_GRLEN_SPEC MUSL_ABI_SPEC ".so.1" #undef GNU_USER_TARGET_LINK_SPEC #define GNU_USER_TARGET_LINK_SPEC \