diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/test/tools/llvm-objdump/X86/macho-dylib.test | 11 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 11 |
2 files changed, 17 insertions, 5 deletions
diff --git a/llvm/test/tools/llvm-objdump/X86/macho-dylib.test b/llvm/test/tools/llvm-objdump/X86/macho-dylib.test index fd6ca80c58b..7454de013d0 100644 --- a/llvm/test/tools/llvm-objdump/X86/macho-dylib.test +++ b/llvm/test/tools/llvm-objdump/X86/macho-dylib.test @@ -1,10 +1,13 @@ -RUN: llvm-objdump -m -dylibs-used %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=USED -RUN: llvm-objdump -m -dylib-id %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=ID -RUN: llvm-objdump -m -dylib-id -no-leading-headers %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=IDNOHEADERS - +RUN: llvm-objdump -m -dylibs-used %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=USED +USED: /usr/lib/foo1.dylib (compatibility version 0.0.0, current version 0.0.0) +USED: /usr/lib/foo2.dylib (compatibility version 0.0.0, current version 0.0.0, weak) +USED: /usr/lib/foo3.dylib (compatibility version 0.0.0, current version 0.0.0, reexport) +USED: /usr/lib/foo4.dylib (compatibility version 0.0.0, current version 0.0.0, lazy) USED: /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1) +RUN: llvm-objdump -m -dylib-id %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=ID ID: /usr/lib/foo.dylib +RUN: llvm-objdump -m -dylib-id -no-leading-headers %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=IDNOHEADERS IDNOHEADERS-NOT: dylibLoadKinds.macho-x86_64: IDNOHEADERS: /usr/lib/foo.dylib diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index b684daacb61..58ff7be4543 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -1206,7 +1206,16 @@ static void PrintDylibs(MachOObjectFile *O, bool JustId) { outs() << " current version " << ((dl.dylib.current_version >> 16) & 0xffff) << "." << ((dl.dylib.current_version >> 8) & 0xff) << "." - << (dl.dylib.current_version & 0xff) << ")\n"; + << (dl.dylib.current_version & 0xff); + if (Load.C.cmd == MachO::LC_LOAD_WEAK_DYLIB) + outs() << ", weak"; + if (Load.C.cmd == MachO::LC_REEXPORT_DYLIB) + outs() << ", reexport"; + if (Load.C.cmd == MachO::LC_LOAD_UPWARD_DYLIB) + outs() << ", upward"; + if (Load.C.cmd == MachO::LC_LAZY_LOAD_DYLIB) + outs() << ", lazy"; + outs() << ")\n"; } } else { outs() << "\tBad offset (" << dl.dylib.name << ") for name of "; |
