1 files changed, 48 insertions, 38 deletions

diff --git a/lld/lib/ReaderWriter/ELF/Writer.cpp b/lld/lib/ReaderWriter/ELF/Writer.cpp
index 6e2744ea1f3..a174ef0c051 100644
--- a/lld/lib/ReaderWriter/ELF/Writer.cpp
+++ b/lld/lib/ReaderWriter/ELF/Writer.cpp
@@ -1,4 +1,4 @@
-//===- lib/ReaderWriter/ELF/Writer.cpp ------------------------------------===//
+//===- lib/ReaderWriter/ELF/WriterELF.cpp ---------------------------------===//
 //
 //                             The LLVM Linker
 //
@@ -6,53 +6,63 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#include "ExecutableWriter.h"
+
+#include "lld/ReaderWriter/Writer.h"
+
 #include "DynamicLibraryWriter.h"
+#include "ExecutableWriter.h"
+
 
 using namespace llvm;
 using namespace llvm::object;
-
 namespace lld {
 
-std::unique_ptr<Writer> createWriterELF(const ELFTargetInfo &TI) {
+std::unique_ptr<Writer> createWriterELF(const ELFTargetInfo &info) {
   using llvm::object::ELFType;
   // Set the default layout to be the static executable layout
   // We would set the layout to a dynamic executable layout
   // if we came across any shared libraries in the process
 
-  const LinkerOptions &options = TI.getLinkerOptions();
-
-  if ((options._outputKind == OutputKind::StaticExecutable) ||
-      (options._outputKind == OutputKind::DynamicExecutable)) {
-    if (!TI.is64Bits() && TI.isLittleEndian())
-      return std::unique_ptr<Writer>(new
-          elf::ExecutableWriter<ELFType<support::little, 4, false>>(TI));
-    else if (TI.is64Bits() && TI.isLittleEndian())
-      return std::unique_ptr<Writer>(new
-          elf::ExecutableWriter<ELFType<support::little, 8, true>>(TI));
-    else if (!TI.is64Bits() && !TI.isLittleEndian())
-      return std::unique_ptr<Writer>(new
-          elf::ExecutableWriter<ELFType<support::big, 4, false>>(TI));
-    else if (TI.is64Bits() && !TI.isLittleEndian())
-      return std::unique_ptr<Writer>(new
-          elf::ExecutableWriter<ELFType<support::big, 8, true>>(TI));
-    llvm_unreachable("Invalid Options!");
-  } else if (options._outputKind == OutputKind::Shared) {
-    if (!TI.is64Bits() && TI.isLittleEndian())
-      return std::unique_ptr<Writer>(new
-          elf::DynamicLibraryWriter<ELFType<support::little, 4, false>>(TI));
-    else if (TI.is64Bits() && TI.isLittleEndian())
-      return std::unique_ptr<Writer>(new
-          elf::DynamicLibraryWriter<ELFType<support::little, 8, true>>(TI));
-    else if (!TI.is64Bits() && !TI.isLittleEndian())
-      return std::unique_ptr<Writer>(new
-          elf::DynamicLibraryWriter<ELFType<support::big, 4, false>>(TI));
-    else if (TI.is64Bits() && !TI.isLittleEndian())
-      return std::unique_ptr<Writer>(new
-          elf::DynamicLibraryWriter<ELFType<support::big, 8, true>>(TI));
-    llvm_unreachable("Invalid Options!");
+  switch(info.getOutputType()) {
+  case llvm::ELF::ET_EXEC:
+    if (info.is64Bits()) {
+      if (info.isLittleEndian()) 
+        return std::unique_ptr<Writer>(new
+            elf::ExecutableWriter<ELFType<support::little, 8, true>>(info));
+      else
+        return std::unique_ptr<Writer>(new
+                elf::ExecutableWriter<ELFType<support::big, 8, true>>(info));
+    } else {
+      if (info.isLittleEndian()) 
+        return std::unique_ptr<Writer>(new
+            elf::ExecutableWriter<ELFType<support::little, 4, false>>(info));
+      else
+        return std::unique_ptr<Writer>(new
+                elf::ExecutableWriter<ELFType<support::big, 4, false>>(info));
+    }
+  break;
+  case llvm::ELF::ET_DYN:
+    if (info.is64Bits()) {
+      if (info.isLittleEndian()) 
+        return std::unique_ptr<Writer>(new
+          elf::DynamicLibraryWriter<ELFType<support::little, 8, true>>(info));
+      else
+        return std::unique_ptr<Writer>(new
+              elf::DynamicLibraryWriter<ELFType<support::big, 8, true>>(info));
+    } else {
+      if (info.isLittleEndian()) 
+        return std::unique_ptr<Writer>(new
+          elf::DynamicLibraryWriter<ELFType<support::little, 4, false>>(info));
+      else
+        return std::unique_ptr<Writer>(new
+              elf::DynamicLibraryWriter<ELFType<support::big, 4, false>>(info));
+    }
+  break;
+  case llvm::ELF::ET_REL:
+    llvm_unreachable("TODO: support -r mode");
+  default:
+    llvm_unreachable("unsupported output type");
   }
-  else
-    llvm_unreachable("unsupported options");
-}
 }
+
+} // namespace lld