From nobody Sat Apr 20 10:34:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM7DV02RYz5HWfK; Sat, 20 Apr 2024 10:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VM7DT2h9vz4SsX; Sat, 20 Apr 2024 10:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UqTkprAR8JhFZR1Wt69sWH2bVkMSVwHgUJ2p1OR/soU=; b=ZREtPPRrGe8gV0u+mIa0bbIxvTdyCr3i/b7gw5POH7IQlltc59d/8xijf8hAviF2FYb3HI SLPy4SZza5gJndL43jdEljgtBhRWjwGAFDEwKjbZQrsFcey1pXAaMcgxiej4n3ywg+hjpt AM+3/Csi/vOwuZjBHsxH8wiuV9Vz3+NFpLJu1BQSmJdwlnNn5zHTQ68gAcGpYZaijcWD08 XPc/mFjqplOgrfXrfyQnT09nEYVs7bexy3kD1LiLtPXPL+0+JXvFsJKyHHEoqoZxuFuRTk X2GVnhyolRHS8roatfIhBzZlroV9x/rb9oKXJ4dKEF0XdrVvybOaeoJjS63IFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609273; a=rsa-sha256; cv=none; b=qQNbxlRkn7X5i3UzzKMZL7ZGLWOAL2i5Q+s6KAx5Ppq6QJeLVhW3Q2Zr1lEosgmT6D5JdC cpaIvJOLB9p9iRAyNTVjlh8HGl9JQGxWNDMHPZlWxEQg5oO6GAJhopkZq0HRd/ww9XNx0P n5AZmDHPbGd1Sw9AYPKzaU1wrlizqnb/3B4w+BFCARCeIuw94AV/aQ2QRCG3UqcFR0SG3U R0qQsN2/IPoZOFi0UeNr0DTw6uQcb58nFao+R+21qc+CX1wDGw9dF+VZ57UUdBpwoDvlVQ 5IJIBjz0ag4x2kKYLYjLF8TKs4RhNZ1zRTOthHQ8J1qp8kISW3QzrCuVtYqtLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UqTkprAR8JhFZR1Wt69sWH2bVkMSVwHgUJ2p1OR/soU=; b=Lp2nVIpK1uXT0gJDty6tKJZbjVnFutDoyRIAsXESQpf17oYhO5NQN+6wRAKQo0HChxvaFi dmn3xX2pX4g3K/bGMT0esJK+3XXq1B0JpHnPIdndJ5yvWwKZAwZyjiZPRXEaBVshvTBdqB ZxKkgZqyz9PEFfrTLUI/tbGCEghBX9yacqbjIQCN6jNm+7FlPrfPKclv5HxHoL17s+WH6h +1ry5ONx4Q+DlSsdSYKBT6U1yvjynwMmPvzh+XTUP/DqLjykSMSORjy6nOLHSGqNB1Df0a enqZK17wuTCXMvudTEwtF1icd8RK3wWm5mfsyXEaf7+Py9iL+SHPZoSJfxyQHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM7DT2HC0zZJN; Sat, 20 Apr 2024 10:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43KAYXph013709; Sat, 20 Apr 2024 10:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAYXvD013706; Sat, 20 Apr 2024 10:34:33 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:34:33 GMT Message-Id: <202404201034.43KAYXvD013706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a1f98ae0a8cd - stable/13 - Merge llvm-project release/18.x llvmorg-18-init-18361-g22683463740e List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a1f98ae0a8cd6e032065e2b615f9dc2ed1520011 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a1f98ae0a8cd6e032065e2b615f9dc2ed1520011 commit a1f98ae0a8cd6e032065e2b615f9dc2ed1520011 Author: Dimitry Andric AuthorDate: 2024-01-26 15:04:14 +0000 Commit: Dimitry Andric 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"