Fix relocations with weak definitions.

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

diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp
index 6e0c4d20d32dc78f98b914b67e0752637447237e..d31ecef27a8411e7a78bf12962f45ae6b25d8e19 100644 (file)
--- a/lib/MC/MachObjectWriter.cpp
+++ b/lib/MC/MachObjectWriter.cpp
@@ -893,7 +893,7 @@ public:
         // compensate for the addend of the symbol address, if it was
         // undefined. This occurs with weak definitions, for example.
         if (!SD->Symbol->isUndefined())
-          FixedValue -= getSymbolAddress(SD, Layout);
+          FixedValue -= Layout.getSymbolOffset(SD);
       } else {
         // The index is the section ordinal (1-based).
         Index = SD->getFragment()->getParent()->getOrdinal() + 1;

diff --git a/test/MC/MachO/weakdef.s b/test/MC/MachO/weakdef.s
new file mode 100644 (file)
index 0000000..494079d
--- /dev/null
+++ b/test/MC/MachO/weakdef.s
@@ -0,0 +1,141 @@
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | macho-dump --dump-section-data | FileCheck %s
+
+       .section        __DATA,__datacoal_nt,coalesced
+       .section        __TEXT,__const_coal,coalesced
+       .globl  __ZTS3optIbE            ## @_ZTS3optIbE
+       .weak_definition        __ZTS3optIbE
+__ZTS3optIbE:
+
+
+       .section        __DATA,__datacoal_nt,coalesced
+       .globl  __ZTI3optIbE            ## @_ZTI3optIbE
+       .weak_definition        __ZTI3optIbE
+
+__ZTI3optIbE:
+       .long   __ZTS3optIbE
+
+// CHECK:      ('cputype', 7)
+// CHECK-NEXT: ('cpusubtype', 3)
+// CHECK-NEXT: ('filetype', 1)
+// CHECK-NEXT: ('num_load_commands', 3)
+// CHECK-NEXT: ('load_commands_size', 364)
+// CHECK-NEXT: ('flag', 0)
+// CHECK-NEXT: ('load_commands', [
+// CHECK-NEXT:   # Load Command 0
+// CHECK-NEXT:  (('command', 1)
+// CHECK-NEXT:   ('size', 260)
+// CHECK-NEXT:   ('segment_name', '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+// CHECK-NEXT:   ('vm_addr', 0)
+// CHECK-NEXT:   ('vm_size', 4)
+// CHECK-NEXT:   ('file_offset', 392)
+// CHECK-NEXT:   ('file_size', 4)
+// CHECK-NEXT:   ('maxprot', 7)
+// CHECK-NEXT:   ('initprot', 7)
+// CHECK-NEXT:   ('num_sections', 3)
+// CHECK-NEXT:   ('flags', 0)
+// CHECK-NEXT:   ('sections', [
+// CHECK-NEXT:     # Section 0
+// CHECK-NEXT:    (('section_name', '__text\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+// CHECK-NEXT:     ('segment_name', '__TEXT\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+// CHECK-NEXT:     ('address', 0)
+// CHECK-NEXT:     ('size', 0)
+// CHECK-NEXT:     ('offset', 392)
+// CHECK-NEXT:     ('alignment', 0)
+// CHECK-NEXT:     ('reloc_offset', 0)
+// CHECK-NEXT:     ('num_reloc', 0)
+// CHECK-NEXT:     ('flags', 0x80000000)
+// CHECK-NEXT:     ('reserved1', 0)
+// CHECK-NEXT:     ('reserved2', 0)
+// CHECK-NEXT:    ),
+// CHECK-NEXT:   ('_relocations', [
+// CHECK-NEXT:   ])
+// CHECK-NEXT:   ('_section_data', '')
+// CHECK-NEXT:     # Section 1
+// CHECK-NEXT:    (('section_name', '__datacoal_nt\x00\x00\x00')
+// CHECK-NEXT:     ('segment_name', '__DATA\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+// CHECK-NEXT:     ('address', 0)
+// CHECK-NEXT:     ('size', 4)
+// CHECK-NEXT:     ('offset', 392)
+// CHECK-NEXT:     ('alignment', 0)
+// CHECK-NEXT:     ('reloc_offset', 396)
+// CHECK-NEXT:     ('num_reloc', 1)
+// CHECK-NEXT:     ('flags', 0xb)
+// CHECK-NEXT:     ('reserved1', 0)
+// CHECK-NEXT:     ('reserved2', 0)
+// CHECK-NEXT:    ),
+// CHECK-NEXT:   ('_relocations', [
+// CHECK-NEXT:     # Relocation 0
+// CHECK-NEXT:     (('word-0', 0x0),
+// CHECK-NEXT:      ('word-1', 0xc000001)),
+// CHECK-NEXT:   ])
+// CHECK-NEXT:   ('_section_data', '00000000')
+// CHECK-NEXT:     # Section 2
+// CHECK-NEXT:    (('section_name', '__const_coal\x00\x00\x00\x00')
+// CHECK-NEXT:     ('segment_name', '__TEXT\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+// CHECK-NEXT:     ('address', 4)
+// CHECK-NEXT:     ('size', 0)
+// CHECK-NEXT:     ('offset', 396)
+// CHECK-NEXT:     ('alignment', 0)
+// CHECK-NEXT:     ('reloc_offset', 0)
+// CHECK-NEXT:     ('num_reloc', 0)
+// CHECK-NEXT:     ('flags', 0xb)
+// CHECK-NEXT:     ('reserved1', 0)
+// CHECK-NEXT:     ('reserved2', 0)
+// CHECK-NEXT:    ),
+// CHECK-NEXT:   ('_relocations', [
+// CHECK-NEXT:   ])
+// CHECK-NEXT:   ('_section_data', '')
+// CHECK-NEXT:   ])
+// CHECK-NEXT:  ),
+// CHECK-NEXT:   # Load Command 1
+// CHECK-NEXT:  (('command', 2)
+// CHECK-NEXT:   ('size', 24)
+// CHECK-NEXT:   ('symoff', 404)
+// CHECK-NEXT:   ('nsyms', 2)
+// CHECK-NEXT:   ('stroff', 428)
+// CHECK-NEXT:   ('strsize', 28)
+// CHECK-NEXT:   ('_string_data', '\x00__ZTS3optIbE\x00__ZTI3optIbE\x00\x00')
+// CHECK-NEXT:   ('_symbols', [
+// CHECK-NEXT:     # Symbol 0
+// CHECK-NEXT:    (('n_strx', 14)
+// CHECK-NEXT:     ('n_type', 0xf)
+// CHECK-NEXT:     ('n_sect', 2)
+// CHECK-NEXT:     ('n_desc', 128)
+// CHECK-NEXT:     ('n_value', 0)
+// CHECK-NEXT:     ('_string', '__ZTI3optIbE')
+// CHECK-NEXT:    ),
+// CHECK-NEXT:     # Symbol 1
+// CHECK-NEXT:    (('n_strx', 1)
+// CHECK-NEXT:     ('n_type', 0xf)
+// CHECK-NEXT:     ('n_sect', 3)
+// CHECK-NEXT:     ('n_desc', 128)
+// CHECK-NEXT:     ('n_value', 4)
+// CHECK-NEXT:     ('_string', '__ZTS3optIbE')
+// CHECK-NEXT:    ),
+// CHECK-NEXT:   ])
+// CHECK-NEXT:  ),
+// CHECK-NEXT:   # Load Command 2
+// CHECK-NEXT:  (('command', 11)
+// CHECK-NEXT:   ('size', 80)
+// CHECK-NEXT:   ('ilocalsym', 0)
+// CHECK-NEXT:   ('nlocalsym', 0)
+// CHECK-NEXT:   ('iextdefsym', 0)
+// CHECK-NEXT:   ('nextdefsym', 2)
+// CHECK-NEXT:   ('iundefsym', 2)
+// CHECK-NEXT:   ('nundefsym', 0)
+// CHECK-NEXT:   ('tocoff', 0)
+// CHECK-NEXT:   ('ntoc', 0)
+// CHECK-NEXT:   ('modtaboff', 0)
+// CHECK-NEXT:   ('nmodtab', 0)
+// CHECK-NEXT:   ('extrefsymoff', 0)
+// CHECK-NEXT:   ('nextrefsyms', 0)
+// CHECK-NEXT:   ('indirectsymoff', 0)
+// CHECK-NEXT:   ('nindirectsyms', 0)
+// CHECK-NEXT:   ('extreloff', 0)
+// CHECK-NEXT:   ('nextrel', 0)
+// CHECK-NEXT:   ('locreloff', 0)
+// CHECK-NEXT:   ('nlocrel', 0)
+// CHECK-NEXT:   ('_indirect_symbols', [
+// CHECK-NEXT:   ])
+// CHECK-NEXT:  ),
+// CHECK-NEXT: ])