diff options
| author | Chris Lattner <sabre@nondot.org> | 2007-01-29 00:21:34 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2007-01-29 00:21:34 +0000 |
| commit | c36357c406911ded5a0e2924998d885815370fdb (patch) | |
| tree | cf616b2df357d5e7b8dcf879d49456dbc5192e9d /lib/Linker | |
| parent | 94c49edfe23c89ce6f591d307ba412638d403920 (diff) | |
| download | external_llvm-c36357c406911ded5a0e2924998d885815370fdb.zip external_llvm-c36357c406911ded5a0e2924998d885815370fdb.tar.gz external_llvm-c36357c406911ded5a0e2924998d885815370fdb.tar.bz2 | |
Fix PR1139
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33610 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker')
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 6283b05..527c093 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -849,24 +849,31 @@ 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) - if (Src->getEndianness() == Module::BigEndian) - DataLayout.append("E"); - else if (Src->getEndianness() == Module::LittleEndian) - DataLayout.append("e"); - if (Dest->getPointerSize() == Module::AnyPointerSize) - 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 (Dest->getDataLayout().empty()) { + if (!Src->getDataLayout().empty()) { + Dest->setDataLayout(Src->getTargetTriple()); + } else { + std::string DataLayout; + + if (Dest->getEndianness() == Module::AnyEndianness) + if (Src->getEndianness() == Module::BigEndian) + DataLayout.append("E"); + else if (Src->getEndianness() == Module::LittleEndian) + DataLayout.append("e"); + if (Dest->getPointerSize() == Module::AnyPointerSize) + 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"); + Dest->setDataLayout(DataLayout); + } + } - if (Src->getDataLayout().length() > 0 && Dest->getDataLayout().length() > 0 && - Src->getDataLayout().compare(Dest->getDataLayout()) != 0) + if (Dest->getTargetTriple().empty() && !Src->getTargetTriple().empty()) + Dest->setTargetTriple(Src->getTargetTriple()); + + if (!Src->getDataLayout().empty() && !Dest->getDataLayout().empty() && + Src->getDataLayout() != Dest->getDataLayout()) cerr << "WARNING: Linking two modules of different data layouts!\n"; if (!Src->getTargetTriple().empty() && Dest->getTargetTriple() != Src->getTargetTriple()) |