<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/5c5ec4019e9dafb7d80a068a00b5a9b7e4585f0e">https://github.com/macports/macports-ports/commit/5c5ec4019e9dafb7d80a068a00b5a9b7e4585f0e</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 5c5ec4019e9 llvm/clang/flang/lldb-11: upgrade to 11.0.1
</span>5c5ec4019e9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5c5ec4019e9dafb7d80a068a00b5a9b7e4585f0e
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Feb 6 00:39:31 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> llvm/clang/flang/lldb-11: upgrade to 11.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> new in this release, after a number of requests:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> we install both libcxx and libcxxabi
</span><span style='display:block; white-space:pre;color:#404040;'> safely tucked away in the llvm library directory.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> These are not used by any software at present, all of
</span><span style='display:block; white-space:pre;color:#404040;'> which is hardcoded to use /usr/lib/libc++*.dylib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> But it is there, including in static lib formats, for people
</span><span style='display:block; white-space:pre;color:#404040;'> to experiment with.
</span>---
lang/llvm-11/Portfile | 42 ++++---
lang/llvm-11/files/4000-patch-lldb-D95683.diff | 150 +++++++++++++++++++++++++
2 files changed, 174 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-11/Portfile b/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96bea1173ff..88b07fd5fd6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,30 +5,31 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup active_variants 1.1
PortGroup cmake 1.0
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span>
# link legacysupport statically for compilers
legacysupport.use_static yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# limit legacysupport to 10.9 for now
</span> legacysupport.newest_darwin_requires_legacy 13
set llvm_version 11
set clang_executable_version 11
set lldb_executable_version 11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup llvm llvm-project 11.0.0 llvmorg-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the the distnames are changing every point release and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# github portgroup can't manage the frequent distname changes easily
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use this version of the master_sites until it stabilizes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 11.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname llvm-project-${version}.src
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 594eb676d9c9786d809587c39dff087f2e8c9429 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b7b639fc675fa1c86dd6d0bc32267be9eb34451748d2efd03f674b773000e92b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 84792772
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 068b49a6e3a5d1d96347ea03813df96ea30b5b8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af95d00f833dd67114b21c3cfe72dff2e1cdab627651f977b087a837136d653b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 84061388
</span>
name llvm-${llvm_version}
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 1 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 0 }
</span> subport flang-${llvm_version} { revision 0 }
subport lldb-${llvm_version} { revision 0 }
set suffix mp-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,14 +104,11 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> # for devel version only
# default_variants-append +assertions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the backtik pkgconfig setting in the ffi config line requires pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir llvm-project-${version}/llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir llvm-project/llvm
</span> patch.dir ${workpath}/llvm-project/llvm
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${workpath}/llvm-project-${version} ${workpath}/llvm-project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/${distname} ${workpath}/llvm-project
</span>
if {${subport} eq "llvm-${llvm_version}"} {
if {[variant_isset polly]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,6 +170,13 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span> 1005-Fixup-libstdc-header-search-paths-for-older-versions.patch \
1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
openmp-locations.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/llvm/llvm-project/commit/1fdec59bffc11ae37eb51a1b9869f0696bfd5312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove in lldb-11.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4000-patch-lldb-D95683.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
configure.post_args ../${worksrcdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,9 +204,9 @@ configure.args-append \
</span> -DLLVM_ENABLE_RTTI=ON \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_EXAMPLES=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLLVM_ENABLE_FFI=ON \
</span> -DLLVM_BINDINGS_LIST=none \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFFI_INCLUDE_DIR=`pkg-config --cflags-only-I libffi | sed 's/-I//'` \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_ENABLE_FFI=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFFI_INCLUDE_DIR=${prefix}/include \
</span> -DFFI_LIBRARY_DIR=${prefix}/lib
if {${subport} eq "llvm-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,8 +225,8 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCLANG_ENABLE_ARCMT=OFF \
-DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BUILD_RUNTIME=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBCXX_ENABLE_SHARED=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBCXX_INSTALL_LIBRARY=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBCXX_ENABLE_SHARED=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBCXX_INSTALL_LIBRARY=ON
</span>
} elseif {${subport} eq "flang-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -384,6 +389,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> system "cd ${destroot.dir}/tools/clang && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
system "cd ${destroot.dir}/projects/compiler-rt && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
system "cd ${destroot.dir}/projects/libcxx && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${destroot.dir}/projects/libcxxabi && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
</span>
delete ${destroot}${sub_prefix}/bin/clang
file rename ${destroot}${sub_prefix}/bin/clang-${clang_executable_version} ${destroot}${sub_prefix}/bin/clang
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-11/files/4000-patch-lldb-D95683.diff b/lang/llvm-11/files/4000-patch-lldb-D95683.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..613c8a3cda7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-11/files/4000-patch-lldb-D95683.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,150 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1fdec59bffc11ae37eb51a1b9869f0696bfd5312 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Andi-Bogdan Postelnicu <abpostelnicu@me.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 3 Feb 2021 17:38:49 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [lldb] Fix fallout caused by D89156 on 11.0.1 for MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix fallout caused by D89156 on 11.0.1 for MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Differential Revision: https://reviews.llvm.org/D95683
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../Platform/MacOSX/PlatformAppleTVSimulator.cpp | 8 ++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../Platform/MacOSX/PlatformAppleWatchSimulator.cpp | 8 ++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../Platform/MacOSX/PlatformAppleWatchSimulator.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../Plugins/Platform/MacOSX/PlatformiOSSimulator.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7 files changed, 17 insertions(+), 17 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 461624a2adaa..cecffacf69fd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -282,7 +282,7 @@ Status PlatformAppleTVSimulator::GetSymbolFile(const FileSpec &platform_file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Status PlatformAppleTVSimulator::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const ModuleSpec &module_spec, lldb_private::Process *process,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ModuleSP &module_sp, const FileSpecList *module_search_paths_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ModuleSP *old_module_sp_ptr, bool *did_create_ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules, bool *did_create_ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // For AppleTV, the SDK files are all cached locally on the host system. So
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // first we ask for the file in the cached SDK, then we attempt to get a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // shared module for the right architecture with the right UUID.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,9 +296,9 @@ Status PlatformAppleTVSimulator::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module_search_paths_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const bool always_create = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error = ModuleList::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module_spec, module_sp, module_search_paths_ptr, old_module_sp_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- did_create_ptr, always_create);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error = ModuleList::GetSharedModule(module_spec, module_sp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ module_search_paths_ptr, old_modules,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ did_create_ptr, always_create);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (module_sp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module_sp->SetPlatformFileSpec(platform_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5a7b0ee0d7dc..247cac06a320 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@ class PlatformAppleTVSimulator : public PlatformAppleSimulator {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetSharedModule(const lldb_private::ModuleSpec &module_spec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lldb_private::Process *process, lldb::ModuleSP &module_sp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const lldb_private::FileSpecList *module_search_paths_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lldb::ModuleSP *old_module_sp_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool *did_create_ptr) override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 03a8fcd31360..372dd9de9757 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -283,7 +283,7 @@ Status PlatformAppleWatchSimulator::GetSymbolFile(const FileSpec &platform_file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Status PlatformAppleWatchSimulator::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const ModuleSpec &module_spec, lldb_private::Process *process,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ModuleSP &module_sp, const FileSpecList *module_search_paths_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ModuleSP *old_module_sp_ptr, bool *did_create_ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules, bool *did_create_ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // For AppleWatch, the SDK files are all cached locally on the host system.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // So first we ask for the file in the cached SDK, then we attempt to get a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // shared module for the right architecture with the right UUID.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,9 +297,9 @@ Status PlatformAppleWatchSimulator::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module_search_paths_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const bool always_create = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error = ModuleList::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module_spec, module_sp, module_search_paths_ptr, old_module_sp_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- did_create_ptr, always_create);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error = ModuleList::GetSharedModule(module_spec, module_sp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ module_search_paths_ptr, old_modules,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ did_create_ptr, always_create);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (module_sp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module_sp->SetPlatformFileSpec(platform_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 96dcd16ffa99..5becb8c0bf20 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@ class PlatformAppleWatchSimulator : public PlatformAppleSimulator {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetSharedModule(const lldb_private::ModuleSpec &module_spec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lldb_private::Process *process, lldb::ModuleSP &module_sp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const lldb_private::FileSpecList *module_search_paths_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lldb::ModuleSP *old_module_sp_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool *did_create_ptr) override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 79cbc940feb5..6d1cf804a0ae 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -730,7 +730,7 @@ Status PlatformDarwinKernel::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // framework on macOS systems, a chance.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error = PlatformDarwin::GetSharedModule(module_spec, process, module_sp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module_search_paths_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- old_module_sp_ptr, did_create_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ old_modules, did_create_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error.Success() && module_sp.get()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a890d0afdf1e..e293bd5b644c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,8 +286,8 @@ Status PlatformiOSSimulator::GetSymbolFile(const FileSpec &platform_file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Status PlatformiOSSimulator::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const ModuleSpec &module_spec, Process *process, ModuleSP &module_sp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const FileSpecList *module_search_paths_ptr, ModuleSP *old_module_sp_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool *did_create_ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const FileSpecList *module_search_paths_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules, bool *did_create_ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // For iOS, the SDK files are all cached locally on the host system. So first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // we ask for the file in the cached SDK, then we attempt to get a shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // module for the right architecture with the right UUID.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,9 +301,9 @@ Status PlatformiOSSimulator::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module_search_paths_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const bool always_create = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error = ModuleList::GetSharedModule(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module_spec, module_sp, module_search_paths_ptr, old_module_sp_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- did_create_ptr, always_create);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error = ModuleList::GetSharedModule(module_spec, module_sp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ module_search_paths_ptr, old_modules,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ did_create_ptr, always_create);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (module_sp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module_sp->SetPlatformFileSpec(platform_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4d416d759bd2..cc8e45a2be29 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm_master/tools/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@ class PlatformiOSSimulator : public PlatformAppleSimulator {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetSharedModule(const lldb_private::ModuleSpec &module_spec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lldb_private::Process *process, lldb::ModuleSP &module_sp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const lldb_private::FileSpecList *module_search_paths_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lldb::ModuleSP *old_module_sp_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool *did_create_ptr) override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t
</span></pre><pre style='margin:0'>
</pre>