Author: Vincent Lee Date: 2025-02-23T12:03:37-08:00 New Revision: 40b0619a53231eafaa879d085b7a7a10441c7f34
URL: https://github.com/llvm/llvm-project/commit/40b0619a53231eafaa879d085b7a7a10441c7f34 DIFF: https://github.com/llvm/llvm-project/commit/40b0619a53231eafaa879d085b7a7a10441c7f34.diff LOG: [FatLTO] Detect LLD linker more reliably (#128285) It's possible to have an `ld-path` point to a linker that doesn't have the `ld.lld` filename (e.g. linker wrapper that may emit telemetry before invoking the linker). This was causing mis-compilations with fatLTO since the check couldn't reliably detect that it was using lld. Instead, rely on the value from `-fuse-ld` to determine whether lld is enabled. Added: clang/test/Driver/Inputs/basic_cross_linux_tree/usr/x86_64-unknown-linux-gnu/bin/lld-wrapper Modified: clang/lib/Driver/ToolChains/CommonArgs.cpp clang/test/Driver/fat-lto-objects.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index 360754bdb3161..b43472a52038b 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -862,13 +862,15 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args, const llvm::Triple &Triple = ToolChain.getTriple(); const bool IsOSAIX = Triple.isOSAIX(); const bool IsAMDGCN = Triple.isAMDGCN(); - const char *Linker = Args.MakeArgString(ToolChain.GetLinkerPath()); + StringRef Linker = Args.getLastArgValue(options::OPT_fuse_ld_EQ); + const char *LinkerPath = Args.MakeArgString(ToolChain.GetLinkerPath()); const Driver &D = ToolChain.getDriver(); const bool IsFatLTO = Args.hasFlag(options::OPT_ffat_lto_objects, options::OPT_fno_fat_lto_objects, false); const bool IsUnifiedLTO = Args.hasArg(options::OPT_funified_lto); - if (llvm::sys::path::filename(Linker) != "ld.lld" && - llvm::sys::path::stem(Linker) != "ld.lld" && !Triple.isOSOpenBSD()) { + if (Linker != "lld" && Linker != "lld-link" && + llvm::sys::path::filename(LinkerPath) != "ld.lld" && + llvm::sys::path::stem(LinkerPath) != "ld.lld" && !Triple.isOSOpenBSD()) { // Tell the linker to load the plugin. This has to come before // AddLinkerInputs as gold requires -plugin and AIX ld requires -bplugin to // come before any -plugin-opt/-bplugin_opt that -Wl might forward. diff --git a/clang/test/Driver/Inputs/basic_cross_linux_tree/usr/x86_64-unknown-linux-gnu/bin/lld-wrapper b/clang/test/Driver/Inputs/basic_cross_linux_tree/usr/x86_64-unknown-linux-gnu/bin/lld-wrapper new file mode 120000 index 0000000000000..9b032ee3b3f1d --- /dev/null +++ b/clang/test/Driver/Inputs/basic_cross_linux_tree/usr/x86_64-unknown-linux-gnu/bin/lld-wrapper @@ -0,0 +1 @@ +ld.lld \ No newline at end of file diff --git a/clang/test/Driver/fat-lto-objects.c b/clang/test/Driver/fat-lto-objects.c index fae64ea7fd1a1..7b87e2b468886 100644 --- a/clang/test/Driver/fat-lto-objects.c +++ b/clang/test/Driver/fat-lto-objects.c @@ -49,5 +49,8 @@ // RUN: -fuse-ld=lld -flto -ffat-lto-objects -### 2>&1 | FileCheck --check-prefix=LTO %s // RUN: %clang --target=x86_64-unknown-linux-gnu --sysroot=%S/Inputs/basic_cross_linux_tree %s \ // RUN: -fuse-ld=lld -fno-lto -ffat-lto-objects -### 2>&1 | FileCheck --check-prefix=NOLTO %s +// RUN: %clang --target=x86_64-unknown-linux-gnu --sysroot=%S/Inputs/basic_cross_linux_tree %s \ +// RUN: -fuse-ld=lld --ld-path=%S/Inputs/basic_cross_linux_tree/usr/x86_64-unknown-linux-gnu/bin/lld-wrapper \ +// RUN: -flto -ffat-lto-objects -### 2>&1 | FileCheck --check-prefix=LTO %s // LTO: "--fat-lto-objects" // NOLTO-NOT: "--fat-lto-objects" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
