From b1bb3e542e352377c2e335675a969e4e3bb3e374 Mon Sep 17 00:00:00 2001
From: Petr Hosek <phosek@chromium.org>
Date: Fri, 4 Aug 2017 05:33:44 +0000
Subject: Revert "[llvm][llvm-objcopy] Added support for outputting to binary
 in llvm-objcopy"

This breaks the build on clang-s390x-linux.

This reverts commit r310018.

llvm-svn: 310026
---
 llvm/tools/llvm-objcopy/llvm-objcopy.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'llvm/tools/llvm-objcopy/llvm-objcopy.cpp')

diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
index 9b233951b8d..09edc4c3327 100644
--- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
+++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
@@ -53,23 +53,13 @@ LLVM_ATTRIBUTE_NORETURN void reportError(StringRef File, llvm::Error E) {
 cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input>"));
 cl::opt<std::string> OutputFilename(cl::Positional, cl::desc("<output>"),
                                     cl::init("-"));
-cl::opt<std::string>
-    OutputFormat("O", cl::desc("set output format to one of the following:"
-                               "\n\tbinary"));
 
 void CopyBinary(const ELFObjectFile<ELF64LE> &ObjFile) {
   std::unique_ptr<FileOutputBuffer> Buffer;
-  std::unique_ptr<Object<ELF64LE>> Obj;
-  if (!OutputFormat.empty() && OutputFormat != "binary")
-    error("invalid output format '" + OutputFormat + "'");
-
-  if (!OutputFormat.empty() && OutputFormat == "binary")
-    Obj = llvm::make_unique<BinaryObject<ELF64LE>>(ObjFile);
-  else
-    Obj = llvm::make_unique<ELFObject<ELF64LE>>(ObjFile);
-  Obj->finalize();
+  Object<ELF64LE> Obj{ObjFile};
+  Obj.finalize();
   ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-      FileOutputBuffer::create(OutputFilename, Obj->totalSize(),
+      FileOutputBuffer::create(OutputFilename, Obj.totalSize(),
                                FileOutputBuffer::F_executable);
   if (BufferOrErr.getError())
     error("failed to open " + OutputFilename);
@@ -78,7 +68,7 @@ void CopyBinary(const ELFObjectFile<ELF64LE> &ObjFile) {
   std::error_code EC;
   if (EC)
     report_fatal_error(EC.message());
-  Obj->write(*Buffer);
+  Obj.write(*Buffer);
   if (auto EC = Buffer->commit())
     reportError(OutputFilename, EC);
 }
-- 
cgit v1.2.3