maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lld/mac] Set ordinal on dynamic undefined symbols in symbol table 

This lets `nm -m` print "(from libfoo)" in its output, which is more
accessible than dumping the bind table.

See https://reviews.llvm.org/D57190#2455761 for the somewhat
surprising `AltEntry` that appears in symtab.s.

Differential Revision: https://reviews.llvm.org/D93318
This commit is contained in:
Nico Weber 2020-12-15 13:36:15 -05:00
parent a048e2fa1d
commit 601f0fb846
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/MachO/SyntheticSections.cpp
View File

@ -753,6 +753,10 @@ void SymtabSection::writeTo(uint8_t *buf) const {
nList->n_value = defined->getVA();
}
nList->n_desc |= defined->isWeakDef() ? MachO::N_WEAK_DEF : 0;
} else if (auto *dysym = dyn_cast<DylibSymbol>(entry.sym)) {
uint16_t n_desc = nList->n_desc;
MachO::SET_LIBRARY_ORDINAL(n_desc, dysym->file->ordinal);
nList->n_desc = n_desc;
}
++nList;
}

6
lld/test/MachO/dylink.s
View File

@ -38,6 +38,12 @@
# CHECK-DAG: __DATA __data 0x{{0*}}[[#%x, DATA_ADDR + 8]] pointer 8 libhello _hello_its_me
# CHECK-DAG: __DATA __data 0x{{0*}}[[#%x, DATA_ADDR + 16]] pointer -15 libgoodbye _goodbye_world
# RUN: llvm-nm -m %t/dylink | FileCheck --check-prefix=NM %s
# NM-DAG: _goodbye_world (from libgoodbye)
# NM-DAG: _hello_its_me (from libhello)
# NM-DAG: _hello_world (from libhello)
# RUN: llvm-objdump --macho --all-headers %t/dylink | FileCheck %s \
# RUN: --check-prefix=LOAD --implicit-check-not LC_LOAD_DYLIB
## Check that we don't create duplicate LC_LOAD_DYLIBs.

5
lld/test/MachO/symtab.s
View File

@ -62,7 +62,7 @@
# CHECK-NEXT: Type: Undef (0x0)
# CHECK-NEXT: Section: (0x0)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x0)
# CHECK-NEXT: Flags [ (0x100)
# CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: }
@ -71,7 +71,8 @@
# CHECK-NEXT: Type: Undef (0x0)
# CHECK-NEXT: Section: (0x0)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x0)
# CHECK-NEXT: Flags [ (0x200)
# CHECK-NEXT: AltEntry (0x200)
# CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: }