public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: LuluCheng <chenglulu@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-8084] LoongArch: Fix MUSL_DYNAMIC_LINKER
Date: Mon, 20 Nov 2023 02:27:08 +0000 (GMT)	[thread overview]
Message-ID: <20231120022708.93ADB3858408@sourceware.org> (raw)

https://gcc.gnu.org/g:13c5de145f027ade74ad1d890aa6118662a0c024

commit r13-8084-g13c5de145f027ade74ad1d890aa6118662a0c024
Author: Peng Fan <fanpeng@loongson.cn>
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 <fanpeng@loongson.cn>
    Suggested-by: Xi Ruoyao <xry111@xry111.site>
    
    (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 \

                 reply	other threads:[~2023-11-20  2:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231120022708.93ADB3858408@sourceware.org \
    --to=chenglulu@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).