diff options
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 7 | ||||
| -rw-r--r-- | test/MC/ELF/weak.s | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 813e4ac259..dbe0dd870f 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 332b91bf76..f1a66b5e03 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 |