<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/78b2cb450f7f56f0d1e6f66c44cd6e3a3fd742b1">https://github.com/macports/macports-ports/commit/78b2cb450f7f56f0d1e6f66c44cd6e3a3fd742b1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 78b2cb450f7f56f0d1e6f66c44cd6e3a3fd742b1
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun May 10 12:33:52 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm/clang/lldb-devel: use legacysupport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> with this: delete 8 patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'> enable almost all features on all systems
</span>---
lang/llvm-devel/Portfile | 85 ++++++----------------
...h-O-CPU-Subtype-to-ppc7400-when-targeting.patch | 38 ----------
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 70 ------------------
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 42 -----------
...-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch | 26 -------
...atch-libcxx-src-new-posix-memalign-leopard.diff | 53 --------------
.../files/5001-patch-machoreader-strnlen.diff | 23 ------
.../files/5002-patch-objdumper-strnlen.diff | 23 ------
.../files/5003-patch-llvm10-strnlen.diff | 51 -------------
9 files changed, 21 insertions(+), 390 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d532c96..86e31de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,10 @@ PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# link legacysupport statically for compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.use_static yes
</span>
# for devel
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +43,7 @@ dist_subdir llvm
</span> categories lang
platforms darwin
license NCSA
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jeremyhu @jeremyhu} {larryv @larryv} {kencu @kencu}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {jeremyhu @jeremyhu} {kencu @kencu}
</span>
if {${subport} eq "llvm-${llvm_version}"} {
homepage https://llvm.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +57,9 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>
depends_lib port:libedit port:libffi port:ncurses path:lib/libxar.dylib:xar port:zlib
depends_run bin:perl:perl5 port:llvm_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +polly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif {${subport} eq "clang-${llvm_version}"} {
homepage https://clang.llvm.org/
description C, C++, Objective C and Objective C++ compiler
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,10 +78,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> depends_run port:clang_select port:ld64
depends_skip_archcheck-append ld64 subversion
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Avoid requiring a bootstrap version of perl5 on 10.6.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +analyzer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +analyzer
</span>
} elseif {${subport} eq "lldb-${llvm_version}"} {
homepage https://lldb.llvm.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,16 +121,12 @@ patch.pre_args -p1
</span> patchfiles \
0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \
0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
</span> 0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch \
0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
patchfiles-append \
5000-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5000-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5001-patch-machoreader-strnlen.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5002-patch-objdumper-strnlen.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5003-patch-llvm10-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5000-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span>
if {${subport} eq "clang-${llvm_version}"} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,18 +135,13 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1003-Default-to-ppc7400-for-OSX-10.5.patch \
1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
1005-Fixup-libstdc-header-search-paths-for-older-versions.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
</span> 1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch \
</span> 2002-Work-around-no-libdispatch-on-10.6.patch \
3001-Fix-missing-long-long-math-prototypes-when-using-the.patch \
3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
openmp-locations.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- leopard-no-asan.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ leopard-no-asan.patch \
</span> 5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5001-patch-libcxx-src-new-posix-memalign-leopard.diff \
</span> 5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +153,6 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span> 1003-Default-to-ppc7400-for-OSX-10.5.patch \
1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
1005-Fixup-libstdc-header-search-paths-for-older-versions.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
</span> 1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
openmp-locations.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,6 +197,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> # CMAKE_LINKER is used to determine the value for HOST_LINK_VERSION
configure.args-append \
-DCMAKE_LINKER=${prefix}/bin/ld \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLD64_EXECUTABLE=${prefix}/bin/ld \
</span> -DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DCLANG_ENABLE_ARCMT=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,6 +215,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCLANG_ENABLE_ARCMT=OFF \
-DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=OFF \
</span> -DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
-DLIBCXX_INSTALL_LIBRARY=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,30 +247,14 @@ if {[lsearch -exact $PortInfo(depends_build) port:cctools] != -1} {
</span> -DCMAKE_LIBTOOL=${prefix}/bin/libtool
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# use the system python27 if present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DPYTHON_EXECUTABLE=${pythonfullpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythonfullpath ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -D_Python3_EXECUTABLE=${pythonfullpath}
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that we are forcing this choice. This means that anything linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # against llvm-3.5 needs to also be using libc++. This is possibly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # problematic, but luckily there is just a limited set of such dependents.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cxx_stdlib libc++
depends_lib-append port:libcxx
supported_archs i386 x86_64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists /usr/lib/libc++.dylib]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$name requires a C++11 runtime, which your configuration does not allow"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "unsupported configuration"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,34 +266,20 @@ platform darwin {
</span>
if {${subport} eq "clang-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XRAY uses TLS, MAP_ANONYMOUS, and clock_gettime, so disable it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # on systems that don't currently support these features
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/57130
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://bugs.llvm.org/show_bug.cgi?id=38959
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://bugs.llvm.org/show_bug.cgi?id=38958
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TO DO: all these features can be replaced by legacysupport
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCOMPILER_RT_BUILD_XRAY=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 14} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCLANG_ENABLE_CLANGD=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # xpc.h available 10.10 https://developer.apple.com/documentation/xpc?language=objc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # toggle enabled in https://reviews.llvm.org/D59808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCLANGD_BUILD_XPC=OFF
</span> }
if {${os.major} <= 13} {
# We unfortunately don't have an option to just turn off tsan
# https://llvm.org/bugs/show_bug.cgi?id=27715
configure.args-append -DCOMPILER_RT_BUILD_SANITIZERS=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libfuzzer uses TLS, fails on 10.9 and less
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # possibly fixable, see https://trac.macports.org/ticket/58291
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TO DO: TLS is available by using a macports-clang compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
</span> }
if {${os.major} <= 10} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the directorywatcher code in clang-9.0+ is 10.7+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # I believe this patch could be applied always, without a system test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the directorywatcher code is currently 10.7+
</span> patchfiles-append 5003-patch-no-directory-watcher-on-snowleopard.diff
# the libcxx installed by MacPorts on darwin 10 and less does not correspond to Apple's builtin libcxx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,15 +292,6 @@ platform darwin {
</span> patchfiles-append leopard-no-blocks.patch
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Proxy for eliminating the dependency on native TLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://trac.macports.org/ticket/46887
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DLLVM_ENABLE_BACKTRACES=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://llvm.org/bugs/show_bug.cgi?id=25680
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -U__STRICT_ANSI__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
pre-fetch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch b/lang/llvm-devel/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 20473bc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7b739282165d49031835b9413d273762f0ec53d9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 17 Jan 2015 09:03:43 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/6] Set the Mach-O CPU Subtype to ppc7400 when targeting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Leopard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://llvm.org/bugs/show_bug.cgi?id=18463
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 8 +++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 7 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ec4eb700563..1478baf9bef 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,10 +208,16 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unique_ptr<MCObjectTargetWriter>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- createObjectTargetWriter() const override {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool Is64 = TT.isPPC64();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MachO::CPUSubTypePowerPC CS = MachO::CPU_SUBTYPE_POWERPC_ALL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (TT.isOSDarwin() && !TT.isMacOSXVersionLT(10,5)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CS = MachO::CPU_SUBTYPE_POWERPC_7400;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return createPPCMachObjectWriter(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*Is64Bit=*/Is64,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (Is64 ? MachO::CPU_TYPE_POWERPC64 : MachO::CPU_TYPE_POWERPC),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MachO::CPU_SUBTYPE_POWERPC_ALL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb221aa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,70 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e37fcfbad830c9bfe7375847f230f69899360444 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 20 Dec 2016 12:41:21 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/6] Fix build issues pre-Lion due to missing a strnlen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- definition
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/51520
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://llvm.org/bugs/show_bug.cgi?id=27714
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/ObjectYAML/MachOYAML.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/obj2yaml/macho2yaml.cpp | 16 +++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 29 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/lib/ObjectYAML/MachOYAML.cpp macports_master/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d12f12cf443..57464def3da 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdint>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstring>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MachOYAML::LoadCommand::~LoadCommand() = default;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/obj2yaml/macho2yaml.cpp macports_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 63e81686632..3c9b0cf8748 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/ErrorHandling.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <string.h> // for memcpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h> // for memcpy abd strnlen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/llvm-devel/files/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fce3d3e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 175e835fb2403a9fe6a620c9a663b3045547dfe6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 20 Dec 2016 15:53:39 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1007] Fix build issues pre-Lion due to missing a strnlen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- definition
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/51520
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://llvm.org/bugs/show_bug.cgi?id=27714
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Lex/HeaderMap.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 14 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Lex/HeaderMap.cpp macports_master/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e0bf58b675..1db3380602 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace clang;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// HashHMapKey - This is the 'well known' hash function required by the file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// format, used to look up keys in the hash table. The hash table uses simple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// linear probing based on this function.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch b/lang/llvm-devel/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2e852d0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From efa7f9f49c1491483910d438b3d5be927c9e5ddc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 27 Dec 2017 23:21:37 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2001/2002] xray: Define O_CLOEXEC for older SDKs that don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/compiler-rt/lib/xray/xray_x86_64.cpp macports_master/projects/compiler-rt/lib/xray/xray_x86_64.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e63ee1b3b..65b59ec61 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/compiler-rt/lib/xray/xray_x86_64.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/compiler-rt/lib/xray/xray_x86_64.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tuple>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define O_CLOEXEC 0x1000000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace __xray {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if SANITIZER_LINUX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5001-patch-libcxx-src-new-posix-memalign-leopard.diff b/lang/llvm-devel/files/5001-patch-libcxx-src-new-posix-memalign-leopard.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 87b5746..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/5001-patch-libcxx-src-new-posix-memalign-leopard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/projects/libcxx/src/new.cpp b/projects/libcxx/src/new.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cc8383d..ff09580 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/libcxx/src/new.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/libcxx/src/new.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,48 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int posix_memalign(void** pp, size_t alignment, size_t bytes) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* if alignment is 0 or not a power of 2 return bad value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (alignment < sizeof( void *) || // excludes 0 == alignment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return EINVAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void* mem = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (alignment <= 16) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* MacOSX always returns memory aligned on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * a 16 byte alignment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mem = malloc(bytes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* if the caller wants a larger alignment than 16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * we give them a page-aligned allotment. This is not as efficient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * as an optimized aligned memory implementation, but much
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * simpler, effective, and requires no changes to the rest of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * underlying memory management system.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mem = valloc(bytes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (mem == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ENOMEM;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *pp = mem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace std
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5001-patch-machoreader-strnlen.diff b/lang/llvm-devel/files/5001-patch-machoreader-strnlen.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5bb0884..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/5001-patch-machoreader-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- trunk/tools/llvm-objcopy/MachO/MachOReader.cpp.orig 2019-07-11 18:32:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ trunk/tools/llvm-objcopy/MachO/MachOReader.cpp 2019-07-11 18:33:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,6 +13,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Object/MachO.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace objcopy {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace macho {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5002-patch-objdumper-strnlen.diff b/lang/llvm-devel/files/5002-patch-objdumper-strnlen.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 14a72e0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/5002-patch-objdumper-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- trunk/tools/llvm-readobj/ObjDumper.cpp.orig 2019-07-11 18:34:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ trunk/tools/llvm-readobj/ObjDumper.cpp 2019-07-11 18:34:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/raw_ostream.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <map>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ObjDumper::ObjDumper(ScopedPrinter &Writer) : W(Writer) {}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5003-patch-llvm10-strnlen.diff b/lang/llvm-devel/files/5003-patch-llvm10-strnlen.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index db634ea..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/5003-patch-llvm10-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp b/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 380f2e98..dbfe8ce6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/Errc.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/ErrorHandling.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace objcopy {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace macho {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/llvm-objcopy/MachO/Object.cpp b/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d3b4fdc2..3f88377b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Object.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../llvm-objcopy.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace objcopy {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace macho {
</span></pre><pre style='margin:0'>
</pre>