<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/adf86bb46e2d0770754ec4bfd87076c293939c48">https://github.com/macports/macports-ports/commit/adf86bb46e2d0770754ec4bfd87076c293939c48</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 adf86bb46e2 llvm-devel: Update to 20230925 commit
</span>adf86bb46e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit adf86bb46e2d0770754ec4bfd87076c293939c48
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Sep 25 13:13:14 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> llvm-devel: Update to 20230925 commit
</span>---
lang/llvm-devel/Portfile | 13 ++++-----
...ly-Prepare-clang-format-for-replacement-w.patch | 34 ++++++++++++----------
...dc-header-search-paths-for-older-versions.patch | 34 ----------------------
...0.6-and-less-use-emulated-TLS-before-10.7.patch | 12 ++++----
...nd-less-libcxx-disable-Availability-tests.patch | 15 ++++------
5 files changed, 35 insertions(+), 73 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 c2706d384a4..3d0c53173d2 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;'>@@ -24,8 +24,8 @@ maintainers {jeremyhu @jeremyhu} {jonesc @cjones051073} openmaintain
</span> # for devel
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm-commit 54ab9541492d808ae4cf9130dd052d602b78ee32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set date 20230321
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm-commit f5cb9cb59d7c9c6ac3d5c41c677f68c9b75d34a3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set date 20230925
</span> revision 0
set llvm_version devel
set clang_exe_version 17
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ github.setup llvm llvm-project ${llvm-commit}
</span> version ${date}-[string range ${llvm-commit} 0 7]
default_variants-append +assertions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0fd2ccc6f5fbbacf52e5f6b8e6ce03e67a7c244d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 590e1d47a8a30b6af779878f9afbfa4b090235abf65277d6d01802bfb6bd7937 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 181072274
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e98c8afa1997572793edfe60147bd24ffb3b11b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9db06b0172769b54c19c3327e25b4bff0ee4f7a7b4fe36bbafc358607b5109c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 197951695
</span>
# For release
#set llvm_version 14
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ checksums rmd160 0fd2ccc6f5fbbacf52e5f6b8e6ce03e67a7c244d \
</span>
name llvm-${llvm_version}
subport mlir-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision [ expr ${revision} + 1 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision [ expr ${revision} + 0 ] }
</span> subport lldb-${llvm_version} { revision [ expr ${revision} + 0 ] }
subport flang-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +152,6 @@ patchfiles-append \
</span> 0011-Fix-missing-long-long-math-prototypes-when-using-the.patch \
0012-compiler-rt-add-some-defs-missing-in-older-SDKs.patch \
0013-clang-add-back-runtime-libraries-used-on-10.4-and-10.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0015-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> 0019-10.6-and-less-use-emulated-TLS-before-10.7.patch \
0025-lldb-add-defines-needed-for-older-SDKs.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0003-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-devel/files/0003-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index ab2fad7fcdb..de110bbd3ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0003-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0003-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,15 +28,16 @@ diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-f
</span> index 6e653a134289..cbcf21474ccd 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@ def main():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'fallback in case clang-format is invoked with'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-style=file, but can not find the .clang-format'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'file to use.')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- parser.add_argument('-binary', default='clang-format',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ parser.add_argument('-binary', default='@CLANG_FORMAT_PATH@',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help='location of binary to use for clang-format')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args = parser.parse_args()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parser.add_argument(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-binary",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- default="clang-format",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default="@CLANG_FORMAT_PATH@",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help="location of binary to use for clang-format",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = parser.parse_args()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git a/clang/tools/clang-format/clang-format-sublime.py b/clang/tools/clang-format/clang-format-sublime.py
index 20c867092ef5..ae823c1d05b6 100644
--- a/clang/tools/clang-format/clang-format-sublime.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,11 +46,12 @@ index 20c867092ef5..ae823c1d05b6 100644
</span> import subprocess
# Change this to the full path if clang-format is not on the path.
<span style='display:block; white-space:pre;background:#ffe0e0;'>--binary = 'clang-format'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+binary = '@CLANG_FORMAT_PATH@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-binary = "clang-format"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++binary = "@CLANG_FORMAT_PATH@"
</span>
# Change this to format according to other formatting styles. See the output of
# 'clang-format --help' for a list of supported styles. The default looks for
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git a/clang/tools/clang-format/clang-format.el b/clang/tools/clang-format/clang-format.el
index 768acb3a5d0d..e702bc6af4db 100644
--- a/clang/tools/clang-format/clang-format.el
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,15 +70,15 @@ diff --git a/clang/tools/clang-format/clang-format.py b/clang/tools/clang-format
</span> index 76fedb648147..9cb9825cbe5d 100644
--- a/clang/tools/clang-format/clang-format.py
+++ b/clang/tools/clang-format/clang-format.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@ import vim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +49,6 @@ import vim
</span>
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path.
<span style='display:block; white-space:pre;background:#ffe0e0;'>--binary = 'clang-format'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+binary = '@CLANG_FORMAT_PATH@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-binary = "clang-format"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++binary = "@CLANG_FORMAT_PATH@"
</span> if vim.eval('exists("g:clang_format_path")') == "1":
<span style='display:block; white-space:pre;background:#ffe0e0;'>- binary = vim.eval('g:clang_format_path')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ binary = vim.eval("g:clang_format_path")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --
2.21.1 (Apple Git-122.3)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0015-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-devel/files/0015-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5b9949a2f87..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0015-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 272e5f29ac311ec138652e680a3b1400bad0a1fa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 17 May 2021 21:12:59 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 15/24] Fixup libstdc++ header search paths for older versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of Mac OS X
</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;'>- clang/lib/Driver/ToolChains/Darwin.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index da1d171ce859..cef270cfc34a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2112,7 +2112,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "powerpc-apple-darwin10",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch == llvm::Triple::ppc64 ? "ppc64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "4.0.0", "powerpc-apple-darwin10",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "4.0.0", "powerpc-apple-darwin8",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch == llvm::Triple::ppc64 ? "ppc64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2131,7 +2131,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch == llvm::Triple::x86_64 ? "x86_64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "4.0.0", "i686-apple-darwin8",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arch == llvm::Triple::x86_64 ? "x86_64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.1 (Apple Git-122.3)
</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/0019-10.6-and-less-use-emulated-TLS-before-10.7.patch b/lang/llvm-devel/files/0019-10.6-and-less-use-emulated-TLS-before-10.7.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f343cfc63f8..eb919791d2e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0019-10.6-and-less-use-emulated-TLS-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0019-10.6-and-less-use-emulated-TLS-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,15 +44,13 @@ diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h
</span> index eed315c929ad..649b35f94307 100644
--- a/llvm/include/llvm/TargetParser/Triple.h 2022-12-20 15:29:16
+++ b/llvm/include/llvm/TargetParser/Triple.h 2022-12-30 13:17:19
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -946,7 +946,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// Tests whether the target uses emulated TLS as default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1009,7 +1009,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Note: Android API level 29 (10) introduced ELF TLS.
</span> bool hasDefaultEmulatedTLS() const {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return isAndroid() || isOSOpenBSD() || isWindowsCygwinEnvironment();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return isAndroid() || isOSOpenBSD() || isWindowsCygwinEnvironment() || isMacOSXVersionLT(10, 7);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (isAndroid() && isAndroidVersionLT(29)) || isOSOpenBSD() ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isWindowsCygwinEnvironment() || isOHOSFamily();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isWindowsCygwinEnvironment() || isOHOSFamily() || isMacOSXVersionLT(10, 7);
</span> }
/// Tests whether the target uses -data-sections as default.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.1 (Apple Git-122.3)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0021-10.6-and-less-libcxx-disable-Availability-tests.patch b/lang/llvm-devel/files/0021-10.6-and-less-libcxx-disable-Availability-tests.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f3077e25a24..b527d29d62b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0021-10.6-and-less-libcxx-disable-Availability-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0021-10.6-and-less-libcxx-disable-Availability-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,16 +20,13 @@ diff --git a/libcxx/include/__config b/libcxx/include/__config
</span> index a3838c89e8e1..685827372fd5 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,6 +10,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef _LIBCPP_CONFIG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _LIBCPP_CONFIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <__config_site>
</span>
+// for MacPorts, our installed libcxx does not require Apple system Availability tests
+#define _LIBCPP_DISABLE_AVAILABILITY
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(_MSC_VER) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.1 (Apple Git-122.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pragma GCC system_header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>