6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 18:29:45 +00:00
Code Issues Projects Releases Wiki Activity

add bitcode support

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36855 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2007-05-06 06:02:13 +00:00
parent 5e3c9f96d7
commit 1a019e5ffd
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Linker/LinkArchives.cpp
View File

@ -16,7 +16,6 @@
#include "llvm/Module.h"
#include "llvm/ModuleProvider.h"
#include "llvm/ADT/SetOperations.h"
#include "llvm/Bytecode/Reader.h"
#include "llvm/Bytecode/Archive.h"
#include "llvm/Config/config.h"
#include <memory>

2
lib/Linker/LinkItems.cpp
View File

@ -83,6 +83,7 @@ bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) {
return warning("Supposed library '" + Lib + "' isn't a library.");
case sys::Bytecode_FileType:
case sys::Bitcode_FileType:
case sys::CompressedBytecode_FileType:
// LLVM ".so" file.
if (LinkInFile(Pathname, is_native))
@ -175,6 +176,7 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) {
return error("Cannot link archive '" + File.toString() + "'");
break;
case sys::Bitcode_FileType:
case sys::Bytecode_FileType:
case sys::CompressedBytecode_FileType: {
verbose("Linking bytecode file '" + File.toString() + "'");

24
lib/Linker/Linker.cpp
View File

@ -14,11 +14,15 @@
#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Bytecode/Reader.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Config/config.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Streams.h"
#include "llvm/Support/Compressor.h"
using namespace llvm;
static const bool Bitcode = false;
Linker::Linker(const std::string& progname, const std::string& modname, unsigned flags)
: Composite(0)
, LibPaths()
@ -100,9 +104,21 @@ Linker::releaseModule() {
std::auto_ptr<Module>
Linker::LoadObject(const sys::Path &FN) {
std::string ParseErrorMessage;
Module *Result = ParseBytecodeFile(FN.toString(),
Compressor::decompressToNewBuffer,
&ParseErrorMessage);
Module *Result = 0;
const std::string &FNS = FN.toString();
if (Bitcode) {
std::auto_ptr<MemoryBuffer> Buffer(
MemoryBuffer::getFileOrSTDIN(&FNS[0], FNS.size()));
if (Buffer.get())
Result = ParseBitcodeFile(Buffer.get(), &ParseErrorMessage);
else
ParseErrorMessage = "Error reading file '" + FNS + "'";
} else {
Result = ParseBytecodeFile(FNS, Compressor::decompressToNewBuffer,
&ParseErrorMessage);
}
if (Result)
return std::auto_ptr<Module>(Result);
Error = "Bytecode file '" + FN.toString() + "' could not be loaded";
@ -137,6 +153,8 @@ static inline sys::Path IsLibrary(const std::string& Name,
return FullPath;
if (FullPath.isBytecodeFile()) // .so file containing bytecode?
return FullPath;
if (FullPath.isBitcodeFile()) // .so file containing bitcode?
return FullPath;
// Not found .. fall through