mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-15 05:24:01 +00:00
For PR761:
The Module::setEndianness and Module::setPointerSize methods have been removed. Instead you can get/set the DataLayout. Adjust thise accordingly. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33530 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -849,19 +849,25 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
|
||||
assert(Dest != 0 && "Invalid Destination module");
|
||||
assert(Src != 0 && "Invalid Source Module");
|
||||
|
||||
std::string DataLayout;
|
||||
|
||||
if (Dest->getEndianness() == Module::AnyEndianness)
|
||||
Dest->setEndianness(Src->getEndianness());
|
||||
if (Src->getEndianness() == Module::BigEndian)
|
||||
DataLayout.append("E");
|
||||
else if (Src->getEndianness() == Module::LittleEndian)
|
||||
DataLayout.append("e");
|
||||
if (Dest->getPointerSize() == Module::AnyPointerSize)
|
||||
Dest->setPointerSize(Src->getPointerSize());
|
||||
if (Src->getPointerSize() == Module::Pointer64)
|
||||
DataLayout.append(DataLayout.length() == 0 ? "p:64:64" : "-p:64:64");
|
||||
else if (Src->getPointerSize() == Module::Pointer32)
|
||||
DataLayout.append(DataLayout.length() == 0 ? "p:32:32" : "-p:32:32");
|
||||
if (Dest->getTargetTriple().empty())
|
||||
Dest->setTargetTriple(Src->getTargetTriple());
|
||||
Dest->setDataLayout(DataLayout);
|
||||
|
||||
if (Src->getEndianness() != Module::AnyEndianness &&
|
||||
Dest->getEndianness() != Src->getEndianness())
|
||||
cerr << "WARNING: Linking two modules of different endianness!\n";
|
||||
if (Src->getPointerSize() != Module::AnyPointerSize &&
|
||||
Dest->getPointerSize() != Src->getPointerSize())
|
||||
cerr << "WARNING: Linking two modules of different pointer size!\n";
|
||||
if (Src->getDataLayout().length() > 0 && Dest->getDataLayout().length() > 0 &&
|
||||
Src->getDataLayout().compare(Dest->getDataLayout()) != 0)
|
||||
cerr << "WARNING: Linking two modules of different data layouts!\n";
|
||||
if (!Src->getTargetTriple().empty() &&
|
||||
Dest->getTargetTriple() != Src->getTargetTriple())
|
||||
cerr << "WARNING: Linking two modules of different target triples!\n";
|
||||
|
Reference in New Issue
Block a user