[lld] r253270 - Rename gnu2 to gnu.
Rafael Espindola via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 16 15:21:55 PST 2015
Author: rafael
Date: Mon Nov 16 17:21:55 2015
New Revision: 253270
URL: http://llvm.org/viewvc/llvm-project?rev=253270&view=rev
Log:
Rename gnu2 to gnu.
This is the second step in making ELF2 the default.
Modified:
lld/trunk/lib/Driver/UniversalDriver.cpp
lld/trunk/unittests/DriverTests/UniversalDriverTest.cpp
Modified: lld/trunk/lib/Driver/UniversalDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/UniversalDriver.cpp?rev=253270&r1=253269&r2=253270&view=diff
==============================================================================
--- lld/trunk/lib/Driver/UniversalDriver.cpp (original)
+++ lld/trunk/lib/Driver/UniversalDriver.cpp Mon Nov 16 17:21:55 2015
@@ -69,7 +69,7 @@ public:
enum class Flavor {
invalid,
old_gnu_ld, // -flavor old-gnu
- gnu_ld2, // -flavor gnu2
+ gnu_ld, // -flavor gnu
win_link, // -flavor link
darwin_ld, // -flavor darwin
core // -flavor core OR -core
@@ -85,8 +85,8 @@ struct ProgramNameParts {
static Flavor strToFlavor(StringRef str) {
return llvm::StringSwitch<Flavor>(str)
.Case("old-gnu", Flavor::old_gnu_ld)
- .Case("gnu2", Flavor::gnu_ld2)
- .Case("ld.lld2", Flavor::gnu_ld2)
+ .Case("gnu", Flavor::gnu_ld)
+ .Case("ld.lld2", Flavor::gnu_ld)
.Case("link", Flavor::win_link)
.Case("lld-link", Flavor::win_link)
.Case("darwin", Flavor::darwin_ld)
@@ -204,7 +204,7 @@ bool UniversalDriver::link(llvm::Mutable
switch (flavor) {
case Flavor::old_gnu_ld:
return GnuLdDriver::linkELF(args, diagnostics);
- case Flavor::gnu_ld2:
+ case Flavor::gnu_ld:
elf2::link(args);
return true;
case Flavor::darwin_ld:
Modified: lld/trunk/unittests/DriverTests/UniversalDriverTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/UniversalDriverTest.cpp?rev=253270&r1=253269&r2=253270&view=diff
==============================================================================
--- lld/trunk/unittests/DriverTests/UniversalDriverTest.cpp (original)
+++ lld/trunk/unittests/DriverTests/UniversalDriverTest.cpp Mon Nov 16 17:21:55 2015
@@ -21,7 +21,7 @@ using namespace llvm;
using namespace lld;
TEST(UniversalDriver, flavor) {
- const char *args[] = { "gnu-ld" };
+ const char *args[] = {"old-ld"};
std::string diags;
raw_string_ostream os(diags);
More information about the llvm-commits
mailing list