git: a1f98ae0a8cd - stable/13 - Merge llvm-project release/18.x llvmorg-18-init-18361-g22683463740e

The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=a1f98ae0a8cd6e032065e2b615f9dc2ed1520011

commit a1f98ae0a8cd6e032065e2b615f9dc2ed1520011
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-01-26 15:04:14 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-04-19 21:24:45 +0000

    Merge llvm-project release/18.x llvmorg-18-init-18361-g22683463740e
    
    This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
    openmp to llvm-project release/18.x llvmorg-18-init-18361-g22683463740e.
    
    PR:             276104
    MFC after:      1 month
    
    (cherry picked from commit 878ed4957e077721efaf90ab5b70dce86dc94f4b)
---
 contrib/llvm-project/libcxx/include/__config | 2 +-
 lib/clang/include/VCSVersion.inc             | 6 +++---
 lib/clang/include/clang/Basic/Version.inc    | 6 +++---
 lib/clang/include/lld/Common/Version.inc     | 2 +-
 lib/clang/include/lldb/Version/Version.inc   | 6 +++---
 lib/clang/include/llvm/Config/config.h       | 4 ++--
 lib/clang/include/llvm/Config/llvm-config.h  | 4 ++--
 lib/clang/include/llvm/Support/VCSRevision.h | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config
index 2eada10e96ce..8248cf3d2239 100644
--- a/contrib/llvm-project/libcxx/include/__config
+++ b/contrib/llvm-project/libcxx/include/__config
@@ -64,7 +64,7 @@
 // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM.
 // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 17.0.1 == 17.00.01), _LIBCPP_VERSION is
 // defined to XXYYZZ.
-#  define _LIBCPP_VERSION 180000
+#  define _LIBCPP_VERSION 180100
 
 #  define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y
 #  define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y)
diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc
index c4390452d813..ca4f5d50df14 100644
--- a/lib/clang/include/VCSVersion.inc
+++ b/lib/clang/include/VCSVersion.inc
@@ -1,8 +1,8 @@
-#define LLVM_REVISION "llvmorg-18-init-18359-g93248729cfae"
+#define LLVM_REVISION "llvmorg-18-init-18361-g22683463740e"
 #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
 
-#define CLANG_REVISION "llvmorg-18-init-18359-g93248729cfae"
+#define CLANG_REVISION "llvmorg-18-init-18361-g22683463740e"
 #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git"
 
-#define LLDB_REVISION "llvmorg-18-init-18359-g93248729cfae"
+#define LLDB_REVISION "llvmorg-18-init-18361-g22683463740e"
 #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git"
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index adf6c5966121..26d6b3b2938f 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,8 +1,8 @@
-#define	CLANG_VERSION			18.0.0git
-#define	CLANG_VERSION_STRING		"18.0.0git"
+#define	CLANG_VERSION			18.1.0rc
+#define	CLANG_VERSION_STRING		"18.1.0rc"
 #define	CLANG_VERSION_MAJOR		18
 #define	CLANG_VERSION_MAJOR_STRING	"18"
-#define	CLANG_VERSION_MINOR		0
+#define	CLANG_VERSION_MINOR		1
 #define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc
index 1ffb3458abd0..ff41eaf5ebbe 100644
--- a/lib/clang/include/lld/Common/Version.inc
+++ b/lib/clang/include/lld/Common/Version.inc
@@ -1,4 +1,4 @@
 // Local identifier in __FreeBSD_version style
 #define LLD_FREEBSD_VERSION 1400006
 
-#define LLD_VERSION_STRING "18.0.0 (FreeBSD llvmorg-18-init-18359-g93248729cfae-" __XSTRING(LLD_FREEBSD_VERSION) ")"
+#define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18-init-18361-g22683463740e-" __XSTRING(LLD_FREEBSD_VERSION) ")"
diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc
index c5e07a4eefbd..7a9546b4696f 100644
--- a/lib/clang/include/lldb/Version/Version.inc
+++ b/lib/clang/include/lldb/Version/Version.inc
@@ -1,6 +1,6 @@
-#define LLDB_VERSION 18.0.0git
-#define LLDB_VERSION_STRING "18.0.0git"
+#define LLDB_VERSION 18.1.0rc
+#define LLDB_VERSION_STRING "18.1.0rc"
 #define LLDB_VERSION_MAJOR 18
-#define LLDB_VERSION_MINOR 0
+#define LLDB_VERSION_MINOR 1
 #define LLDB_VERSION_PATCH 0
 /* #undef LLDB_FULL_VERSION_STRING */
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index fdc104e49231..718c44fff94d 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -344,10 +344,10 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 18.0.0git"
+#define PACKAGE_STRING "LLVM 18.1.0rc"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "18.0.0git"
+#define PACKAGE_VERSION "18.1.0rc"
 
 /* Define to the vendor of this package. */
 /* #undef PACKAGE_VENDOR */
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index f3555d0868e2..111e0a296ed5 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -177,13 +177,13 @@
 #define LLVM_VERSION_MAJOR 18
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 0
+#define LLVM_VERSION_MINOR 1
 
 /* Patch version of the LLVM API */
 #define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "18.0.0git"
+#define LLVM_VERSION_STRING "18.1.0rc"
 
 /* Whether LLVM records statistics for use with GetStatistics(),
  * PrintStatistics() or PrintStatisticsJSON()
diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h
index 7cc55b62be19..fa5c1df71357 100644
--- a/lib/clang/include/llvm/Support/VCSRevision.h
+++ b/lib/clang/include/llvm/Support/VCSRevision.h
@@ -1,2 +1,2 @@
-#define LLVM_REVISION "llvmorg-18-init-18359-g93248729cfae"
+#define LLVM_REVISION "llvmorg-18-init-18361-g22683463740e"
 #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"