[llvm-commits] CVS: llvm/tools/llvm-ld/Makefile llvm-ld.cpp

[Chris Lattner]

Changes in directory llvm/tools/llvm-ld:

Makefile updated: 1.11 -> 1.12
llvm-ld.cpp updated: 1.52 -> 1.53
---
Log message:

switch tools to bitcode instead of bytecode


---
Diffs of the changes:  (+2 -13)

 Makefile    |    2 +-
 llvm-ld.cpp |   13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)


Index: llvm/tools/llvm-ld/Makefile
diff -u llvm/tools/llvm-ld/Makefile:1.11 llvm/tools/llvm-ld/Makefile:1.12
--- llvm/tools/llvm-ld/Makefile:1.11	Sun May  6 00:56:58 2007
+++ llvm/tools/llvm-ld/Makefile	Sun May  6 04:29:57 2007
@@ -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


Index: llvm/tools/llvm-ld/llvm-ld.cpp
diff -u llvm/tools/llvm-ld/llvm-ld.cpp:1.52 llvm/tools/llvm-ld/llvm-ld.cpp:1.53
--- llvm/tools/llvm-ld/llvm-ld.cpp:1.52	Sun May  6 00:56:58 2007
+++ llvm/tools/llvm-ld/llvm-ld.cpp	Sun May  6 04:29:57 2007
@@ -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>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 @@
   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();