switch tools to bitcode instead of bytecode

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36868 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 2 insertions, 13 deletions

diff --git a/tools/llvm-ld/Makefile b/tools/llvm-ld/Makefile
index b22035b..f772504 100644
--- a/tools/llvm-ld/Makefile
+++ b/tools/llvm-ld/Makefile
@@ -10,7 +10,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-ld
-LINK_COMPONENTS = ipo scalaropts linker archive bcwriter bitwriter
+LINK_COMPONENTS = ipo scalaropts linker archive bitwriter
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index 2aa6d18..9b3e66d 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -26,7 +26,6 @@
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Bytecode/Writer.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetMachineRegistry.h"
@@ -41,8 +40,6 @@
 #include <memory>
 using namespace llvm;
 
-cl::opt<bool> Bitcode("bitcode");
-
 // Input/Output Options
 static cl::list<std::string> InputFilenames(cl::Positional, cl::OneOrMore,
   cl::desc("<input bytecode files>"));
@@ -78,9 +75,6 @@ static cl::opt<bool> Native("native",
 static cl::opt<bool>NativeCBE("native-cbe",
   cl::desc("Generate a native binary with the C backend and GCC"));
 
-static cl::opt<bool>DisableCompression("disable-compression", cl::init(true),
-  cl::desc("Disable writing of compressed bytecode files"));
-
 static cl::list<std::string> PostLinkOpts("post-link-opts",
   cl::value_desc("path"),
   cl::desc("Run one or more optimization programs after linking"));
@@ -227,12 +221,7 @@ void GenerateBytecode(Module* M, const std::string& FileName) {
   sys::RemoveFileOnSignal(sys::Path(FileName));
 
   // Write it out
-  if (Bitcode) {
-    WriteBitcodeToFile(M, Out);
-  } else {
-    OStream L(Out);
-    WriteBytecodeToFile(M, L, !DisableCompression);
-  }
+  WriteBitcodeToFile(M, Out);
 
   // Close the bytecode file.
   Out.close();