diff options
| -rw-r--r-- | llvm/lib/MC/WinCOFFObjectWriter.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/MC/COFF/weak-val.s | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/llvm/lib/MC/WinCOFFObjectWriter.cpp b/llvm/lib/MC/WinCOFFObjectWriter.cpp index dd7adbf3ead..4bd46cfbaca 100644 --- a/llvm/lib/MC/WinCOFFObjectWriter.cpp +++ b/llvm/lib/MC/WinCOFFObjectWriter.cpp @@ -377,7 +377,7 @@ void WinCOFFObjectWriter::DefineSymbol(const MCSymbol &Symbol, WeakDefault->Data.SectionNumber = COFF::IMAGE_SYM_ABSOLUTE; WeakDefault->Data.StorageClass = COFF::IMAGE_SYM_CLASS_EXTERNAL; WeakDefault->Data.Type = 0; - WeakDefault->Data.Value = 0; + WeakDefault->Data.Value = getSymbolValue(Symbol, Layout); coff_symbol->Other = WeakDefault; } diff --git a/llvm/test/MC/COFF/weak-val.s b/llvm/test/MC/COFF/weak-val.s new file mode 100644 index 00000000000..8a7dba56de1 --- /dev/null +++ b/llvm/test/MC/COFF/weak-val.s @@ -0,0 +1,33 @@ +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o %t.o +// RUN: llvm-readobj -t %t.o | FileCheck %s + +// test that b and .weak.b have the correct values. + + .data +.long 42 + .weak b +b: + .long 42 + +// CHECK: Symbol { +// CHECK: Name: b +// CHECK-NEXT: Value: 0 +// CHECK-NEXT: Section: IMAGE_SYM_UNDEFINED (0) +// CHECK-NEXT: BaseType: Null (0x0) +// CHECK-NEXT: ComplexType: Null (0x0) +// CHECK-NEXT: StorageClass: WeakExternal (0x69) +// CHECK-NEXT: AuxSymbolCount: 1 +// CHECK-NEXT: AuxWeakExternal { +// CHECK-NEXT: Linked: .weak.b.default (8) +// CHECK-NEXT: Search: Library (0x2) +// CHECK-NEXT: } +// CHECK-NEXT: } +// CHECK-NEXT: Symbol { +// CHECK-NEXT: Name: .weak.b.default +// CHECK-NEXT: Value: 4 +// CHECK-NEXT: Section: IMAGE_SYM_ABSOLUTE (-1) +// CHECK-NEXT: BaseType: Null (0x0) +// CHECK-NEXT: ComplexType: Null (0x0) +// CHECK-NEXT: StorageClass: External (0x2) +// CHECK-NEXT: AuxSymbolCount: 0 +// CHECK-NEXT: } |
