Revert "[Clang] Ignore CLANG_DEFAULT_LINKER for custom-linker toolchains"
Reverted until all Toolchains are fixed for the new behavior.
This reverts commit 34a43f2115af79f896c889433c57f3b400e9f2c6.
GitOrigin-RevId: f6ba6450396ce58212f247c72d84a54efd748b38
diff --git a/include/clang/Driver/ToolChain.h b/include/clang/Driver/ToolChain.h
index e55f821..e7b13ee 100644
--- a/include/clang/Driver/ToolChain.h
+++ b/include/clang/Driver/ToolChain.h
@@ -420,7 +420,7 @@
}
/// GetDefaultLinker - Get the default linker to use.
- virtual const char *getDefaultLinker() const;
+ virtual const char *getDefaultLinker() const { return "ld"; }
/// GetDefaultRuntimeLibType - Get the default runtime library variant to use.
virtual RuntimeLibType GetDefaultRuntimeLibType() const {
diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp
index d92cbe2..ac033dd 100644
--- a/lib/Driver/ToolChain.cpp
+++ b/lib/Driver/ToolChain.cpp
@@ -541,12 +541,6 @@
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;
@@ -554,7 +548,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() : "";
+ StringRef UseLinker = A ? A->getValue() : CLANG_DEFAULT_LINKER;
// --ld-path= takes precedence over -fuse-ld= and specifies the executable
// name. -B, COMPILER_PATH and PATH and consulted if the value does not
diff --git a/test/Driver/ve-toolchain.c b/test/Driver/ve-toolchain.c
index 2c8f211..8878bd8 100644
--- a/test/Driver/ve-toolchain.c
+++ b/test/Driver/ve-toolchain.c
@@ -61,10 +61,10 @@
/// Checking -fintegrated-as
// RUN: %clang -### -target ve \
-// RUN: -x assembler %s 2>&1 | \
+// RUN: -x assembler -fuse-ld=ld %s 2>&1 | \
// RUN: FileCheck -check-prefix=AS %s
// RUN: %clang -### -target ve \
-// RUN: -fno-integrated-as -x assembler %s 2>&1 | \
+// RUN: -fno-integrated-as -fuse-ld=ld -x assembler %s 2>&1 | \
// RUN: FileCheck -check-prefix=NAS %s
// AS: clang{{.*}} "-cc1as"
@@ -83,6 +83,7 @@
// 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"
diff --git a/test/Driver/ve-toolchain.cpp b/test/Driver/ve-toolchain.cpp
index 2519a5f..7666cfb 100644
--- a/test/Driver/ve-toolchain.cpp
+++ b/test/Driver/ve-toolchain.cpp
@@ -110,10 +110,10 @@
/// Checking -fintegrated-as
// RUN: %clangxx -### -target ve-unknown-linux-gnu \
-// RUN: -x assembler %s 2>&1 | \
+// RUN: -x assembler -fuse-ld=ld %s 2>&1 | \
// RUN: FileCheck -check-prefix=AS %s
// RUN: %clangxx -### -target ve-unknown-linux-gnu \
-// RUN: -fno-integrated-as -x assembler %s 2>&1 | \
+// RUN: -fno-integrated-as -x assembler -fuse-ld=ld %s 2>&1 | \
// RUN: FileCheck -check-prefix=NAS %s
// AS: clang{{.*}} "-cc1as"
@@ -131,6 +131,7 @@
// 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
