diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2010-10-06 19:27:21 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2010-10-06 19:27:21 +0000 |
| commit | d4445773820ff33e752128baf128457b655ccd01 (patch) | |
| tree | f356a097d3d380e8bca2d4456fa05df6c14ae7e7 /llvm/lib | |
| parent | 569eafce635c7ca2285517d2a6b92ec8df23ac94 (diff) | |
| download | bcm5719-llvm-d4445773820ff33e752128baf128457b655ccd01.tar.gz bcm5719-llvm-d4445773820ff33e752128baf128457b655ccd01.zip | |
If a symbol is global, reloc against it even if it is in a mergeable section.
llvm-svn: 115817
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index cbe0ebfa4ad..ac8c250a833 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -539,12 +539,12 @@ static bool ShouldRelocOnSymbol(const MCSymbolData &SD, const MCSectionELF &Section = static_cast<const MCSectionELF&>(Symbol.getSection()); - if (Section.getFlags() & MCSectionELF::SHF_MERGE) - return Target.getConstant() != 0; - if (SD.isExternal()) return true; + if (Section.getFlags() & MCSectionELF::SHF_MERGE) + return Target.getConstant() != 0; + MCSymbolRefExpr::VariantKind Kind = Target.getSymA()->getKind(); const MCSectionELF &Sec2 = static_cast<const MCSectionELF&>(F.getParent()->getSection()); |
