diff options
| author | Yaron Keren <yaron.keren@gmail.com> | 2015-11-15 08:06:27 +0000 |
|---|---|---|
| committer | Yaron Keren <yaron.keren@gmail.com> | 2015-11-15 08:06:27 +0000 |
| commit | a7fa79fb9bd4661865e40941fe9c455404947988 (patch) | |
| tree | 320530026ff5187b98399818ef61225b730f7948 /clang | |
| parent | aa40ddd3ba7b989b2d391e48b7853a8b30f190a0 (diff) | |
| download | bcm5719-llvm-a7fa79fb9bd4661865e40941fe9c455404947988.tar.gz bcm5719-llvm-a7fa79fb9bd4661865e40941fe9c455404947988.zip | |
Make the mingw toolchain accept 'ld' and 'lld' only as values to -fuse-ld.
Post-commit suggestion by Filipe Cabecinhas.
llvm-svn: 253161
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/mingw-useld.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 436f6401c2b..3f07ad6eb48 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -9468,6 +9468,8 @@ void MinGW::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (LinkerName.equals_lower("lld")) { CmdArgs.push_back("-flavor"); CmdArgs.push_back("gnu"); + } else if (!LinkerName.equals_lower("ld")) { + D.Diag(diag::err_drv_unsupported_linker) << LinkerName; } if (!D.SysRoot.empty()) diff --git a/clang/test/Driver/mingw-useld.c b/clang/test/Driver/mingw-useld.c index 0d894d75381..43a811ce8b7 100644 --- a/clang/test/Driver/mingw-useld.c +++ b/clang/test/Driver/mingw-useld.c @@ -7,10 +7,6 @@ // CHECK_LLD_32: lld" "-flavor" "gnu" // CHECK_LLD_32: "i386pe" -// RUN: %clang -### -target i686-pc-windows-gnu --sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s -fuse-ld=link.exe 2>&1 | FileCheck -check-prefix=CHECK_LINK_32 %s -// CHECK_LINK_32: link.exe" -// CHECK_LINK_32: "i386pe" - // RUN: %clang -### -target x86_64-pc-windows-gnu --sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s -fuse-ld=lld 2>&1 | FileCheck -check-prefix=CHECK_LLD_64 %s // CHECK_LLD_64: lld" "-flavor" "gnu" // CHECK_LLD_64: "i386pep" |
