commit a648918eb772d46cd8e14a2ab3489a80500260af
author Rafael Espindola <rafael.espindola@gmail.com> Fri Sep 24 21:19:03 2010 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Sep 24 21:19:03 2010 +0000
tree af578b81ed2b3505e84c2f2c59c4fd4b2a1bd682
parent 433a5785cc8201a8a384f0a5648d3dbac87f9fbc

Reapply 114678 and 114667. Reverting them did not fix the bot:

http://google1.osuosl.org:8011/builders/llvm-gcc-i386-linux-selfhost/builds/69

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114761 91177308-0d34-0410-b5e6-96231b3b80d8

lib/MC/ELFObjectWriter.cpp

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 1189b73..9eb9bca 100644
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -515,9 +515,12 @@
     }
 
     if (Base) {
-      if (F && (!Symbol->isInSection() || SD.isCommon()) && !SD.isExternal()) {
+      if (F && !SD.isExternal()) {
         Index = F->getParent()->getOrdinal() + LocalSymbolData.size() + 1;
-        Value += Layout.getSymbolAddress(&SD);
+
+        MCSectionData *FSD = F->getParent();
+        // Offset of the symbol in the section
+        Value += Layout.getSymbolAddress(&SD) - Layout.getSectionAddress(FSD);
       } else
         Index = getSymbolIndexInSymbolTable(Asm, Symbol);
       if (Base != &SD)