aboutsummaryrefslogtreecommitdiff
path: root/lib/MC/ELFObjectWriter.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2010-10-06 19:27:21 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2010-10-06 19:27:21 +0000
commit153666c0384c724c1a935be44a1afe0319649e3e (patch)
tree9d77e178550cd9140fd1ae39d3b48a18930a601d /lib/MC/ELFObjectWriter.cpp
parent9c220fc165ab3543a383d7101cb80544e0c220e3 (diff)
If a symbol is global, reloc against it even if it is in a mergeable section.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115817 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/ELFObjectWriter.cpp')
-rw-r--r--lib/MC/ELFObjectWriter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index cbe0ebfa4a..ac8c250a83 100644
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/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());