This is an archive of the discontinued LLVM Phabricator instance.

Differential D11818

LLD: COFF: Remove lld-link2 alias.
ClosedPublic

Authored by ruiu on Aug 6 2015, 2:05 PM.

Details

Reviewers
pcc
Summary

This patch removes lld-link2 or "-flavor link2".

Diff Detail

Event Timeline

ruiu updated this revision to Diff 31474.Aug 6 2015, 2:05 PM
ruiu retitled this revision from to LLD: COFF: Remove lld-link2 alias..
ruiu updated this object.
ruiu added a reviewer: pcc.
ruiu set the repository for this revision to rL LLVM.
ruiu added a subscriber: llvm-commits.
pcc accepted this revision.Aug 6 2015, 2:08 PM
pcc edited edge metadata.

LGTM, but we should wait for https://codereview.chromium.org/1273053003/ to land to avoid breaking the Chromium build.

This revision is now accepted and ready to land.Aug 6 2015, 2:08 PM
• rafael added a subscriber: • rafael.Aug 7 2015, 10:41 AM

LGTM, but we should wait for https://codereview.chromium.org/1273053003/ to land to avoid breaking the Chromium build.

Looks like that has landed.

Cheers,
Rafael

ruiu added a subscriber: ruiu.Aug 7 2015, 2:04 PM

Submitted as r244358.

Eugene.Zelenko closed this revision.Sep 19 2016, 6:33 PM
Eugene.Zelenko added a subscriber: Eugene.Zelenko.

Committed in r244358.

Revision Contents

PathSize
lib/
Driver/
2 lines
tools/
lld/
5 lines

Diff 31474

lib/Driver/UniversalDriver.cpp

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
} // anonymous namespace } // anonymous namespace
static Flavor strToFlavor(StringRef str) { static Flavor strToFlavor(StringRef str) {
return llvm::StringSwitch<Flavor>(str) return llvm::StringSwitch<Flavor>(str)
.Case("gnu", Flavor::gnu_ld) .Case("gnu", Flavor::gnu_ld)
.Case("gnu2", Flavor::gnu_ld2) .Case("gnu2", Flavor::gnu_ld2)
.Case("link", Flavor::win_link) .Case("link", Flavor::win_link)
.Case("lld-link", Flavor::win_link) .Case("lld-link", Flavor::win_link)
.Case("link2", Flavor::win_link)
.Case("lld-link2", Flavor::win_link)
.Case("darwin", Flavor::darwin_ld) .Case("darwin", Flavor::darwin_ld)
.Case("core", Flavor::core) .Case("core", Flavor::core)
.Case("ld", Flavor::gnu_ld) .Case("ld", Flavor::gnu_ld)
.Default(Flavor::invalid); .Default(Flavor::invalid);
} }
static ProgramNameParts parseProgramName(StringRef programName) { static ProgramNameParts parseProgramName(StringRef programName) {
SmallVector<StringRef, 3> components; SmallVector<StringRef, 3> components;
▲ Show 20 Lines • Show All 124 Lines • Show Last 20 Lines

tools/lld/CMakeLists.txt

Show All 18 Linesif(UNIX)
set(src "lld${CMAKE_EXECUTABLE_SUFFIX}") set(src "lld${CMAKE_EXECUTABLE_SUFFIX}")
else() else()
set(command copy) set(command copy)
set(src "${LLVM_RUNTIME_OUTPUT_INTDIR}/lld${CMAKE_EXECUTABLE_SUFFIX}") set(src "${LLVM_RUNTIME_OUTPUT_INTDIR}/lld${CMAKE_EXECUTABLE_SUFFIX}")
endif() endif()
set(dst "${LLVM_RUNTIME_OUTPUT_INTDIR}/lld-link${CMAKE_EXECUTABLE_SUFFIX}") set(dst "${LLVM_RUNTIME_OUTPUT_INTDIR}/lld-link${CMAKE_EXECUTABLE_SUFFIX}")
add_custom_command(TARGET lld POST_BUILD add_custom_command(TARGET lld POST_BUILD
COMMAND ${CMAKE_COMMAND} -E ${command} ${src} ${dst}) COMMAND ${CMAKE_COMMAND} -E ${command} ${src} ${dst})
# FIXME: Remove once the lld-link2 alias is gone.
set(dst2 "${LLVM_RUNTIME_OUTPUT_INTDIR}/lld-link2${CMAKE_EXECUTABLE_SUFFIX}")
add_custom_command(TARGET lld POST_BUILD
COMMAND ${CMAKE_COMMAND} -E ${command} ${src} ${dst2})