From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Date: Mon, 16 Oct 2023 05:04:12 +0000 (+0900)
Subject: Do not prepend target triple to -fuse-ld=lld,mold.
X-Git-Tag: basepoints/gcc-15~4858
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c6d6b34b112b52566ebde49afef3e6eb747ef90;p=thirdparty%2Fgcc.git

Do not prepend target triple to -fuse-ld=lld,mold.

lld and mold are platform-agnostic and not prefixed with target triple.
Prepending the target triple makes it less likely to find the intended
linker executable.

A potential breaking change is that we no longer try to search for
triple-prefixed lld/mold binaries anymore. However, since there doesn't
seem to be support to build LLVM or mold with triple-prefixed executable
names, it seems better to just not bother with that case.

	PR driver/111605
	* collect2.cc (main): Do not prepend target triple to
	-fuse-ld=lld,mold.
---

diff --git a/gcc/collect2.cc b/gcc/collect2.cc
index 63b9a0c233a8..c943f9f577cf 100644
--- a/gcc/collect2.cc
+++ b/gcc/collect2.cc
@@ -865,12 +865,15 @@ main (int argc, char **argv)
   int i;
 
   for (i = 0; i < USE_LD_MAX; i++)
-    full_ld_suffixes[i]
 #ifdef CROSS_DIRECTORY_STRUCTURE
-      = concat (target_machine, "-", ld_suffixes[i], NULL);
-#else
-      = ld_suffixes[i];
-#endif
+    /* lld and mold are platform-agnostic and not prefixed with target
+       triple.  */
+    if (!(i == USE_LLD_LD || i == USE_MOLD_LD))
+      full_ld_suffixes[i] = concat (target_machine, "-", ld_suffixes[i],
+				    NULL);
+    else
+#endif
+      full_ld_suffixes[i] = ld_suffixes[i];
 
   p = argv[0] + strlen (argv[0]);
   while (p != argv[0] && !IS_DIR_SEPARATOR (p[-1]))