maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[Clang] Ignore CLANG_DEFAULT_LINKER for custom-linker toolchains" 

Reverted until all Toolchains are fixed for the new behavior.

This reverts commit 34a43f2115.
This commit is contained in:
Simon Moll 2021-12-06 16:44:36 +01:00
parent 9e08c2054a
commit f6ba645039
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Driver/ToolChain.h
View File

@ -420,7 +420,7 @@ public:
}
/// 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 {

8
clang/lib/Driver/ToolChain.cpp
View File

@ -541,12 +541,6 @@ std::string ToolChain::GetProgramPath(const char *Name) const {
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 @@ std::string ToolChain::GetLinkerPath(bool *LinkerIsLLD) const {
// 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

5
clang/test/Driver/ve-toolchain.c
View File

@ -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"

5
clang/test/Driver/ve-toolchain.cpp
View File

@ -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