diff options
author | Anton Korobeynikov <asl@math.spbu.ru> | 2008-02-20 11:27:04 +0000 |
---|---|---|
committer | Anton Korobeynikov <asl@math.spbu.ru> | 2008-02-20 11:27:04 +0000 |
commit | bddf51bc9b4f8b17b24414910aa51a8a16c4efba (patch) | |
tree | 7f1aa2430bebe9fac40ee64274c884614808c8e2 /llvm/lib | |
parent | 1bfd121321fbe487e3fd343804b77412d3f33fe8 (diff) | |
download | bcm5719-llvm-bddf51bc9b4f8b17b24414910aa51a8a16c4efba.tar.gz bcm5719-llvm-bddf51bc9b4f8b17b24414910aa51a8a16c4efba.zip |
And final pack of warnings silencing
llvm-svn: 47372
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index a8995d6fb49..1ae609d4ab8 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -951,16 +951,19 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { } else { std::string DataLayout; - if (Dest->getEndianness() == Module::AnyEndianness) + 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 (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); } } |