This is an archive of the discontinued LLVM Phabricator instance.

Differential D33923

[Driver] Don't force .exe suffix for lld
ClosedPublic

Authored by smeenai on Jun 5 2017, 5:47 PM.

Details

Reviewers
compnerd
majnemer
rnk
zturner
Commits
rG462f36d36d45: [Driver] Don't force .exe suffix for lld
rC304761: [Driver] Don't force .exe suffix for lld
rL304761: [Driver] Don't force .exe suffix for lld
Summary

When cross-compiling to Windows using lld, we want the driver to invoke
it as lld-link rather than lld-link.exe. On Windows, the LLVM fs
functions take care of adding the .exe suffix where necessary, so we can
just drop the addition in the toolchain entirely.

Diff Detail

Repository
rL LLVM

Event Timeline

smeenai created this revision.Jun 5 2017, 5:47 PM
Harbormaster completed remote builds in B6997: Diff 101495.Jun 5 2017, 5:47 PM
zturner accepted this revision.Jun 5 2017, 6:04 PM
zturner added a subscriber: zturner.

Seems fine to me.

This revision is now accepted and ready to land.Jun 5 2017, 6:04 PM
Closed by commit rL304761: [Driver] Don't force .exe suffix for lld (authored by smeenai). · Explain WhyJun 5 2017, 7:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
lib/
Driver/
ToolChains/
4 lines
test/
Driver/
2 lines

Diff 101502

cfe/trunk/lib/Driver/ToolChains/MSVC.cpp

Show First 20 Lines • Show All 523 Lines • ▼ Show 20 Lines if (TC.getIsVS2017OrNewer() &&
Environment.push_back(Args.MakeArgString(EnvVar)); Environment.push_back(Args.MakeArgString(EnvVar));
} }
Cursor += EnvVar.size() + 1 /*null-terminator*/; Cursor += EnvVar.size() + 1 /*null-terminator*/;
} }
} }
SkipSettingEnvironment:; SkipSettingEnvironment:;
#endif #endif
} else { } else {
linkPath = Linker; linkPath = TC.GetProgramPath(Linker.str().c_str());
llvm::sys::path::replace_extension(linkPath, "exe");
linkPath = TC.GetProgramPath(linkPath.c_str());
} }
auto LinkCmd = llvm::make_unique<Command>( auto LinkCmd = llvm::make_unique<Command>(
JA, *this, Args.MakeArgString(linkPath), CmdArgs, Inputs); JA, *this, Args.MakeArgString(linkPath), CmdArgs, Inputs);
if (!Environment.empty()) if (!Environment.empty())
LinkCmd->setEnvironment(Environment); LinkCmd->setEnvironment(Environment);
C.addCommand(std::move(LinkCmd)); C.addCommand(std::move(LinkCmd));
} }
▲ Show 20 Lines • Show All 886 Lines • Show Last 20 Lines

cfe/trunk/test/Driver/cl-link.c

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
// RUN: %clang_cl /Tc%s nonexistent.obj -### /link /libpath:somepath 2>&1 | FileCheck --check-prefix=NONEXISTENT %s // RUN: %clang_cl /Tc%s nonexistent.obj -### /link /libpath:somepath 2>&1 | FileCheck --check-prefix=NONEXISTENT %s
// RUN: %clang_cl /Tc%s nonexistent.lib -### /link /libpath:somepath 2>&1 | FileCheck --check-prefix=NONEXISTENT %s // RUN: %clang_cl /Tc%s nonexistent.lib -### /link /libpath:somepath 2>&1 | FileCheck --check-prefix=NONEXISTENT %s
// NONEXISTENT-NOT: no such file // NONEXISTENT-NOT: no such file
// NONEXISTENT: link.exe // NONEXISTENT: link.exe
// NONEXISTENT: "/libpath:somepath" // NONEXISTENT: "/libpath:somepath"
// NONEXISTENT: nonexistent // NONEXISTENT: nonexistent
// RUN: %clang_cl /Tc%s -fuse-ld=lld -### 2>&1 | FileCheck --check-prefix=USE_LLD %s // RUN: %clang_cl /Tc%s -fuse-ld=lld -### 2>&1 | FileCheck --check-prefix=USE_LLD %s
// USE_LLD: lld-link.exe // USE_LLD: lld-link