diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-10-02 12:57:34 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-10-02 12:57:34 +0000 |
| commit | 98efd89e7e52b2f081286477bbd8e7e400d63f37 (patch) | |
| tree | c0531a00ce2cc991c3e132aca1832ddbc94c484c | |
| parent | cb334561223f931c0ecd580a50ec80ee24266842 (diff) | |
| download | bcm5719-llvm-98efd89e7e52b2f081286477bbd8e7e400d63f37.tar.gz bcm5719-llvm-98efd89e7e52b2f081286477bbd8e7e400d63f37.zip | |
Use ld.lld2 as a argv[0] alias.
The reason for the name is so that we can run
./build/bin/clang -fuse-ld=lld2 test.o -o t
llvm-svn: 249122
| -rw-r--r-- | lld/lib/Driver/UniversalDriver.cpp | 5 | ||||
| -rw-r--r-- | lld/test/elf2/basic.s | 2 | ||||
| -rw-r--r-- | lld/tools/lld/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lld/lib/Driver/UniversalDriver.cpp b/lld/lib/Driver/UniversalDriver.cpp index 45bcbc838a3..68c9000e3de 100644 --- a/lld/lib/Driver/UniversalDriver.cpp +++ b/lld/lib/Driver/UniversalDriver.cpp @@ -86,6 +86,7 @@ static Flavor strToFlavor(StringRef str) { return llvm::StringSwitch<Flavor>(str) .Case("gnu", Flavor::gnu_ld) .Case("gnu2", Flavor::gnu_ld2) + .Case("ld.lld2", Flavor::gnu_ld2) .Case("link", Flavor::win_link) .Case("lld-link", Flavor::win_link) .Case("darwin", Flavor::darwin_ld) @@ -156,7 +157,9 @@ static Flavor getFlavor(llvm::MutableArrayRef<const char *> &args, } #endif - StringRef name = llvm::sys::path::stem(args[0]); + StringRef name = llvm::sys::path::filename(args[0]); + if (name.endswith_lower(".exe")) + name = llvm::sys::path::stem(name); return strToFlavor(parseProgramName(name)._flavor); } diff --git a/lld/test/elf2/basic.s b/lld/test/elf2/basic.s index dca96f85762..325eb3f613e 100644 --- a/lld/test/elf2/basic.s +++ b/lld/test/elf2/basic.s @@ -1,7 +1,7 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t -# RUN: lld -flavor gnu2 %t -o %t2 +# RUN: ld.lld2 %t -o %t2 # RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \ # RUN: | FileCheck %s diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt index 2b6d9c2e102..6cf72912947 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt @@ -12,7 +12,7 @@ install(TARGETS lld RUNTIME DESTINATION bin) if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE lld-link) + set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld2) endif() foreach(link ${LLD_SYMLINKS_TO_CREATE}) |
