[llvm-objdump] Add an llvm-otool tool

[thakis]

Summary

This implements an LLVM tool that's flag- and output-compatible
with macOS's otool -- except for bugs, but from testing with both
otool and xcrun otool-classic, llvm-otool matches vanilla
otool's behavior very well already. It's not 100% perfect, but
it's a very solid start.

This uses the same approach as llvm-objcopy: llvm-objdump uses
a different OptTable when it's invoked as llvm-otool. This
is possible thanks to D100433.

[MaskRay]

Introducing a new LLVM utility needs an announcement on llvm-dev. Can you start one?
This can potentially attract other parties who are interested in Mach-O tools.

[thakis]

Sure, done: https://lists.llvm.org/pipermail/llvm-dev/2021-April/149925.html

[mstorsjo]

llvm/tools/llvm-objcopy/CopyConfig.cpp

248 ↗

(On Diff #337838)

Stray unrelated change?

[thakis]

llvm/tools/llvm-objcopy/CopyConfig.cpp

248 ↗

(On Diff #337838)

Oh, yes, will remove.

[thakis]

remove accidental unrelated change

[MaskRay]

Mostly looks good, with only few nits, but I hope some Mach-O users can review the functional part.

I'll also warn that MachODump.cpp may lack maintenance... so parties investing in it may need to put in some maintenance energy.

llvm/test/tools/llvm-objdump/MachO/relocations.test

14

Add -NEXT: whenever applicable.

llvm/tools/llvm-objdump/llvm-objdump.cpp

104

I know the messages are not super consistent in the tool, but https://llvm.org/docs/CodingStandards.html#error-and-warning-messages Usually we don't have a period and don't capitalize.

2874

Delete braces around one-line simple statement.

2994

Use Optional<CommonOptTable> and emplace.

3044–3048

Oh, otool doesn't like the TargetRegistry::printRegisteredTargetsForVersion message?

[alexander-shaposhnikov]

Hi! Thanks for working on this, I actually had some similar plans in the past.
One question (I believe that you have already explored it, so I'm asking mostly for the future reference) - did you choose llvm-objdump because it's the closest (from the available options) counterpart to otool featurewise ?
(e.g. closer than llvm-readobj) ?

[thakis]

comments

[thakis]

Thanks!

In D100583#2695291, @alexshap wrote:

Hi! Thanks for working on this, I actually had some similar plans in the past.
One question (I believe that you have already explored it, so I'm asking mostly for the future reference) - did you choose llvm-objdump because it's the closest (from the available options) counterpart to otool featurewise ?
(e.g. closer than llvm-readobj) ?

Several reasons:

1. llvm-objdump is "philosophically" LLVM's user-facing tool, while readobj is more internal tool for use by tests. otool is user-facing.
2. From a more practical perspective, llvm-objdump --macho's output (with the right flags, which I'm using here) is already extremely close to otool's output
3. man otool on macOS refers to a mythological llvm-otool that's based on llvm-objdump, so this patch makes that mythological tool a reality :)

llvm/tools/llvm-objdump/llvm-objdump.cpp

104

We're somewhat consistent about this particular string: % grep -Ri 'Pass @FILE as argument to read options from FILE' llvm/tools :)

(Also, it's just moving around in this change.)

2994

From what I can tell, that doesn't work with subclassing: Optional<CommonOptTable> reserves space for an CommonOptTable, and OtoolOptTable / ObjdumpOptTable might be larger. (Currently they aren't, but OptionalStorage::emplace() also tries to construct a T, in this case a CommonOptTable, and doesn't have anything to construct a subclass)

3044–3048

Probably not? We can decide, I guess :) Mach-O files are intel or arm in practice, so listing all targets isn't super interesting, and vanilla otool's help output is fairly laconic…

[dblaikie]

@aprantl @JDevlieghere (as folks who've implemented other apple-compatible/replacement tools in LLVM) - you folks have any interest in this work one way or another?

[lattner]

This looks reasonable (in approach) to me, but I haven't done a detailed code review.

[jhenderson]

In D100583#2695541, @thakis wrote:

1. llvm-objdump is "philosophically" LLVM's user-facing tool, while readobj is more internal tool for use by tests. otool is user-facing.

FWIW, I don't think this difference is a true difference anymore, at least for the ELF aspects (I can't say one way or the other for other formats) - llvm-readelf is now used in production systems outside of LLVM, and should be a drop-in replacement for GNU readelf, so I think it is just as user-facing as llvm-objdump these days. In fact, when someone asks which tool to use, I usually point them at llvm-readelf over llvm-objdump for various reasons. That being said, I think your other points are perfectly valid.

llvm/tools/llvm-objdump/llvm-objdump.cpp

104

FWIW, I don't think the error/warning message styling applies here, as this is in the help text.

2999–3003

This needs testing. It's been a thing we've broken on more than one occasion in llvm-objcopy too.

[jhenderson]

You should probably also add a file to llvm/docs/CommandGuide for the new tool, along with an appropriate link in the parent page.

[thakis]

add tool-name.test, llvm-otool.rst

[thakis]

In D100583#2698461, @jhenderson wrote:

You should probably also add a file to llvm/docs/CommandGuide for the new tool, along with an appropriate link in the parent page.

Done, thanks!

[thakis]

add to docs index too

[MaskRay]

LG

llvm/docs/CommandGuide/llvm-otool.rst

25

The style for other utilities are capitalized descriptions and trailing periods.

llvm/test/tools/llvm-objdump/MachO/relocations.test

18

It'd be good to change CHECK to VERBOSE and NONVERBOSE to a normal prefix.

llvm/tools/llvm-objdump/llvm-objdump.cpp

2870

Use "negative booleans", which may easily lead to double negations, especially that what have the positive option names now...

[mstorsjo]

I think the new frontend also needs to be added to LLVM_TEST_DEPENDS in llvm/test/CMakeLists.txt, otherwise the symlink isn't created if you e.g. do check-llvm straight from a fresh build dir.

[jhenderson]

llvm/docs/CommandGuide/llvm-otool.rst

18

Probably this should be as inline.

[thakis]

tweak rst file more, add to LLVM_TEST_DEPENDS

[thakis]

In D100583#2700448, @mstorsjo wrote:

I think the new frontend also needs to be added to LLVM_TEST_DEPENDS in llvm/test/CMakeLists.txt, otherwise the symlink isn't created if you e.g. do check-llvm straight from a fresh build dir.

Done.

(All the other comments too.)

llvm/test/tools/llvm-objdump/MachO/relocations.test

18

changed CHECK to VERBOSE. What's a "normal prefix"? But added llvm-objdump --macho -r --non-verbose to the test too to make it clearer where the NONVERBOSE prefix comes from.

llvm/tools/llvm-objdump/llvm-objdump.cpp

2870

Yes, will rename in a follow-up. I think with the cl::opt parsing, it had to be named like this, but now it doesn't have to.

[thakis]

tweak

[jhenderson]

LGTM from my point of view, with one suggestion, but please wait for @MaskRay to be happy too.

llvm/docs/CommandGuide/llvm-otool.rst

109

This should create a hyperlink to the option. Make sure to verify it's working though with a local docs build.

[thakis]

In D100583#2701172, @jhenderson wrote:

LGTM from my point of view, with one suggestion, but please wait for @MaskRay to be happy too.

Thanks! maskray lg'd further up already, so I think I should be good to go :) Committing…

llvm/docs/CommandGuide/llvm-otool.rst

109

Done. Don't have a local docs build set up, will watch the sphinx bot instead.

llvm/docs/CommandGuide/index.rst

.. toctree::
    llvm-diff
    llvm-dis
    llvm-dwarfdump
    llvm-lib
    llvm-libtool-darwin
    llvm-link
    llvm-lipo
    llvm-mca
+   llvm-otool
    llvm-profdata
    llvm-readobj
    llvm-stress
    llvm-symbolizer
    opt
 
 GNU binutils replacements
 ~~~~~~~~~~~~~~~~~~~~~~~~~

llvm/docs/CommandGuide/llvm-objdump.rst

 BUGS
 ----
 
 To report bugs, please visit <https://bugs.llvm.org/>.
 
 SEE ALSO
 --------
 
-:manpage:`llvm-nm(1)`, :manpage:`llvm-readelf(1)`, :manpage:`llvm-readobj(1)`
+:manpage:`llvm-nm(1)`, :manpage:`llvm-otool(1)`, :manpage:`llvm-readelf(1)`,
+:manpage:`llvm-readobj(1)`

llvm/docs/CommandGuide/llvm-otool.rst

+llvm-otool - Mach-O dumping tool
+================================
+
+.. program:: llvm-otool
+
+SYNOPSIS
+--------
+
+:program:`llvm-otool` [*option...*] *[file...]*
+
+DESCRIPTION
+-----------
+
+:program:`llvm-otool` is a tool for dumping Mach-O files.
+
+It attempts to be command-line-compatible and output-compatible with macOS's
+:program:`otool`.
+
+OPTIONS
+-------
+
+.. option:: -arch <value>
+
+ Select slice of universal Mach-O file.
+
+.. option:: -C
+
+ Print linker optimization hints.
+
+.. option:: -D
+
+ Print shared library id.
+
+.. option:: -d
+
+ Print data section.
+
+.. option:: -f
+
+ Print universal headers.
+
+.. option:: -G
+
+ Print data-in-code table.
+
+.. option:: --help-hidden
+
+ Print help for hidden flags.
+
+.. option:: --help
+
+ Print help.
+
+.. option:: -h
+
+ Print mach header.
+
+.. option:: -I
+
+ Print indirect symbol table.
+
+.. option:: -j
+
+ Print opcode bytes.
+
+.. option:: -L
+
+ Print used shared libraries.
+
+.. option:: -l
+
+ Print load commnads.
+
+.. option:: -mcpu=<value>
+
+ Select cpu for disassembly.
+
+.. option:: -o
+
+ Print Objective-C segment.
+
+.. option:: -P
+
+ Print __TEXT,__info_plist section as strings.
+
+.. option:: -p <function name>
+
+ Start disassembly at <function name>.
+
+.. option:: -r
+
+ Print relocation entries.
+
+.. option:: -s <segname> <sectname>
+
+ Print contents of section.
+
+.. option:: -t
+
+ Print text section.
+
+.. option:: --version
+
+ Print version.
+
+.. option:: -V
+
+ Symbolize disassembled operands (implies :option:`-v`).
+
+.. option:: -v
+
+ Verbose output / disassemble when printing text sections.
+
+.. option:: -X
+
+ Omit leading addresses or headers.
+
+.. option:: -x
+
+ Print all text sections.
+
+.. option:: @<FILE>
+
+ Read command-line options and commands from response file `<FILE>`.
+
+EXIT STATUS
+-----------
+
+:program:`llvm-otool` exits with a non-zero exit code if there is an error.
+Otherwise, it exits with code 0.
+
+BUGS
+----
+
+To report bugs, please visit <https://bugs.llvm.org/>.
+
+SEE ALSO
+--------
+
+:manpage:`llvm-nm(1)`, :manpage:`llvm-objdump(1)`

llvm/test/CMakeLists.txt

set(LLVM_TEST_DEPENDS
           llvm-ml
           llvm-modextract
           llvm-mt
           llvm-nm
           llvm-objcopy
           llvm-objdump
           llvm-opt-fuzzer
           llvm-opt-report
+          llvm-otool
           llvm-pdbutil
           llvm-profdata
           llvm-profgen
           llvm-ranlib
           llvm-rc
           llvm-readobj
           llvm-readelf
           llvm-reduce

llvm/test/lit.cfg.py

 tools.extend([
     'dsymutil', 'lli', 'lli-child-target', 'llvm-ar', 'llvm-as',
     'llvm-addr2line', 'llvm-bcanalyzer', 'llvm-bitcode-strip', 'llvm-config',
     'llvm-cov', 'llvm-cxxdump', 'llvm-cvtres', 'llvm-diff', 'llvm-dis',
     'llvm-dwarfdump', 'llvm-dlltool', 'llvm-exegesis', 'llvm-extract',
     'llvm-isel-fuzzer', 'llvm-ifs',
     'llvm-install-name-tool', 'llvm-jitlink', 'llvm-opt-fuzzer', 'llvm-lib',
     'llvm-link', 'llvm-lto', 'llvm-lto2', 'llvm-mc', 'llvm-mca',
-    'llvm-modextract', 'llvm-nm', 'llvm-objcopy', 'llvm-objdump',
+    'llvm-modextract', 'llvm-nm', 'llvm-objcopy', 'llvm-objdump', 'llvm-otool',
     'llvm-pdbutil', 'llvm-profdata', 'llvm-ranlib', 'llvm-rc', 'llvm-readelf',
     'llvm-readobj', 'llvm-rtdyld', 'llvm-size', 'llvm-split', 'llvm-strings',
     'llvm-strip', 'llvm-tblgen', 'llvm-undname', 'llvm-c-test', 'llvm-cxxfilt',
     'llvm-xray', 'yaml2obj', 'obj2yaml', 'yaml-bench', 'verify-uselistorder',
     'bugpoint', 'llc', 'llvm-symbolizer', 'opt', 'sancov', 'sanstats'])
 
 # The following tools are optional
 tools.extend([

llvm/test/tools/llvm-objdump/MachO/AArch64/macho-link-opt-hints.test

 RUN: llvm-objdump -m --link-opt-hints %p/Inputs/link-opt-hints.macho-aarch64 | FileCheck %s
+RUN: llvm-otool -C %p/Inputs/link-opt-hints.macho-aarch64 | FileCheck %s
 
 CHECK: Linker optimiztion hints (8 total bytes)
 CHECK:     identifier 8 AdrpLdrGot
 CHECK:     narguments 2
 CHECK:  value 0x18
 CHECK:  value 0x1c
 CHECK:     identifier 7 AdrpAdd
 CHECK:     narguments 2
 CHECK:  value 0x6c
 CHECK:  value 0x70

llvm/test/tools/llvm-objdump/MachO/ARM/data-in-code.test

 RUN: llvm-objdump -m --data-in-code %p/Inputs/data-in-code.macho-arm | FileCheck %s
+RUN: llvm-otool -Gv %p/Inputs/data-in-code.macho-arm | FileCheck %s
 RUN: llvm-objdump -m --data-in-code --non-verbose %p/Inputs/data-in-code.macho-arm | FileCheck %s --check-prefix=NON_VERBOSE
+RUN: llvm-otool -G %p/Inputs/data-in-code.macho-arm | FileCheck %s --check-prefix=NON_VERBOSE
 
 CHECK: Data in code table (4 entries)
 CHECK: offset     length kind
 CHECK: 0x00000000      4 DATA
 CHECK: 0x00000004      4 JUMP_TABLE32
 CHECK: 0x00000008      2 JUMP_TABLE16
 CHECK: 0x0000000a      1 JUMP_TABLE8
 
 NON_VERBOSE: Data in code table (4 entries)
 NON_VERBOSE: offset     length kind
 NON_VERBOSE: 0x00000000      4 0x0001
 NON_VERBOSE: 0x00000004      4 0x0004
 NON_VERBOSE: 0x00000008      2 0x0003
 NON_VERBOSE: 0x0000000a      1 0x0002

llvm/test/tools/llvm-objdump/MachO/ARM/mcpu-arm.test

-@ RUN: llvm-mc < %s -triple thumbv7-apple-darwin -mcpu=cortex-a7 -filetype=obj | llvm-objdump --triple thumbv7-apple-darwin10 -m -d --mcpu=cortex-a7 - | FileCheck %s
+@ RUN: llvm-mc %s -triple thumbv7-apple-darwin -mcpu=cortex-a7 -filetype=obj -o %t.o
+@ RUN: llvm-objdump --triple thumbv7-apple-darwin10 -m -d --mcpu=cortex-a7 %t.o | FileCheck %s
+@ RUN: llvm-otool -tv -mcpu=cortex-a7 %t.o | FileCheck %s
 
 .thumb
 .thumb_func _t
 _t:
 sdiv r1, r2, r3
 udiv r1, r2, r3
 
 @ CHECK: 92 fb f3 f1 sdiv r1, r2, r3
 @ CHECK: b2 fb f3 f1 udiv r1, r2, r3

llvm/test/tools/llvm-objdump/MachO/data-in-code.ll

 ; RUN: llc --mtriple x86_64-apple-darwin -filetype=obj -O0 %s -o %t.o
 ; RUN: llvm-objdump --macho -d --no-show-raw-insn %t.o | FileCheck %s
+; RUN: llvm-otool -tv %t.o | FileCheck %s
 
 ; CHECK: .long {{[0-9]+}} @ KIND_JUMP_TABLE32
 ; CHECK: .long {{[0-9]+}} @ KIND_JUMP_TABLE32
 ; CHECK: .long {{[0-9]+}} @ KIND_JUMP_TABLE32
 ; CHECK: .long {{[0-9]+}} @ KIND_JUMP_TABLE32
 ; CHECK-NOT: invalid instruction encoding
 ; CHECK-NOT: <unknown>
 

llvm/test/tools/llvm-objdump/MachO/dis-no-leading-addr.test

-# RUN: llvm-objdump --macho -d %p/Inputs/hello.obj.macho-x86_64 --no-show-raw-insn --print-imm-hex --no-leading-addr | FileCheck %s
+# RUN: llvm-objdump --macho -d %p/Inputs/hello.obj.macho-x86_64 --no-show-raw-insn --print-imm-hex --no-leading-addr | FileCheck --check-prefixes=CHECK,HEAD %s
+# RUN: llvm-otool -tVX %p/Inputs/hello.obj.macho-x86_64 | FileCheck --implicit-check-not=section %s
 
-# CHECK: (__TEXT,__text) section
+# HEAD: (__TEXT,__text) section
 # CHECK: _main:
 # CHECK:  pushq %rbp
 # CHECK:  movq  %rsp, %rbp
 # CHECK:  subq  $0x20, %rsp
 # CHECK:  leaq  L_.str(%rip), %rax ## literal pool for: "Hello world\n"
 # CHECK:  movl  $_main, -0x4(%rbp)
 # CHECK:  movl  %edi, -0x8(%rbp)
 # CHECK:  movq  %rsi, -0x10(%rbp)

llvm/test/tools/llvm-objdump/MachO/dis-symname.test

 # RUN: llvm-objdump --macho -d %p/Inputs/exeThread.macho-x86_64 --dis-symname start --no-show-raw-insn --full-leading-addr --print-imm-hex | FileCheck %s
+# RUN: llvm-otool -tV %p/Inputs/exeThread.macho-x86_64 -p start | FileCheck %s
 
 # CHECK: (__TEXT,__text) section
 # CHECK: start:
 # CHECK: 0000000100000d00 pushq $0x0
 # CHECK: 0000000100000d02 movq  %rsp, %rbp
 # CHECK: 0000000100000d05 andq  $-0x10, %rsp
 # CHECK: 0000000100000d09 movq  0x8(%rbp), %rdi
 # CHECK: 0000000100000d0d leaq  0x10(%rbp), %rsi
 # CHECK: 0000000100000d11 movl  %edi, %edx
 # CHECK: 0000000100000d13 addl  $0x1, %edx
 # CHECK: 0000000100000d16 shll  $0x3, %edx
 # CHECK: 0000000100000d19 addq  %rsi, %rdx
 # CHECK: 0000000100000d1c callq __start
 # CHECK: 0000000100000d21 hlt
 
 # CHECK-NOT: __start:
 # CHECK-NOT: 0000000100000d22
 # CHECK-NOT: _main:
 
-# not RUN: llvm-objdump --macho -d %p/Inputs/exeThread.macho-x86_64 --dis-symname _environ 2>&1 | FileCheck --check-prefix BAD-SYMAME-1 %s
+# RUN: llvm-objdump --macho -d %p/Inputs/exeThread.macho-x86_64 --dis-symname _environ 2>&1 | FileCheck --check-prefix BAD-SYMAME-1 %s
 BAD-SYMAME-1: -dis-symname: _environ not in the section
 
-# not RUN: llvm-objdump --macho -d %p/Inputs/exeThread.macho-x86_64 --dis-symname __mh_execute_header 2>&1 | FileCheck --check-prefix BAD-SYMAME-2 %s
+# RUN: llvm-objdump --macho -d %p/Inputs/exeThread.macho-x86_64 --dis-symname __mh_execute_header 2>&1 | FileCheck --check-prefix BAD-SYMAME-2 %s
 BAD-SYMAME-2: -dis-symname: __mh_execute_header not in any section

llvm/test/tools/llvm-objdump/MachO/dylib.test

 RUN: llvm-objdump --macho --dylibs-used %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s --check-prefix=USED
+RUN: llvm-otool -L %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 --macho --dylib-id %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s --check-prefix=ID
+RUN: llvm-otool -D %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s --check-prefix=ID
 ID: /usr/lib/foo.dylib
 
 RUN: llvm-objdump --macho --dylib-id --no-leading-headers %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s --check-prefix=IDNOHEADERS
+RUN: llvm-otool -DX %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s --check-prefix=IDNOHEADERS
 IDNOHEADERS-NOT: dylibLoadKinds.macho-x86_64:
 IDNOHEADERS: /usr/lib/foo.dylib

llvm/test/tools/llvm-objdump/MachO/indirect-symbols.test

 RUN: llvm-objdump --macho --indirect-symbols %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s
+RUN: llvm-otool -Iv %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s
 RUN: llvm-objdump --macho --indirect-symbols --non-verbose %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=NON_VERBOSE
+RUN: llvm-otool -I %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=NON_VERBOSE
 
 CHECK: Indirect symbols for (__TEXT,__stubs) 1 entries
 CHECK: address            index name
 CHECK: 0x0000000100000f6c     2 _printf
 CHECK: Indirect symbols for (__DATA,__nl_symbol_ptr) 2 entries
 CHECK: address            index name
 CHECK: 0x0000000100001000     3 dyld_stub_binder
 CHECK: 0x0000000100001008 ABSOLUTE

llvm/test/tools/llvm-objdump/MachO/info-plist.test

-# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --info-plist - | FileCheck %s
-# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --info-plist --no-leading-headers - | FileCheck --check-prefix=NOHEADER %s
+# RUN: llvm-mc %s --triple x86_64-apple-darwin -filetype=obj -o %t.o
+# RUN: llvm-objdump --macho --info-plist %t.o | FileCheck %s
+# RUN: llvm-otool -P %t.o | FileCheck %s
+# RUN: llvm-objdump --macho --info-plist --no-leading-headers %t.o | FileCheck --check-prefix=NOHEADER %s
+# RUN: llvm-otool -PX %t.o | FileCheck --check-prefix=NOHEADER %s
 
 .section __TEXT, __info_plist
 .asciz "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 
 # CHECK: Contents of (__TEXT,__info_plist) section
 # CHECK: <?xml version="1.0" encoding="UTF-8"?>
 
 # NOHEADER-NOT: Contents of (__TEXT,__info_plist) section
 # NOHEADER: <?xml version="1.0" encoding="UTF-8"?>

llvm/test/tools/llvm-objdump/MachO/macho-objc-meta-data.test

 # RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.64bit.exe.macho-x86_64 | FileCheck %s --check-prefix=OBJC2_64BIT_EXE
+# RUN: llvm-otool -o %p/Inputs/Objc2.64bit.exe.macho-x86_64 | FileCheck %s --check-prefix=OBJC2_64BIT_EXE
 # RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.64bit.obj.macho-x86_64 | FileCheck %s --check-prefix=OBJC2_64BIT_OBJ
 # RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.32bit.exe.macho-i386 | FileCheck %s --check-prefix=OBJC2_32BIT_EXE
 # RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.32bit.obj.macho-i386 | FileCheck %s --check-prefix=OBJC2_32BIT_OBJ
 # RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc1.32bit.exe.macho-i386 | FileCheck %s --check-prefix=OBJC1_32BIT_EXE
 # RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc1.32bit.obj.macho-i386 | FileCheck %s --check-prefix=OBJC1_32BIT_OBJ
 # RUN: llvm-objdump --macho --section __OBJC,__protocol %p/Inputs/Objc1.32bit.exe.macho-i386 | FileCheck %s --check-prefix=PROTOCOL
 # RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.64bit.obj.dylib-x86_64 | FileCheck %s --check-prefix=OBJC2_64BIT_DYLIB
 

llvm/test/tools/llvm-objdump/MachO/private-headers.test

 // RUN: llvm-objdump -p %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+// RUN: llvm-otool -lv %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
 // RUN: llvm-objdump -p %p/Inputs/hello.exe.macho-x86_64 \
 // RUN:     | FileCheck %s -check-prefix=EXE
 // RUN: llvm-objdump -p %p/Inputs/dylibLoadKinds.macho-x86_64 \
 // RUN:     | FileCheck %s -check-prefix=LOAD
 // RUN: llvm-objdump -p %p/Inputs/linkerOption.macho-x86_64 \
 // RUN:     | FileCheck %s -check-prefix=LD_OPT
 // RUN: llvm-objdump -p %p/Inputs/dylibSubFramework.macho-x86_64 \
 // RUN:     | FileCheck %s -check-prefix=SUB_FRAME

llvm/test/tools/llvm-objdump/MachO/relocations.test

-RUN: llvm-objdump --macho -r %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho -r %p/Inputs/hello.obj.macho-x86_64 | \
+RUN:     FileCheck --check-prefix=VERBOSE %s
+RUN: llvm-otool -rv %p/Inputs/hello.obj.macho-x86_64 | \
+RUN:     FileCheck --check-prefix=VERBOSE %s
+RUN: llvm-objdump --macho -r --non-verbose %p/Inputs/hello.obj.macho-x86_64 | \
+RUN:     FileCheck --check-prefix=NONVERBOSE %s
+RUN: llvm-otool -r %p/Inputs/hello.obj.macho-x86_64 | \
+RUN:     FileCheck --check-prefix=NONVERBOSE %s
 
-CHECK: Relocation information (__TEXT,__text) 2 entries
-CHECK: address  pcrel length extern type    scattered symbolnum/value
-CHECK: 00000027 True  long   True   BRANCH  False     _printf
-CHECK: 0000000b True  long   True   SIGNED  False     L_.str
-CHECK: Relocation information (__LD,__compact_unwind) 1 entries
-CHECK: address  pcrel length extern type    scattered symbolnum/value
-CHECK: 00000000 False quad   False  UNSIGND False     1 (__TEXT,__text)
+VERBOSE:      Relocation information (__TEXT,__text) 2 entries
+VERBOSE-NEXT: address  pcrel length extern type    scattered symbolnum/value
+VERBOSE-NEXT: 00000027 True  long   True   BRANCH  False     _printf
+VERBOSE-NEXT: 0000000b True  long   True   SIGNED  False     L_.str
+VERBOSE-NEXT: Relocation information (__LD,__compact_unwind) 1 entries
+VERBOSE-NEXT: address  pcrel length extern type    scattered symbolnum/value
+VERBOSE-NEXT: 00000000 False quad   False  UNSIGND False     1 (__TEXT,__text)
+
+NONVERBOSE:      Relocation information (__TEXT,__text) 2 entries
+NONVERBOSE-NEXT: address  pcrel length extern type    scattered symbolnum/value
+NONVERBOSE-NEXT: 00000027 1     2      1      2       0         4
+NONVERBOSE-NEXT: 0000000b 1     2      1      1       0         0
+NONVERBOSE-NEXT: Relocation information (__LD,__compact_unwind) 1 entries
+NONVERBOSE-NEXT: address  pcrel length extern type    scattered symbolnum/value
+NONVERBOSE-NEXT: 00000000 0     3      0      0       0         1

llvm/test/tools/llvm-objdump/MachO/sections.test

 # RUN: llvm-objdump --macho --section=__data %p/Inputs/bind2.macho-x86_64 | FileCheck %s
+# RUN: llvm-otool -d %p/Inputs/bind2.macho-x86_64 | FileCheck %s
 
 # CHECK: bind2.macho-x86_64:
 
 # RUN: llvm-objdump --macho --section=__data %p/Inputs/section.macho-armv7 | FileCheck --check-prefix CHECK-ADDR %s
 
 #  CHECK-ADDR: 00000004 00000001 00000002
 
 # RUN: llvm-objdump --macho --section=__const %p/Inputs/section.macho-armv7 | FileCheck --check-prefix CHECK-BYTES %s
 
 #  CHECK-BYTES: 0000000c  00000003 04 05 06

llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test

 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=OBJ
+// RUN: llvm-otool -tV %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=OBJ
 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=EXE
+// RUN: llvm-otool -tV %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=EXE
 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/ObjC.obj.macho-x86_64 | FileCheck %s --check-prefix=ObjC-OBJ
 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/ObjC.exe.macho-x86_64 | FileCheck %s --check-prefix=ObjC-EXE
 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello_cpp.exe.macho-x86_64 | FileCheck %s --check-prefix=CXX-EXE
 
 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.obj.macho-i386 | FileCheck %s --check-prefix=i386-OBJ
 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.exe.macho-i386 | FileCheck %s --check-prefix=i386-EXE
 
 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex --no-symbolic-operands %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=NO-SYM-OPS-OBJ
+// RUN: llvm-otool -tv %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=NO-SYM-OPS-OBJ
 // RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex --no-symbolic-operands %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=NO-SYM-OPS-EXE
+// RUN: llvm-otool -tv %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=NO-SYM-OPS-EXE
 
 OBJ: 0000000000000008 leaq  L_.str(%rip), %rax      ## literal pool for: "Hello world\n"
 OBJ: 0000000000000026 callq _printf
 
 EXE: 0000000100000f38 leaq  0x4f(%rip), %rax        ## literal pool for: "Hello world\n"
 EXE: 0000000100000f56 callq 0x100000f6c             ## symbol stub for: _printf
 
 ObjC-OBJ: 0000000000000008  leaq  0xb1(%rip), %rax        ## Objc cfstring ref: @"The current date and time is: %@"

llvm/test/tools/llvm-objdump/MachO/universal-arm64.test

 ## This test checks that the CPUTypes are printed correctly for the subtypes of
 ## ARM64.
 
 # RUN: yaml2obj %s -o %tarm.o
 # RUN: llvm-objdump %tarm.o --universal-headers --macho | \
 # RUN:   FileCheck %s --match-full-lines
+# RUN: llvm-otool -fv %tarm.o | FileCheck %s --match-full-lines
+# RUN: llvm-objdump %tarm.o --universal-headers --macho --non-verbose | \
+# RUN:   FileCheck %s --match-full-lines --check-prefix=NONVERBOSE
+# RUN: llvm-otool -f %tarm.o | FileCheck %s --match-full-lines --check-prefix=NONVERBOSE
 
 # CHECK:      Fat headers
 # CHECK-NEXT: fat_magic FAT_MAGIC
 # CHECK-NEXT: nfat_arch 3
 # CHECK-NEXT: architecture arm64
 # CHECK-NEXT:     cputype CPU_TYPE_ARM64
 # CHECK-NEXT:     cpusubtype CPU_SUBTYPE_ARM64_ALL
 # CHECK-NEXT:     capabilities 0x0

 # CHECK-NEXT:     cputype CPU_TYPE_ARM64
 # CHECK-NEXT:     cpusubtype CPU_SUBTYPE_ARM64E
 # CHECK-NEXT:     capabilities 0x0
 # CHECK-NEXT:     offset 28672
 # CHECK-NEXT:     size 384
 # CHECK-NEXT:     align 2^12 (4096)
 # CHECK-NOT:{{.}}
 
+# NONVERBOSE:      Fat headers
+# NONVERBOSE-NEXT: fat_magic 0xcafebabe
+# NONVERBOSE-NEXT: nfat_arch 3
+# NONVERBOSE-NEXT: architecture 0
+# NONVERBOSE-NEXT:     cputype 16777228
+# NONVERBOSE-NEXT:     cpusubtype 0
+# NONVERBOSE-NEXT:     capabilities 0x0
+# NONVERBOSE-NEXT:     offset 4096
+# NONVERBOSE-NEXT:     size 352
+# NONVERBOSE-NEXT:     align 2^12 (4096)
+# NONVERBOSE-NEXT: architecture 1
+# NONVERBOSE-NEXT:     cputype 16777228
+# NONVERBOSE-NEXT:     cpusubtype 1
+# NONVERBOSE-NEXT:     capabilities 0x0
+# NONVERBOSE-NEXT:     offset 16384
+# NONVERBOSE-NEXT:     size 384
+# NONVERBOSE-NEXT:     align 2^14 (16384)
+# NONVERBOSE-NEXT: architecture 2
+# NONVERBOSE-NEXT:     cputype 16777228
+# NONVERBOSE-NEXT:     cpusubtype 2
+# NONVERBOSE-NEXT:     capabilities 0x0
+# NONVERBOSE-NEXT:     offset 28672
+# NONVERBOSE-NEXT:     size 384
+# NONVERBOSE-NEXT:     align 2^12 (4096)
+# NONVERBOSE-NOT:{{.}}
+
+
 --- !fat-mach-o
 FatHeader:
   magic:           0xCAFEBABE
   nfat_arch:       3
 FatArchs:
   - cputype:         0x0100000C
     cpusubtype:      0x00000000
     offset:          0x0000000000001000

llvm/test/tools/llvm-objdump/tool-name.test

+## Don't make symlinks on Windows.
+# UNSUPPORTED: system-windows
+
+# RUN: rm -rf %t
+# RUN: mkdir %t
+
+# RUN: ln -s llvm-objdump %t/llvm-otool-11.exe
+# RUN: ln -s llvm-objdump %t/powerpc64-unknown-freebsd13-objdump
+
+# RUN: %t/llvm-otool-11.exe --help | FileCheck --check-prefix=OTOOL %s
+# RUN: %t/powerpc64-unknown-freebsd13-objdump --help | \
+# RUN:     FileCheck --check-prefix=OBJDUMP %s
+
+# OBJDUMP: OVERVIEW: llvm object file dumper
+# OTOOL: OVERVIEW: Mach-O object file displaying tool

llvm/tools/llvm-objdump/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   Support
   Symbolize
   )
 
 set(LLVM_TARGET_DEFINITIONS ObjdumpOpts.td)
 tablegen(LLVM ObjdumpOpts.inc -gen-opt-parser-defs)
 add_public_tablegen_target(ObjdumpOptsTableGen)
 
+set(LLVM_TARGET_DEFINITIONS OtoolOpts.td)
+tablegen(LLVM OtoolOpts.inc -gen-opt-parser-defs)
+add_public_tablegen_target(OtoolOptsTableGen)
+
 add_llvm_tool(llvm-objdump
   llvm-objdump.cpp
   COFFDump.cpp
   ELFDump.cpp
   MachODump.cpp
   WasmDump.cpp
   XCOFFDump.cpp
   DEPENDS
   ObjdumpOptsTableGen
+  OtoolOptsTableGen
   )
 
 if(HAVE_LIBXAR)
   target_link_libraries(llvm-objdump PRIVATE ${XAR_LIB})
 endif()
 
+add_llvm_tool_symlink(llvm-otool llvm-objdump)
+
 if(LLVM_INSTALL_BINUTILS_SYMLINKS)
   add_llvm_tool_symlink(objdump llvm-objdump)
 endif()

llvm/tools/llvm-objdump/MachODump.h

 // MachO specific options
 extern cl::OptionCategory MachOCat;
 extern bool Bind;
 extern bool DataInCode;
 extern bool DylibsUsed;
 extern bool DylibId;
 extern bool ExportsTrie;
 extern bool FirstPrivateHeader;
+extern bool FullLeadingAddr;
 extern bool FunctionStarts;
 extern bool IndirectSymbols;
 extern bool InfoPlist;
 extern bool LazyBind;
 extern bool LinkOptHints;
+extern bool NoLeadingHeaders;
+extern bool NoSymbolicOperands;
+extern bool NonVerbose;
 extern bool ObjcMetaData;
+extern std::string DisSymName;
 extern bool Rebase;
 extern bool UniversalHeaders;
 extern bool WeakBind;
 
 Error getMachORelocationValueString(const object::MachOObjectFile *Obj,
                                     const object::RelocationRef &RelRef,
                                     llvm::SmallVectorImpl<char> &Result);
 

llvm/tools/llvm-objdump/MachODump.cpp

 bool objdump::FirstPrivateHeader;
 bool objdump::ExportsTrie;
 bool objdump::Rebase;
 bool objdump::Bind;
 bool objdump::LazyBind;
 bool objdump::WeakBind;
 static bool UseDbg;
 static std::string DSYMFile;
-static bool FullLeadingAddr;
-static bool NoLeadingHeaders;
+bool objdump::FullLeadingAddr;
+bool objdump::NoLeadingHeaders;
 bool objdump::UniversalHeaders;
 static bool ArchiveMemberOffsets;
 bool objdump::IndirectSymbols;
 bool objdump::DataInCode;
 bool objdump::FunctionStarts;
 bool objdump::LinkOptHints;
 bool objdump::InfoPlist;
 bool objdump::DylibsUsed;
 bool objdump::DylibId;
-static bool NonVerbose;
+bool objdump::NonVerbose;
 bool objdump::ObjcMetaData;
-static std::string DisSymName;
-static bool NoSymbolicOperands;
+std::string objdump::DisSymName;
+bool objdump::NoSymbolicOperands;
 static std::vector<std::string> ArchFlags;
 
 static bool ArchAll = false;
 static std::string ThumbTripleName;
 
 void objdump::parseMachOOptions(const llvm::opt::InputArgList &InputArgs) {
   FirstPrivateHeader = InputArgs.hasArg(OBJDUMP_private_header);
   ExportsTrie = InputArgs.hasArg(OBJDUMP_exports_trie);

llvm/tools/llvm-objdump/ObjdumpOptID.h

 #ifndef LLVM_TOOLS_LLVM_OBJDUMP_OBJDUMP_OPT_ID_H
 #define LLVM_TOOLS_LLVM_OBJDUMP_OBJDUMP_OPT_ID_H
 
-enum ID {
+enum ObjdumpOptID {
   OBJDUMP_INVALID = 0, // This is not an option ID.
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
                HELPTEXT, METAVAR, VALUES)                                      \
   OBJDUMP_##ID,
 #include "ObjdumpOpts.inc"
 #undef OPTION
 };
 
 #endif // LLVM_TOOLS_LLVM_OBJDUMP_OBJDUMP_OPT_ID_H

llvm/tools/llvm-objdump/OtoolOpts.td

+include "llvm/Option/OptParser.td"
+
+def help : Flag<["--"], "help">, HelpText<"print help">;
+def help_hidden : Flag<["--"], "help-hidden">,
+  HelpText<"print help for hidden flags">;
+
+def arch : Separate<["-"], "arch">,
+  HelpText<"select slice of universal Mach-O file">;
+def C : Flag<["-"], "C">, HelpText<"print linker optimization hints">;
+def d : Flag<["-"], "d">, HelpText<"print data section">;
+def D : Flag<["-"], "D">, HelpText<"print shared library id">;
+def f : Flag<["-"], "f">, HelpText<"print universal headers">;
+def G : Flag<["-"], "G">, HelpText<"print data-in-code table">;
+def h : Flag<["-"], "h">, HelpText<"print mach header">;
+def I : Flag<["-"], "I">, HelpText<"print indirect symbol table">;
+def j : Flag<["-"], "j">, HelpText<"print opcode bytes">;
+def l : Flag<["-"], "l">, HelpText<"print load commnads">;
+def L : Flag<["-"], "L">, HelpText<"print used shared libraries">;
+def mcpu_EQ : Joined<["-"], "mcpu=">, HelpText<"select cpu for disassembly">;
+def o : Flag<["-"], "o">, HelpText<"print Objective-C segment">;
+def p : Separate<["-"], "p">,
+  MetaVarName<"<function name>">,
+  HelpText<"start disassembly at <function name>">;
+def P : Flag<["-"], "P">, HelpText<"print __TEXT,__info_plist section as strings">;
+def : Flag<["-"], "q">, Flags<[HelpHidden]>,
+  HelpText<"use LLVM's disassembler (default)">;
+def r : Flag<["-"], "r">, HelpText<"print relocation entries">;
+def s : MultiArg<["-"], "s", 2>,
+  MetaVarName<"<segname> <sectname>">,
+  HelpText<"print contents of section">;
+def t : Flag<["-"], "t">, HelpText<"print text section">;
+def version : Flag<["--"], "version">, HelpText<"print version">;
+def v : Flag<["-"], "v">,
+  HelpText<"verbose output / disassemble when printing text sections">;
+def V : Flag<["-"], "V">,
+  HelpText<"symbolize disassembled operands (implies -v)">;
+def x : Flag<["-"], "x">, HelpText<"print all text sections">;
+def X : Flag<["-"], "X">, HelpText<"omit leading addresses or headers">;
+
+// Not (yet?) implemented:
+// def a : Flag<["-"], "a">, HelpText<"print archive header">;
+// -c print argument strings of a core file
+// -m don't use archive(member) syntax
+// -dyld_info
+// -dyld_opcodes
+// -chained_fixups
+// -addr_slide=arg
+// -function_offsets
+
+
+// Obsolete and unsupported:
+def grp_obsolete : OptionGroup<"kind">,
+  HelpText<"Obsolete and unsupported flags">;
+
+def : Flag<["-"], "B">, Flags<[HelpHidden]>, Group<grp_obsolete>,
+  HelpText<"force Thum disassembly (ARM 32-bit objects only)">;
+def : Flag<["-"], "H">, Flags<[HelpHidden]>, Group<grp_obsolete>,
+  HelpText<"print two-level hints table">;
+def : Flag<["-"], "M">, Flags<[HelpHidden]>, Group<grp_obsolete>,
+  HelpText<"print module table of shared library">;
+def : Flag<["-"], "R">, Flags<[HelpHidden]>, Group<grp_obsolete>,
+  HelpText<"print reference table of shared library">;
+def : Flag<["-"], "S">, Flags<[HelpHidden]>, Group<grp_obsolete>,
+  HelpText<"print table of contents of library">;
+def : Flag<["-"], "T">, Flags<[HelpHidden]>, Group<grp_obsolete>,
+  HelpText<"print table of contents of shared library">;
+def : Flag<["-"], "Q">, Flags<[HelpHidden]>, Group<grp_obsolete>,
+  HelpText<"llvm-otool cannot use otool-classic's disassembler">;

llvm/tools/llvm-objdump/llvm-objdump.cpp

 
 using namespace llvm;
 using namespace llvm::object;
 using namespace llvm::objdump;
 using namespace llvm::opt;
 
 namespace {
 
-#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
+class CommonOptTable : public opt::OptTable {
+public:
+  CommonOptTable(ArrayRef<Info> OptionInfos, const char *Usage,
+                 const char *Description)
+      : OptTable(OptionInfos), Usage(Usage), Description(Description) {
+    setGroupedShortOptions(true);
+  }
+
+  void printHelp(StringRef Argv0, bool ShowHidden = false) const {
+    Argv0 = sys::path::filename(Argv0);
+    PrintHelp(outs(), (Argv0 + Usage).str().c_str(), Description, ShowHidden,
+              ShowHidden);
+    // TODO Replace this with OptTable API once it adds extrahelp support.
+    outs() << "\nPass @FILE as argument to read options from FILE.\n";
+  }
+
+private:
+  const char *Usage;
+  const char *Description;
+};
+
+// ObjdumpOptID is in ObjdumpOptID.h
+
+#define PREFIX(NAME, VALUE) const char *const OBJDUMP_##NAME[] = VALUE;
 #include "ObjdumpOpts.inc"
 #undef PREFIX
 
 static constexpr opt::OptTable::Info ObjdumpInfoTable[] = {
+#define OBJDUMP_nullptr nullptr
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
                HELPTEXT, METAVAR, VALUES)                                      \
-  {PREFIX,          NAME,         HELPTEXT,                                    \
-   METAVAR,         OBJDUMP_##ID, opt::Option::KIND##Class,                    \
-   PARAM,           FLAGS,        OBJDUMP_##GROUP,                             \
-   OBJDUMP_##ALIAS, ALIASARGS,    VALUES},
+  {OBJDUMP_##PREFIX, NAME,         HELPTEXT,                                   \
+   METAVAR,          OBJDUMP_##ID, opt::Option::KIND##Class,                   \
+   PARAM,            FLAGS,        OBJDUMP_##GROUP,                            \
+   OBJDUMP_##ALIAS,  ALIASARGS,    VALUES},
 #include "ObjdumpOpts.inc"
 #undef OPTION
+#undef OBJDUMP_nullptr
 };
 
-class ObjdumpOptTable : public opt::OptTable {
+class ObjdumpOptTable : public CommonOptTable {
 public:
-  ObjdumpOptTable() : OptTable(ObjdumpInfoTable) {}
+  ObjdumpOptTable()
+      : CommonOptTable(ObjdumpInfoTable, " [options] <input object files>",
+                       "llvm object file dumper") {}
+};
 
-  void PrintObjdumpHelp(StringRef Argv0, bool ShowHidden = false) const {
-    Argv0 = sys::path::filename(Argv0);
-    PrintHelp(outs(), (Argv0 + " [options] <input object files>").str().c_str(),
-              "llvm object file dumper", ShowHidden, ShowHidden);
-    // TODO Replace this with OptTable API once it adds extrahelp support.
-    outs() << "\nPass @FILE as argument to read options from FILE.\n";
-  }
+enum OtoolOptID {
+  OTOOL_INVALID = 0, // This is not an option ID.
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
+               HELPTEXT, METAVAR, VALUES)                                      \
+  OTOOL_##ID,
+#include "OtoolOpts.inc"
+#undef OPTION
+};
+
+#define PREFIX(NAME, VALUE) const char *const OTOOL_##NAME[] = VALUE;
+#include "OtoolOpts.inc"
+#undef PREFIX
+
+static constexpr opt::OptTable::Info OtoolInfoTable[] = {
+#define OTOOL_nullptr nullptr
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
+               HELPTEXT, METAVAR, VALUES)                                      \
+  {OTOOL_##PREFIX, NAME,       HELPTEXT,                                       \
+   METAVAR,        OTOOL_##ID, opt::Option::KIND##Class,                       \
+   PARAM,          FLAGS,      OTOOL_##GROUP,                                  \
+   OTOOL_##ALIAS,  ALIASARGS,  VALUES},
+#include "OtoolOpts.inc"
+#undef OPTION
+#undef OTOOL_nullptr
+};
+
+class OtoolOptTable : public CommonOptTable {
+public:
+  OtoolOptTable()
+      : CommonOptTable(OtoolInfoTable, " [option...] [file...]",
+                       "Mach-O object file displaying tool") {}
 };
 
 } // namespace
 
 #define DEBUG_TYPE "objdump"
 
 static uint64_t AdjustVMA;
 static bool AllHeaders;
for (StringRef Value : InputArgs.getAllArgValues(ID)) {
     llvm::SmallVector<StringRef, 2> SplitValues;
     llvm::SplitString(Value, SplitValues, ",");
     for (StringRef SplitValue : SplitValues)
       Values.push_back(SplitValue.str());
   }
   return Values;
 }
 
-static void parseOptions(const llvm::opt::InputArgList &InputArgs) {
+static void parseOtoolOptions(const llvm::opt::InputArgList &InputArgs) {
+  MachOOpt = true;
+  FullLeadingAddr = true;
+  PrintImmHex = true;
+
+  ArchName = InputArgs.getLastArgValue(OTOOL_arch).str();
+  LinkOptHints = InputArgs.hasArg(OTOOL_C);
+  if (InputArgs.hasArg(OTOOL_d))
+    FilterSections.push_back("__DATA,__data");
+  DylibId = InputArgs.hasArg(OTOOL_D);
+  UniversalHeaders = InputArgs.hasArg(OTOOL_f);
+  DataInCode = InputArgs.hasArg(OTOOL_G);
+  FirstPrivateHeader = InputArgs.hasArg(OTOOL_h);
+  IndirectSymbols = InputArgs.hasArg(OTOOL_I);
+  NoShowRawInsn = !InputArgs.hasArg(OTOOL_j);
+  PrivateHeaders = InputArgs.hasArg(OTOOL_l);
+  DylibsUsed = InputArgs.hasArg(OTOOL_L);
+  MCPU = InputArgs.getLastArgValue(OTOOL_mcpu_EQ).str();
+  ObjcMetaData = InputArgs.hasArg(OTOOL_o);
+  DisSymName = InputArgs.getLastArgValue(OTOOL_p).str();
+  InfoPlist = InputArgs.hasArg(OTOOL_P);
+  Relocations = InputArgs.hasArg(OTOOL_r);
+  if (const Arg *A = InputArgs.getLastArg(OTOOL_s)) {
+    auto Filter = (A->getValue(0) + StringRef(",") + A->getValue(1)).str();
+    FilterSections.push_back(Filter);
+  }
+  if (InputArgs.hasArg(OTOOL_t))
+    FilterSections.push_back("__TEXT,__text");
+  NonVerbose = !(InputArgs.hasArg(OTOOL_v) || InputArgs.hasArg(OTOOL_V) ||
+                 InputArgs.hasArg(OTOOL_o));
+  NoSymbolicOperands = !InputArgs.hasArg(OTOOL_V);
+  if (InputArgs.hasArg(OTOOL_x))
+    FilterSections.push_back(",__text");
+  NoLeadingAddr = NoLeadingHeaders = InputArgs.hasArg(OTOOL_X);
+
+  InputFilenames = InputArgs.getAllArgValues(OTOOL_INPUT);
+  if (InputFilenames.empty())
+    reportCmdLineError("no input file");
+
+  for (const Arg *A : InputArgs) {
+    const Option &O = A->getOption();
+    if (O.getGroup().isValid() && O.getGroup().getID() == OTOOL_grp_obsolete) {
+      reportCmdLineWarning(O.getPrefixedName() +
+                           " is obsolete and not implemented");
+    }
+  }
+}
+
+static void parseObjdumpOptions(const llvm::opt::InputArgList &InputArgs) {
   parseIntArg(InputArgs, OBJDUMP_adjust_vma_EQ, AdjustVMA);
   AllHeaders = InputArgs.hasArg(OBJDUMP_all_headers);
   ArchName = InputArgs.getLastArgValue(OBJDUMP_arch_name_EQ).str();
   ArchiveHeaders = InputArgs.hasArg(OBJDUMP_archive_headers);
   Demangle = InputArgs.hasArg(OBJDUMP_demangle);
   Disassemble = InputArgs.hasArg(OBJDUMP_disassemble);
   DisassembleAll = InputArgs.hasArg(OBJDUMP_disassemble_all);
   SymbolDescription = InputArgs.hasArg(OBJDUMP_symbol_description);
static void parseObjdumpOptions(const llvm::opt::InputArgList &InputArgs) {
   if (InputArgs.hasArg(OBJDUMP_mv67))
     LLVMArgs.push_back("--mv67");
   if (InputArgs.hasArg(OBJDUMP_mv67t))
     LLVMArgs.push_back("--mv67t");
   if (InputArgs.hasArg(OBJDUMP_riscv_no_aliases))
     LLVMArgs.push_back("--riscv-no-aliases");
   LLVMArgs.push_back(nullptr);
   llvm::cl::ParseCommandLineOptions(LLVMArgs.size() - 1, LLVMArgs.data());
+
+  // objdump defaults to a.out if no filenames specified.
+  if (InputFilenames.empty())
+    InputFilenames.push_back("a.out");
 }
 
 int main(int argc, char **argv) {
   using namespace llvm;
   InitLLVM X(argc, argv);
 
   ToolName = argv[0];
+  std::unique_ptr<CommonOptTable> T;
+  OptSpecifier Unknown, HelpFlag, HelpHiddenFlag, VersionFlag;
 
-  ObjdumpOptTable T;
-  T.setGroupedShortOptions(true);
+  StringRef Stem = sys::path::stem(ToolName);
+  auto Is = [=](StringRef Tool) {
+    // We need to recognize the following filenames:
+    //
+    // llvm-objdump -> objdump
+    // llvm-otool-10.exe -> otool
+    // powerpc64-unknown-freebsd13-objdump -> objdump
+    auto I = Stem.rfind_lower(Tool);
+    return I != StringRef::npos &&
+           (I + Tool.size() == Stem.size() || !isAlnum(Stem[I + Tool.size()]));
+  };
+  if (Is("otool")) {
+    T = std::make_unique<OtoolOptTable>();
+    Unknown = OTOOL_UNKNOWN;
+    HelpFlag = OTOOL_help;
+    HelpHiddenFlag = OTOOL_help_hidden;
+    VersionFlag = OTOOL_version;
+  } else {
+    T = std::make_unique<ObjdumpOptTable>();
+    Unknown = OBJDUMP_UNKNOWN;
+    HelpFlag = OBJDUMP_help;
+    HelpHiddenFlag = OBJDUMP_help_hidden;
+    VersionFlag = OBJDUMP_version;
+  }
 
-  bool HasError = false;
   BumpPtrAllocator A;
   StringSaver Saver(A);
   opt::InputArgList InputArgs =
-      T.parseArgs(argc, argv, OBJDUMP_UNKNOWN, Saver, [&](StringRef Msg) {
-        errs() << "error: " << Msg << '\n';
-        HasError = true;
-      });
-  if (HasError)
-    exit(1);
+      T->parseArgs(argc, argv, Unknown, Saver,
+                   [&](StringRef Msg) { reportCmdLineError(Msg); });
 
-  if (InputArgs.size() == 0 || InputArgs.hasArg(OBJDUMP_help)) {
-    T.PrintObjdumpHelp(ToolName);
+  if (InputArgs.size() == 0 || InputArgs.hasArg(HelpFlag)) {
+    T->printHelp(ToolName);
     return 0;
   }
-  if (InputArgs.hasArg(OBJDUMP_help_hidden)) {
-    T.PrintObjdumpHelp(ToolName, /*show_hidden=*/true);
+  if (InputArgs.hasArg(HelpHiddenFlag)) {
+    T->printHelp(ToolName, /*show_hidden=*/true);
     return 0;
   }
 
   // Initialize targets and assembly printers/parsers.
   InitializeAllTargetInfos();
   InitializeAllTargetMCs();
   InitializeAllDisassemblers();
 
-  if (InputArgs.hasArg(OBJDUMP_version)) {
+  if (InputArgs.hasArg(VersionFlag)) {
     cl::PrintVersionMessage();
+    if (!Is("otool")) {
       outs() << '\n';
       TargetRegistry::printRegisteredTargetsForVersion(outs());
-    exit(0);
+    }
+    return 0;
   }
 
-  parseOptions(InputArgs);
+  if (Is("otool"))
+    parseOtoolOptions(InputArgs);
+  else
+    parseObjdumpOptions(InputArgs);
 
   if (StartAddress >= StopAddress)
     reportCmdLineError("start address should be less than stop address");
 
-
-  // Defaults to a.out if no filenames specified.
-  if (InputFilenames.empty())
-    InputFilenames.push_back("a.out");
-
   // Removes trailing separators from prefix.
   while (!Prefix.empty() && sys::path::is_separator(Prefix.back()))
     Prefix.pop_back();
 
   if (AllHeaders)
     ArchiveHeaders = FileHeaders = PrivateHeaders = Relocations =
         SectionHeaders = SymbolTable = true;
 
   if (DisassembleAll || PrintSource || PrintLines ||
       !DisassembleSymbols.empty())
     Disassemble = true;
 
   if (!ArchiveHeaders && !Disassemble && DwarfDumpType == DIDT_Null &&
       !DynamicRelocations && !FileHeaders && !PrivateHeaders && !RawClangAST &&
       !Relocations && !SectionHeaders && !SectionContents && !SymbolTable &&
       !DynamicSymbolTable && !UnwindInfo && !FaultMapSection &&
       !(MachOOpt &&
         (Bind || DataInCode || DylibId || DylibsUsed || ExportsTrie ||
          FirstPrivateHeader || FunctionStarts || IndirectSymbols || InfoPlist ||
          LazyBind || LinkOptHints || ObjcMetaData || Rebase ||
          UniversalHeaders || WeakBind || !FilterSections.empty()))) {
-    T.PrintObjdumpHelp(ToolName);
+    T->printHelp(ToolName);
     return 2;
   }
 
   DisasmSymbolSet.insert(DisassembleSymbols.begin(), DisassembleSymbols.end());
 
   llvm::for_each(InputFilenames, dumpInput);
 
   warnOnNoMatchForSections();
 
   return EXIT_SUCCESS;
 }

llvm/utils/gn/secondary/llvm/test/BUILD.gn

deps = [
     "//llvm/tools/llvm-lto2",
     "//llvm/tools/llvm-mc",
     "//llvm/tools/llvm-mca",
     "//llvm/tools/llvm-ml",
     "//llvm/tools/llvm-modextract",
     "//llvm/tools/llvm-mt",
     "//llvm/tools/llvm-nm",
     "//llvm/tools/llvm-objcopy:symlinks",
-    "//llvm/tools/llvm-objdump",
+    "//llvm/tools/llvm-objdump:symlinks",
     "//llvm/tools/llvm-opt-fuzzer",
     "//llvm/tools/llvm-opt-report",
     "//llvm/tools/llvm-pdbutil",
     "//llvm/tools/llvm-profdata",
     "//llvm/tools/llvm-rc",
     "//llvm/tools/llvm-readobj:symlinks",
     "//llvm/tools/llvm-reduce",
     "//llvm/tools/llvm-rtdyld",

llvm/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn

 import("//llvm/tools/binutils_symlinks.gni")
 import("//llvm/utils/TableGen/tablegen.gni")
 import("//llvm/utils/gn/build/symlink_or_copy.gni")
 
 tablegen("ObjdumpOpts") {
   visibility = [ ":llvm-objdump" ]
   args = [ "-gen-opt-parser-defs" ]
 }
 
+tablegen("OtoolOpts") {
+  visibility = [ ":llvm-objdump" ]
+  args = [ "-gen-opt-parser-defs" ]
+}
+
+symlinks = [ "llvm-otool" ]
 if (llvm_install_binutils_symlinks) {
-  symlink_or_copy("objdump") {
+  symlinks += [ "objdump" ]
+}
+
+foreach(target, symlinks) {
+  symlink_or_copy(target) {
     deps = [ ":llvm-objdump" ]
     source = "llvm-objdump"
-    output = "$root_out_dir/bin/objdump"
+    output = "$root_out_dir/bin/$target"
   }
 }
 
 # //:llvm-objdump depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
   deps = [ ":llvm-objdump" ]
-  if (llvm_install_binutils_symlinks) {
-    deps += [ ":objdump" ]
+  foreach(target, symlinks) {
+    deps += [ ":$target" ]
   }
 }
 
 executable("llvm-objdump") {
   deps = [
     ":ObjdumpOpts",
+    ":OtoolOpts",
     "//llvm/include/llvm/Config:config",
     "//llvm/lib/CodeGen",
     "//llvm/lib/DebugInfo/DWARF",
     "//llvm/lib/DebugInfo/PDB",
     "//llvm/lib/DebugInfo/Symbolize",
     "//llvm/lib/Demangle",
     "//llvm/lib/MC",
     "//llvm/lib/MC/MCDisassembler",