switch tools to bitcode instead of bytecode
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36868 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp
index cd9380d..aceb908 100644
--- a/tools/llvm-link/llvm-link.cpp
+++ b/tools/llvm-link/llvm-link.cpp
@@ -16,12 +16,9 @@
#include "llvm/Module.h"
#include "llvm/Analysis/Verifier.h"
#include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Bytecode/Reader.h"
-#include "llvm/Bytecode/Writer.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Streams.h"
#include "llvm/System/Signals.h"
#include "llvm/System/Path.h"
#include <fstream>
@@ -29,8 +26,6 @@
#include <memory>
using namespace llvm;
-cl::opt<bool> Bitcode("bitcode");
-
static cl::list<std::string>
InputFilenames(cl::Positional, cl::OneOrMore,
cl::desc("<input bytecode files>"));
@@ -65,20 +60,14 @@
if (Verbose) cerr << "Loading '" << Filename.c_str() << "'\n";
Module* Result = 0;
- if (Bitcode) {
- const std::string &FNStr = Filename.toString();
- MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&FNStr[0],
- FNStr.size());
- if (Buffer == 0)
- ErrorMessage = "Error reading file '" + FNStr + "'";
- else
- Result = ParseBitcodeFile(Buffer, &ErrorMessage);
- delete Buffer;
- } else {
- Result = ParseBytecodeFile(Filename.toString(),
- Compressor::decompressToNewBuffer,
- &ErrorMessage);
- }
+ const std::string &FNStr = Filename.toString();
+ MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&FNStr[0],
+ FNStr.size());
+ if (Buffer == 0)
+ ErrorMessage = "Error reading file '" + FNStr + "'";
+ else
+ Result = ParseBitcodeFile(Buffer, &ErrorMessage);
+ delete Buffer;
if (Result) return std::auto_ptr<Module>(Result); // Load successful!
if (Verbose) {
@@ -159,12 +148,7 @@
}
if (Verbose) cerr << "Writing bytecode...\n";
- if (Bitcode) {
- WriteBitcodeToFile(Composite.get(), *Out);
- } else {
- OStream L(*Out);
- WriteBytecodeToFile(Composite.get(), L, !NoCompress);
- }
+ WriteBitcodeToFile(Composite.get(), *Out);
if (Out != &std::cout) delete Out;
return 0;