Fixup: Merge llvm-project release/18.x llvmorg-18.1.5-0-g617a15a9eac9

Update version numbers, config headers, etc. Git tricked me into losing
these before pushing.

PR:		276104
Fixes:		d67fc74b9249
MFC after:	3 days
This commit is contained in:
Dimitry Andric 2024-05-04 12:19:32 +02:00
parent 5678d1d98a
commit 894cb08f0d
7 changed files with 15 additions and 15 deletions

View file

@ -1,8 +1,8 @@
#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6"
#define LLVM_REVISION "llvmorg-18.1.5-0-g617a15a9eac9"
#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
#define CLANG_REVISION "llvmorg-18.1.4-0-ge6c3289804a6"
#define CLANG_REVISION "llvmorg-18.1.5-0-g617a15a9eac9"
#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git"
#define LLDB_REVISION "llvmorg-18.1.4-0-ge6c3289804a6"
#define LLDB_REVISION "llvmorg-18.1.5-0-g617a15a9eac9"
#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git"

View file

@ -1,8 +1,8 @@
#define CLANG_VERSION 18.1.4
#define CLANG_VERSION_STRING "18.1.4"
#define CLANG_VERSION 18.1.5
#define CLANG_VERSION_STRING "18.1.5"
#define CLANG_VERSION_MAJOR 18
#define CLANG_VERSION_MAJOR_STRING "18"
#define CLANG_VERSION_MINOR 1
#define CLANG_VERSION_PATCHLEVEL 4
#define CLANG_VERSION_PATCHLEVEL 5
#define CLANG_VENDOR "FreeBSD "

View file

@ -1,4 +1,4 @@
// Local identifier in __FreeBSD_version style
#define LLD_FREEBSD_VERSION 1500000
#define LLD_VERSION_STRING "18.1.4 (FreeBSD llvmorg-18.1.4-0-ge6c3289804a6-" __XSTRING(LLD_FREEBSD_VERSION) ")"
#define LLD_VERSION_STRING "18.1.5 (FreeBSD llvmorg-18.1.5-0-g617a15a9eac9-" __XSTRING(LLD_FREEBSD_VERSION) ")"

View file

@ -1,6 +1,6 @@
#define LLDB_VERSION 18.1.4
#define LLDB_VERSION_STRING "18.1.4"
#define LLDB_VERSION 18.1.5
#define LLDB_VERSION_STRING "18.1.5"
#define LLDB_VERSION_MAJOR 18
#define LLDB_VERSION_MINOR 1
#define LLDB_VERSION_PATCH 4
#define LLDB_VERSION_PATCH 5
/* #undef LLDB_FULL_VERSION_STRING */

View file

@ -344,10 +344,10 @@
#define PACKAGE_NAME "LLVM"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "LLVM 18.1.4"
#define PACKAGE_STRING "LLVM 18.1.5"
/* Define to the version of this package. */
#define PACKAGE_VERSION "18.1.4"
#define PACKAGE_VERSION "18.1.5"
/* Define to the vendor of this package. */
/* #undef PACKAGE_VENDOR */

View file

@ -180,10 +180,10 @@
#define LLVM_VERSION_MINOR 1
/* Patch version of the LLVM API */
#define LLVM_VERSION_PATCH 4
#define LLVM_VERSION_PATCH 5
/* LLVM version string */
#define LLVM_VERSION_STRING "18.1.4"
#define LLVM_VERSION_STRING "18.1.5"
/* Whether LLVM records statistics for use with GetStatistics(),
* PrintStatistics() or PrintStatisticsJSON()

View file

@ -1,2 +1,2 @@
#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6"
#define LLVM_REVISION "llvmorg-18.1.5-0-g617a15a9eac9"
#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"