<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb5c5d85938b2f7a00d4ecf7adea34044fece6dc">https://github.com/macports/macports-ports/commit/bb5c5d85938b2f7a00d4ecf7adea34044fece6dc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bb5c5d85938 clang-11-bootstrap: fix build on macOS 10.5
</span>bb5c5d85938 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bb5c5d85938b2f7a00d4ecf7adea34044fece6dc
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Aug 5 14:24:47 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> clang-11-bootstrap: fix build on macOS 10.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It removes runtime dependency from gcc10-bootstrap, and backports patch
</span><span style='display:block; white-space:pre;color:#404040;'> which allows to use this ports for cctools.
</span>---
lang/clang-11-bootstrap/Portfile | 23 +++-
...-issues-pre-Lion-due-to-missing-a-strnlen.patch | 75 ++++++++++++
.../files/fix-build-with-old-xar.diff | 24 ++++
.../files/llvm-objdump-help-macho.diff | 136 +++++++++++++++++++++
4 files changed, 253 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/Portfile b/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index adac2de114f..b5d50021329 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup muniversal 1.0
</span> name clang-11-bootstrap
version 11.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> epoch 0
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,8 @@ depends_build-append \
</span> depends_skip_archcheck-append \
python27-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang is linked against gcc's libstdc++.6.dylib and libgcc_s.1.1.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:gcc10-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gcc10-bootstrap
</span>
# Use cmake-bootstrap
depends_build-replace \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,9 @@ patchfiles 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.pa
</span> 5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff \
patch-clang-fix-include-next-sysroot-cpp-headers.diff \
Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-build-clang-by-gcc10.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-build-clang-by-gcc10.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm-objdump-help-macho.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-build-with-old-xar.diff
</span>
# sterilize MacPorts build environment; we want nothing picked up from MP prefix
compiler.cpath
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,6 +146,10 @@ configure.pre_args-delete \
</span> configure.pre_args-delete \
-DCMAKE_INSTALL_NAME_DIR="${cmake.install_prefix}/lib"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# prevent it from linking against gcc's libstdc++.6.dylib and libgcc_s.1.1.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -static-libstdc++ -static-libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
if {${os.major} == 14} {
# Building Xray forces build of sanitizer_common, even if
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,9 +213,16 @@ configure.args-append \
</span> -DLLVM_INCLUDE_GO_TESTS=OFF \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_UTILS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLLVM_TARGETS_TO_BUILD="AArch64\;X86" \
</span> -DPYTHON_EXECUTABLE=${prefix}/libexec/python27-bootstrap/bin/python2.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_TARGETS_TO_BUILD="AArch64\;X86"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_TARGETS_TO_BUILD=X86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${configure.sdkroot} ne ""} {
configure.args-append \
-DDARWIN_osx_SYSROOT="${configure.sdkroot}" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.patch b/lang/clang-11-bootstrap/files/Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index aaad4f7ac7d..0d1d57d700b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,3 +224,78 @@ index 49347431b9..bfd6e56be2 100644
</span> /// HashHMapKey - This is the 'well known' hash function required by the file
/// format, used to look up keys in the hash table. The hash table uses simple
/// linear probing based on this function.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aeb04ef4508a..844f6d71102f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <system_error>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ l++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace lld {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace mach_o {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace normalized {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lld/MachO/ExportTrie.cpp b/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7cc81bcfd5f1..cafac8aae97d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/BinaryFormat/MachO.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ l++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm::MachO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace lld;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 46fe82f98822..5912e90d6a40 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,6 +58,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/MemoryBuffer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/Path.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ l++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm::MachO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm::support::endian;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/fix-build-with-old-xar.diff b/lang/clang-11-bootstrap/files/fix-build-with-old-xar.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4bcab0a6a61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/fix-build-with-old-xar.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +179,7 @@ if (LLVM_ENABLE_ZLIB STREQUAL "FORCE_ON" AND NOT HAVE_LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "Failed to configure zlib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-check_library_exists(xar xar_open "" HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++check_library_exists(xar xar_extract_tobuffersz "" HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(XAR_LIB xar)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9a682481ccaf..eefd95a8f3e1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define if the setupterm() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine HAVE_TERMINFO ${HAVE_TERMINFO}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Define if the xar_open() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define if the xar_extract_tobuffersz() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine HAVE_LIBXAR ${HAVE_LIBXAR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the <termios.h> header file. */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/llvm-objdump-help-macho.diff b/lang/clang-11-bootstrap/files/llvm-objdump-help-macho.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9f8c8e173a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/llvm-objdump-help-macho.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,136 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Based on https://reviews.llvm.org/D92310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c1d330bae133d..b3ec20f97c97b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tools/llvm-objdump/MachODump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tools/llvm-objdump/MachODump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,70 +107,70 @@ static cl::opt<bool> NoLeadingHeaders("no-leading-headers",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool> objdump::UniversalHeaders(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "universal-headers",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cl::desc("Print Mach-O universal headers (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cl::desc("Print Mach-O universal headers (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl::opt<bool> ArchiveMemberOffsets(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "archive-member-offsets",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Print the offset to each archive member for Mach-O archives "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "(requires -macho and -archive-headers)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "(requires --macho and --archive-headers)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool> objdump::IndirectSymbols(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "indirect-symbols",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Print indirect symbol table for Mach-O objects (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Print indirect symbol table for Mach-O objects (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool> objdump::DataInCode(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "data-in-code",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Print the data in code table for Mach-O objects (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Print the data in code table for Mach-O objects (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objdump::LinkOptHints("link-opt-hints",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Print the linker optimization hints for "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Mach-O objects (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Mach-O objects (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objdump::InfoPlist("info-plist",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Print the info plist section as strings for "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Mach-O objects (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Mach-O objects (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objdump::DylibsUsed("dylibs-used",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Print the shared libraries used for linked "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Mach-O files (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Mach-O files (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool> objdump::DylibId("dylib-id",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Print the shared library's id for the "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "dylib Mach-O file (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "dylib Mach-O file (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl::opt<bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NonVerbose("non-verbose",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Print the info for Mach-O objects in non-verbose or "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numeric form (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "numeric form (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objdump::ObjcMetaData("objc-meta-data",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Print the Objective-C runtime meta data "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "for Mach-O files (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "for Mach-O files (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl::opt<std::string> DisSymName(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "dis-symname",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cl::desc("disassemble just this symbol's instructions (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cl::desc("disassemble just this symbol's instructions (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl::opt<bool> NoSymbolicOperands(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "no-symbolic-operands",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cl::desc("do not symbolic operands when disassembling (requires -macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cl::desc("do not symbolic operands when disassembling (requires --macho)"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(MachOCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl::list<std::string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bb33d254370e6..96e936ec4e8f7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tools/llvm-objdump/llvm-objdump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tools/llvm-objdump/llvm-objdump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@ static cl::alias AllHeadersShort("x", cl::desc("Alias for --all-headers"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl::opt<std::string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ArchName("arch-name",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Target arch to disassemble for, "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "see -version for available targets"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "see --version for available targets"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(ObjdumpCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,7 +274,7 @@ static cl::alias PrivateHeadersShort("p",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::list<std::string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objdump::FilterSections("section",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Operate on the specified sections only. "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "With -macho dump segment,section"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "With --macho dump segment,section"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(ObjdumpCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl::alias FilterSectionsj("j", cl::desc("Alias for --section"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::NotHidden, cl::Grouping, cl::Prefix,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,7 +303,7 @@ static cl::opt<bool> PrintSource(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Display source inlined with disassembly. Implies disassemble object"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::cat(ObjdumpCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static cl::alias PrintSourceShort("S", cl::desc("Alias for -source"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static cl::alias PrintSourceShort("S", cl::desc("Alias for --source"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::NotHidden, cl::Grouping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::aliasopt(PrintSource));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -335,11 +335,11 @@ static cl::alias DynamicSymbolTableShort("T",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::NotHidden, cl::Grouping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::aliasopt(DynamicSymbolTable));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cl::opt<std::string> objdump::TripleName(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "triple",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cl::desc(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Target triple to disassemble for, see -version for available targets"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cl::cat(ObjdumpCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cl::opt<std::string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ objdump::TripleName("triple",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cl::desc("Target triple to disassemble for, see "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "--version for available targets"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cl::cat(ObjdumpCat));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::opt<bool> objdump::UnwindInfo("unwind-info",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl::desc("Display unwind information"),
</span></pre><pre style='margin:0'>
</pre>