diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2010-10-28 19:39:57 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2010-10-28 19:39:57 +0000 |
| commit | 3c5a54e4b94d8193dd0d14b4edb6301c44899a56 (patch) | |
| tree | a8074a586e84faf8627260d7b4f10820a25a83aa /llvm | |
| parent | 4b9498656224ab8ed456db1a76ec2d58bc4aa8a2 (diff) | |
| download | bcm5719-llvm-3c5a54e4b94d8193dd0d14b4edb6301c44899a56.tar.gz bcm5719-llvm-3c5a54e4b94d8193dd0d14b4edb6301c44899a56.zip | |
Defined weak symbols should have non-zero value.
llvm-svn: 117585
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/MC/ELF/weak.s | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 813e4ac259c..dbe0dd870f6 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/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/llvm/test/MC/ELF/weak.s b/llvm/test/MC/ELF/weak.s index 332b91bf76f..f1a66b5e03c 100644 --- a/llvm/test/MC/ELF/weak.s +++ b/llvm/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 |
