diff options
-rw-r--r-- | lld/lib/Driver/UniversalDriver.cpp | 8 | ||||
-rw-r--r-- | lld/unittests/DriverTests/UniversalDriverTest.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lld/lib/Driver/UniversalDriver.cpp b/lld/lib/Driver/UniversalDriver.cpp index c001d11ce16..3bb89ed9a3b 100644 --- a/lld/lib/Driver/UniversalDriver.cpp +++ b/lld/lib/Driver/UniversalDriver.cpp @@ -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::MutableArrayRef<const char *> args, 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: diff --git a/lld/unittests/DriverTests/UniversalDriverTest.cpp b/lld/unittests/DriverTests/UniversalDriverTest.cpp index f54bc834fc4..fee1bbb6b50 100644 --- a/lld/unittests/DriverTests/UniversalDriverTest.cpp +++ b/lld/unittests/DriverTests/UniversalDriverTest.cpp @@ -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); |