From 894cb08f0d3656fdb81f4d89085bedc4235f3cb6 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 4 May 2024 12:19:32 +0200 Subject: 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 --- 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 +- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 687fb1656937..c4bb0df4e3a5 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -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" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 536f72efec52..c243016c5f73 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.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 " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 66642a489e94..8b21c19f95ba 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 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) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 1fc1a4d88b7b..0e86bd2e01ba 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.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 */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index a017437dc568..0760c0b17a87 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.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 */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index fb878ccdde4d..5ac5d07a3539 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -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() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index e324de0f9fc6..433b2b53b8fe 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.1.4-0-ge6c3289804a6" +#define LLVM_REVISION "llvmorg-18.1.5-0-g617a15a9eac9" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -- cgit v1.2.3