From 1583f85afca6c809225a402bd394c94f216a3a1e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 12 Jun 2024 12:42:19 -0700 Subject: =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20changes=20to?= =?UTF-8?q?=20main=20this=20commit=20is=20based=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.4 [skip ci] --- .github/workflows/version-check.py | 2 +- libcxx/include/__config | 2 +- llvm/CMakeLists.txt | 4 ++-- llvm/utils/gn/secondary/llvm/version.gni | 2 +- llvm/utils/lit/lit/__init__.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/version-check.py b/.github/workflows/version-check.py index 7f805f3..f75fd50 100755 --- a/.github/workflows/version-check.py +++ b/.github/workflows/version-check.py @@ -16,7 +16,7 @@ def get_version_from_tag(tag): m = re.match("llvmorg-([0-9]+)-init", tag) if m: - return (m.group(1), "0", "0") + return (m.group(1), "1", "0") raise Exception(f"error: Tag is not valid: {tag}") diff --git a/libcxx/include/__config b/libcxx/include/__config index 9557e8e..18875e1 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -62,7 +62,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/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 1d23000..c2fb77d 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -19,13 +19,13 @@ if(NOT DEFINED LLVM_VERSION_MAJOR) set(LLVM_VERSION_MAJOR 18) endif() if(NOT DEFINED LLVM_VERSION_MINOR) - set(LLVM_VERSION_MINOR 0) + set(LLVM_VERSION_MINOR 1) endif() if(NOT DEFINED LLVM_VERSION_PATCH) set(LLVM_VERSION_PATCH 0) endif() if(NOT DEFINED LLVM_VERSION_SUFFIX) - set(LLVM_VERSION_SUFFIX git) + set(LLVM_VERSION_SUFFIX rc) endif() if (NOT PACKAGE_VERSION) diff --git a/llvm/utils/gn/secondary/llvm/version.gni b/llvm/utils/gn/secondary/llvm/version.gni index f113759..e55c1ed 100644 --- a/llvm/utils/gn/secondary/llvm/version.gni +++ b/llvm/utils/gn/secondary/llvm/version.gni @@ -1,4 +1,4 @@ llvm_version_major = 18 -llvm_version_minor = 0 +llvm_version_minor = 1 llvm_version_patch = 0 llvm_version = "$llvm_version_major.$llvm_version_minor.$llvm_version_patch" diff --git a/llvm/utils/lit/lit/__init__.py b/llvm/utils/lit/lit/__init__.py index 1eea088..20e245f 100644 --- a/llvm/utils/lit/lit/__init__.py +++ b/llvm/utils/lit/lit/__init__.py @@ -2,7 +2,7 @@ __author__ = "Daniel Dunbar" __email__ = "daniel@minormatter.com" -__versioninfo__ = (18, 0, 0) +__versioninfo__ = (18, 1, 0) __version__ = ".".join(str(v) for v in __versioninfo__) + "dev" __all__ = [] -- cgit v1.1