From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 28 Oct 2010 19:39:57 +0000 (+0000)
Subject: Defined weak symbols should have non-zero value.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1973d4379250a88938a9358c12d96e96bdc8dede;p=oota-llvm.git

Defined weak symbols should have non-zero value.

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

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 813e4ac259c..dbe0dd870f6 100644
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -438,10 +438,9 @@ static uint64_t SymbolValue(MCSymbolData &Data, const MCAsmLayout &Layout) {
   if (!Symbol.isInSection())
     return 0;
 
-  if (!Data.isCommon() && !(Data.getFlags() & ELF_STB_Weak))
-    if (MCFragment *FF = Data.getFragment())
-      return Layout.getSymbolAddress(&Data) -
-             Layout.getSectionAddress(FF->getParent());
+  if (MCFragment *FF = Data.getFragment())
+    return Layout.getSymbolAddress(&Data) -
+      Layout.getSectionAddress(FF->getParent());
 
   return 0;
 }
diff --git a/test/MC/ELF/weak.s b/test/MC/ELF/weak.s
index 332b91bf76f..f1a66b5e03c 100644
--- a/test/MC/ELF/weak.s
+++ b/test/MC/ELF/weak.s
@@ -5,7 +5,7 @@
 	.weak	foo
         .long   foo
 
-// And that bar is after all local symbols
+// And that bar is after all local symbols and has non zero value.
         .weak bar
 bar:
 
@@ -15,7 +15,7 @@ bar:
 //CHECK-NEXT:    ('st_type', 0x00000000)
 //CHECK-NEXT:    ('st_other', 0x00000000)
 //CHECK-NEXT:    ('st_shndx', 0x00000001)
-//CHECK-NEXT:    ('st_value', 0x00000000)
+//CHECK-NEXT:    ('st_value', 0x00000004)
 //CHECK-NEXT:    ('st_size', 0x00000000)
 //CHECK-NEXT:   ),
 //CHECK-NEXT:   # Symbol 0x00000005