[PATCH] D62866: Print dylib load kind (weak, reexport, etc) in llvm-objdump -m -dylibs-used

[Michael Trent via Phabricator via llvm-commits]

mtrent created this revision.
mtrent added reviewers: pete, lhames.
Herald added a subscriber: rupprecht.
Herald added a project: LLVM.

Historically llvm-objdump prints the path to a dylib as well as the
dylib's compatibility version and current version number. This change
extends this information by adding the kind of dylib load: weak,
reexport, etc.

rdar://51383512


Repository:
  rL LLVM

https://reviews.llvm.org/D62866

Files:
  test/tools/llvm-objdump/X86/macho-dylib.test
  tools/llvm-objdump/MachODump.cpp


Index: tools/llvm-objdump/MachODump.cpp
===================================================================
--- tools/llvm-objdump/MachODump.cpp
+++ tools/llvm-objdump/MachODump.cpp
@@ -1206,7 +1206,16 @@
           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 ";
Index: test/tools/llvm-objdump/X86/macho-dylib.test
===================================================================
--- test/tools/llvm-objdump/X86/macho-dylib.test
+++ test/tools/llvm-objdump/X86/macho-dylib.test
@@ -1,10 +1,16 @@
-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
+
+
+


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D62866.202974.patch
Type: text/x-patch
Size: 2459 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190604/136806b6/attachment.bin>