diff options
author | Chris Lattner <sabre@nondot.org> | 2007-05-06 09:29:57 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2007-05-06 09:29:57 +0000 |
commit | 44dadffe4bd58ab32961ca5fe537e8ba69c09243 (patch) | |
tree | 745eccd4ec6ba93e89d8c2d992db470dbd025134 /tools/llvm-link | |
parent | 4bcca0f2ac85c918fc8617e34b7642e5e5233460 (diff) | |
download | llvm-44dadffe4bd58ab32961ca5fe537e8ba69c09243.tar.gz llvm-44dadffe4bd58ab32961ca5fe537e8ba69c09243.tar.bz2 llvm-44dadffe4bd58ab32961ca5fe537e8ba69c09243.tar.xz |
switch tools to bitcode instead of bytecode
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36868 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-link')
-rw-r--r-- | tools/llvm-link/Makefile | 2 | ||||
-rw-r--r-- | tools/llvm-link/llvm-link.cpp | 34 |
2 files changed, 10 insertions, 26 deletions
diff --git a/tools/llvm-link/Makefile b/tools/llvm-link/Makefile index 4371c69712..1985c44a80 100644 --- a/tools/llvm-link/Makefile +++ b/tools/llvm-link/Makefile @@ -9,6 +9,6 @@ LEVEL = ../.. TOOLNAME = llvm-link -LINK_COMPONENTS = linker bcreader bcwriter bitreader bitwriter +LINK_COMPONENTS = linker bitreader bitwriter include $(LEVEL)/Makefile.common diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index cd9380d70b..aceb90889b 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 @@ static inline std::auto_ptr<Module> LoadFile(const std::string &FN) { 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 @@ int main(int argc, char **argv) { } 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; |