Skip to content

Commit

Permalink
Merge llvm-project release/18.x llvmorg-18-init-18361-g22683463740e
Browse files Browse the repository at this point in the history
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 878ed49)
  • Loading branch information
DimitryAndric committed Apr 19, 2024
1 parent 3f37aa8 commit 3f2e8ce
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion contrib/llvm-project/libcxx/include/__config
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions lib/clang/include/VCSVersion.inc
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions lib/clang/include/clang/Basic/Version.inc
Original file line number Diff line number Diff line change
@@ -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 "
2 changes: 1 addition & 1 deletion lib/clang/include/lld/Common/Version.inc
Original file line number Diff line number Diff line change
@@ -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) ")"
6 changes: 3 additions & 3 deletions lib/clang/include/lldb/Version/Version.inc
Original file line number Diff line number Diff line change
@@ -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 */
4 changes: 2 additions & 2 deletions lib/clang/include/llvm/Config/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions lib/clang/include/llvm/Config/llvm-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion lib/clang/include/llvm/Support/VCSRevision.h
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit 3f2e8ce

Please sign in to comment.