commit 153666c0384c724c1a935be44a1afe0319649e3e
author Rafael Espindola <rafael.espindola@gmail.com> Wed Oct 06 19:27:21 2010 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Wed Oct 06 19:27:21 2010 +0000
tree 9d77e178550cd9140fd1ae39d3b48a18930a601d
parent 9c220fc165ab3543a383d7101cb80544e0c220e3

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

lib/MC/ELFObjectWriter.cpp

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index cbe0ebf..ac8c250 100644
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -539,12 +539,12 @@
   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());