[llvm] r270883 - coff: fix the value of weak definitions.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Thu May 26 13:04:53 2016
New Revision: 270883

URL: http://llvm.org/viewvc/llvm-project?rev=270883&view=rev
Log:
coff: fix the value of weak definitions.

It looks like this doesn't get a lot of use.

Added:
    llvm/trunk/test/MC/COFF/weak-val.s
Modified:
    llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp

Modified: llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp?rev=270883&r1=270882&r2=270883&view=diff
==============================================================================
--- llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp Thu May 26 13:04:53 2016
@@ -377,7 +377,7 @@ void WinCOFFObjectWriter::DefineSymbol(c
       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;
     }
 

Added: llvm/trunk/test/MC/COFF/weak-val.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/COFF/weak-val.s?rev=270883&view=auto
==============================================================================
--- llvm/trunk/test/MC/COFF/weak-val.s (added)
+++ llvm/trunk/test/MC/COFF/weak-val.s Thu May 26 13:04:53 2016
@@ -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: }