add bitcode support.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36853 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2007-05-06 05:56:58 +00:00
parent a8653f3522
commit bb3f3d357f
2 changed files with 12 additions and 5 deletions

View File

@ -10,7 +10,7 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-ld TOOLNAME = llvm-ld
LINK_COMPONENTS = ipo scalaropts linker archive bcreader bcwriter LINK_COMPONENTS = ipo scalaropts linker archive bcwriter bitwriter
REQUIRES_EH := 1 REQUIRES_EH := 1
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -25,7 +25,7 @@
#include "llvm/System/Program.h" #include "llvm/System/Program.h"
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/PassManager.h" #include "llvm/PassManager.h"
#include "llvm/Bytecode/Reader.h" #include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Bytecode/Writer.h" #include "llvm/Bytecode/Writer.h"
#include "llvm/Target/TargetData.h" #include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetMachine.h"
@ -33,6 +33,7 @@
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileUtilities.h" #include "llvm/Support/FileUtilities.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Streams.h" #include "llvm/Support/Streams.h"
#include "llvm/Support/SystemUtils.h" #include "llvm/Support/SystemUtils.h"
#include "llvm/System/Signals.h" #include "llvm/System/Signals.h"
@ -40,6 +41,8 @@
#include <memory> #include <memory>
using namespace llvm; using namespace llvm;
cl::opt<bool> Bitcode("bitcode");
// Input/Output Options // Input/Output Options
static cl::list<std::string> InputFilenames(cl::Positional, cl::OneOrMore, static cl::list<std::string> InputFilenames(cl::Positional, cl::OneOrMore,
cl::desc("<input bytecode files>")); cl::desc("<input bytecode files>"));
@ -224,8 +227,12 @@ void GenerateBytecode(Module* M, const std::string& FileName) {
sys::RemoveFileOnSignal(sys::Path(FileName)); sys::RemoveFileOnSignal(sys::Path(FileName));
// Write it out // Write it out
OStream L(Out); if (Bitcode) {
WriteBytecodeToFile(M, L, !DisableCompression); WriteBitcodeToFile(M, Out);
} else {
OStream L(Out);
WriteBytecodeToFile(M, L, !DisableCompression);
}
// Close the bytecode file. // Close the bytecode file.
Out.close(); Out.close();
@ -547,7 +554,7 @@ int main(int argc, char **argv, char **envp) {
args[2] = tmp_output.c_str(); args[2] = tmp_output.c_str();
args[3] = 0; args[3] = 0;
if (0 == sys::Program::ExecuteAndWait(prog, args, 0,0,0,0, &ErrMsg)) { if (0 == sys::Program::ExecuteAndWait(prog, args, 0,0,0,0, &ErrMsg)) {
if (tmp_output.isBytecodeFile()) { if (tmp_output.isBytecodeFile() || tmp_output.isBitcodeFile()) {
sys::Path target(RealBytecodeOutput); sys::Path target(RealBytecodeOutput);
target.eraseFromDisk(); target.eraseFromDisk();
if (tmp_output.renamePathOnDisk(target, &ErrMsg)) if (tmp_output.renamePathOnDisk(target, &ErrMsg))