git: dbc822f3bc53 - main - Merge llvm-project release/14.x llvmorg-14.0.0-2-g3f43d803382d

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Sat, 14 May 2022 11:50:14 UTC
The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=dbc822f3bc537e0d8350f63178397156bc163b1c

commit dbc822f3bc537e0d8350f63178397156bc163b1c
Merge: fb03ea46eb85 8a0619680e19
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-03-29 20:16:50 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-05-14 11:46:31 +0000

    Merge llvm-project release/14.x llvmorg-14.0.0-2-g3f43d803382d
    
    This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
    openmp to llvmorg-14.0.0-2-g3f43d803382d.
    
    PR:             261742
    MFC after:      2 weeks

 contrib/llvm-project/libcxx/include/span     | 8 +++++++-
 lib/clang/include/VCSVersion.inc             | 6 +++---
 lib/clang/include/lld/Common/Version.inc     | 2 +-
 lib/clang/include/llvm/Support/VCSRevision.h | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --cc lib/clang/include/VCSVersion.inc
index f5ca305f872e,000000000000..bed489b0b0fb
mode 100644,000000..100644
--- a/lib/clang/include/VCSVersion.inc
+++ b/lib/clang/include/VCSVersion.inc
@@@ -1,10 -1,0 +1,10 @@@
 +// $FreeBSD$
 +
- #define LLVM_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a"
++#define LLVM_REVISION "llvmorg-14.0.0-2-g3f43d803382d"
 +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
 +
- #define CLANG_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a"
++#define CLANG_REVISION "llvmorg-14.0.0-2-g3f43d803382d"
 +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git"
 +
- #define LLDB_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a"
++#define LLDB_REVISION "llvmorg-14.0.0-2-g3f43d803382d"
 +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git"
diff --cc lib/clang/include/lld/Common/Version.inc
index 29771a0900ff,000000000000..a469435359e8
mode 100644,000000..100644
--- a/lib/clang/include/lld/Common/Version.inc
+++ b/lib/clang/include/lld/Common/Version.inc
@@@ -1,4 -1,0 +1,4 @@@
 +// Local identifier in __FreeBSD_version style
 +#define LLD_FREEBSD_VERSION 1400003
 +
- #define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a-" __XSTRING(LLD_FREEBSD_VERSION) ")"
++#define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14.0.0-2-g3f43d803382d-" __XSTRING(LLD_FREEBSD_VERSION) ")"
diff --cc lib/clang/include/llvm/Support/VCSRevision.h
index fd42c33018a7,000000000000..5a7906b88e4d
mode 100644,000000..100644
--- a/lib/clang/include/llvm/Support/VCSRevision.h
+++ b/lib/clang/include/llvm/Support/VCSRevision.h
@@@ -1,3 -1,0 +1,3 @@@
 +/* $FreeBSD$ */
- #define LLVM_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a"
++#define LLVM_REVISION "llvmorg-14.0.0-2-g3f43d803382d"
 +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"