[PATCH] D115045: [Clang] Ignore CLANG_DEFAULT_LINKER for custom-linker toolchains
Simon Moll via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Dec 6 02:04:22 PST 2021
simoll updated this revision to Diff 391998.
simoll marked an inline comment as done.
simoll added a comment.
Simplified empty-string check as suggested
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D115045/new/
https://reviews.llvm.org/D115045
Files:
clang/include/clang/Driver/ToolChain.h
clang/lib/Driver/ToolChain.cpp
clang/test/Driver/ve-toolchain.c
clang/test/Driver/ve-toolchain.cpp
Index: clang/test/Driver/ve-toolchain.cpp
===================================================================
--- clang/test/Driver/ve-toolchain.cpp
+++ clang/test/Driver/ve-toolchain.cpp
@@ -92,10 +92,10 @@
/// Checking -fintegrated-as
// RUN: %clangxx -### -target ve \
-// RUN: -x assembler -fuse-ld=ld %s 2>&1 | \
+// RUN: -x assembler %s 2>&1 | \
// RUN: FileCheck -check-prefix=AS %s
// RUN: %clangxx -### -target ve \
-// RUN: -fno-integrated-as -x assembler -fuse-ld=ld %s 2>&1 | \
+// RUN: -fno-integrated-as -x assembler %s 2>&1 | \
// RUN: FileCheck -check-prefix=NAS %s
// AS: clang{{.*}} "-cc1as"
@@ -113,7 +113,6 @@
// RUN: %clangxx -### -target ve-unknown-linux-gnu \
// RUN: --sysroot %S/Inputs/basic_ve_tree \
-// RUN: -fuse-ld=ld \
// RUN: -resource-dir=%S/Inputs/basic_ve_tree/resource_dir \
// RUN: --stdlib=c++ %s 2>&1 | FileCheck -check-prefix=DEF %s
Index: clang/test/Driver/ve-toolchain.c
===================================================================
--- clang/test/Driver/ve-toolchain.c
+++ clang/test/Driver/ve-toolchain.c
@@ -61,10 +61,10 @@
/// Checking -fintegrated-as
// RUN: %clang -### -target ve \
-// RUN: -x assembler -fuse-ld=ld %s 2>&1 | \
+// RUN: -x assembler %s 2>&1 | \
// RUN: FileCheck -check-prefix=AS %s
// RUN: %clang -### -target ve \
-// RUN: -fno-integrated-as -fuse-ld=ld -x assembler %s 2>&1 | \
+// RUN: -fno-integrated-as -x assembler %s 2>&1 | \
// RUN: FileCheck -check-prefix=NAS %s
// AS: clang{{.*}} "-cc1as"
@@ -83,7 +83,6 @@
// RUN: %clang -### -target ve-unknown-linux-gnu \
// RUN: --sysroot %S/Inputs/basic_ve_tree \
// RUN: -resource-dir=%S/Inputs/basic_ve_tree/resource_dir \
-// RUN: -fuse-ld=ld \
// RUN: %s 2>&1 | FileCheck -check-prefix=DEF %s
// DEF: clang{{.*}}" "-cc1"
Index: clang/lib/Driver/ToolChain.cpp
===================================================================
--- clang/lib/Driver/ToolChain.cpp
+++ clang/lib/Driver/ToolChain.cpp
@@ -541,6 +541,12 @@
return D.GetProgramPath(Name, *this);
}
+const char *ToolChain::getDefaultLinker() const {
+ if (CLANG_DEFAULT_LINKER[0] == '\0')
+ return "ld";
+ return CLANG_DEFAULT_LINKER;
+}
+
std::string ToolChain::GetLinkerPath(bool *LinkerIsLLD) const {
if (LinkerIsLLD)
*LinkerIsLLD = false;
@@ -548,7 +554,7 @@
// Get -fuse-ld= first to prevent -Wunused-command-line-argument. -fuse-ld= is
// considered as the linker flavor, e.g. "bfd", "gold", or "lld".
const Arg* A = Args.getLastArg(options::OPT_fuse_ld_EQ);
- StringRef UseLinker = A ? A->getValue() : CLANG_DEFAULT_LINKER;
+ StringRef UseLinker = A ? A->getValue() : "";
// --ld-path= takes precedence over -fuse-ld= and specifies the executable
// name. -B, COMPILER_PATH and PATH and consulted if the value does not
Index: clang/include/clang/Driver/ToolChain.h
===================================================================
--- clang/include/clang/Driver/ToolChain.h
+++ clang/include/clang/Driver/ToolChain.h
@@ -420,7 +420,7 @@
}
/// GetDefaultLinker - Get the default linker to use.
- virtual const char *getDefaultLinker() const { return "ld"; }
+ virtual const char *getDefaultLinker() const;
/// GetDefaultRuntimeLibType - Get the default runtime library variant to use.
virtual RuntimeLibType GetDefaultRuntimeLibType() const {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D115045.391998.patch
Type: text/x-patch
Size: 3401 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20211206/d1e94672/attachment-0001.bin>
More information about the cfe-commits
mailing list