Make ELF2 the default

[• rafael]

Summary

With this the only way to get the old elf linker is "-flavor old-elf".

[ruiu]

LGTM

[Eugene.Zelenko]

Committed in r253318.

lib/Driver/UniversalDriver.cpp

static Flavor strToFlavor(StringRef str) {
   return llvm::StringSwitch<Flavor>(str)
       .Case("old-gnu", Flavor::old_gnu_ld)
       .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)
       .Case("core", Flavor::core)
-      .Case("ld", Flavor::old_gnu_ld)
+      .Case("ld", Flavor::gnu_ld)
       .Default(Flavor::invalid);
 }
 
 static ProgramNameParts parseProgramName(StringRef programName) {
   SmallVector<StringRef, 3> components;
   llvm::SplitString(programName, components, "-");
   ProgramNameParts ret;
 

 
 #if LLVM_ON_UNIX
   if (llvm::sys::path::filename(args[0]).equals("ld")) {
 #if __APPLE__
     // On a Darwin systems, if linker binary is named "ld", use Darwin driver.
     return Flavor::darwin_ld;
 #endif
     // On a ELF based systems, if linker binary is named "ld", use gnu driver.
-    return Flavor::old_gnu_ld;
+    return Flavor::gnu_ld;
   }
 #endif
 
   StringRef name = llvm::sys::path::filename(args[0]);
   if (name.endswith_lower(".exe"))
     name = llvm::sys::path::stem(name);
   return strToFlavor(parseProgramName(name)._flavor);
 }

test/old-elf/linker-as-ld.test

 REQUIRES: system-linker-elf
 
 RUN: mkdir -p %t.dir && cp `which lld` %t.dir/ld
-RUN: %t.dir/ld -target x86_64-linux -o %t %p/Inputs/relocs.x86-64 \
+RUN: %t.dir/ld -o %t %p/Inputs/relocs.x86-64 \
 RUN:  -e _start -static
 RUN: llvm-readobj -t %t | FileCheck %s
 
 # Test linker run as "ld" on elf based system works like gnu linker.
 
 
 CHECK:        Symbol {
 CHECK:          Name: i
 CHECK-NEXT:     Value:
 CHECK-NEXT:     Size:
 CHECK-NEXT:     Binding:
 CHECK-NEXT:     Type: Object

unittests/DriverTests/UniversalDriverTest.cpp

 #include "lld/Driver/Driver.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
 using namespace lld;
 
 TEST(UniversalDriver, flavor) {
-  const char *args[] = {"old-ld"};
+  const char *args[] = {"ld", "-flavor", "old-gnu"};
 
   std::string diags;
   raw_string_ostream os(diags);
   UniversalDriver::link(args, os);
   EXPECT_EQ(os.str().find("failed to determine driver flavor"),
             std::string::npos);
   EXPECT_NE(os.str().find("No input files"),
             std::string::npos);
 }