commit cd4b20a25b6251fb4a2ca50813c10184accab24b
author Rafael Espindola <rafael.espindola@gmail.com> Fri Sep 24 18:48:08 2010 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Sep 24 18:48:08 2010 +0000
tree 527d931baf2e4814f022e43b9dbc85dbfc4ff0e1
parent 946e3c9f9db2d0ab5bd75ad0283c224366807fa6

Revert 114678 and 114667 to see if

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

gets happy.

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

lib/MC/ELFObjectWriter.cpp

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