git: 3bd749dbd90c - main - Merge llvm-project release/17.x llvmorg-17.0.2-0-gb2417f51dbbd

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Fri, 08 Dec 2023 17:38:55 UTC
The branch main has been updated by dim:

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

commit 3bd749dbd90cc3b95719b65393df5ca8a0fe919d
Merge: 4542f901cb0c 7d1b50167725
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-10-04 18:24:05 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-12-08 17:35:33 +0000

    Merge llvm-project release/17.x llvmorg-17.0.2-0-gb2417f51dbbd
    
    This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
    openmp to llvmorg-17.0.2-0-gb2417f51dbbd.
    
    PR:             273753
    MFC after:      1 month

 .../clang/lib/Driver/ToolChains/MinGW.cpp          |  7 ++--
 .../llvm-project/libcxx/include/__utility/pair.h   |  4 +--
 contrib/llvm-project/lld/COFF/Driver.cpp           | 42 +++++++++++-----------
 contrib/llvm-project/lld/Common/Filesystem.cpp     |  2 +-
 .../lib/CodeGen/TargetLoweringObjectFileImpl.cpp   |  2 +-
 lib/clang/include/VCSVersion.inc                   |  6 ++--
 lib/clang/include/lld/Common/Version.inc           |  2 +-
 lib/clang/include/llvm/Support/VCSRevision.h       |  2 +-
 8 files changed, 36 insertions(+), 31 deletions(-)

diff --cc lib/clang/include/VCSVersion.inc
index c4338e330ee5,000000000000..09e5bd0806a8
mode 100644,000000..100644
--- a/lib/clang/include/VCSVersion.inc
+++ b/lib/clang/include/VCSVersion.inc
@@@ -1,8 -1,0 +1,8 @@@
- #define LLVM_REVISION "llvmorg-17.0.1-25-g098e653a5bed"
++#define LLVM_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd"
 +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
 +
- #define CLANG_REVISION "llvmorg-17.0.1-25-g098e653a5bed"
++#define CLANG_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd"
 +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git"
 +
- #define LLDB_REVISION "llvmorg-17.0.1-25-g098e653a5bed"
++#define LLDB_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd"
 +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git"
diff --cc lib/clang/include/lld/Common/Version.inc
index 9341b11bbc19,000000000000..dacfc6668edb
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 1500000
 +
- #define LLD_VERSION_STRING "17.0.2 (FreeBSD llvmorg-17.0.1-25-g098e653a5bed-" __XSTRING(LLD_FREEBSD_VERSION) ")"
++#define LLD_VERSION_STRING "17.0.2 (FreeBSD llvmorg-17.0.2-0-gb2417f51dbbd-" __XSTRING(LLD_FREEBSD_VERSION) ")"
diff --cc lib/clang/include/llvm/Support/VCSRevision.h
index 796a12cb1ea0,000000000000..846d3cb3e014
mode 100644,000000..100644
--- a/lib/clang/include/llvm/Support/VCSRevision.h
+++ b/lib/clang/include/llvm/Support/VCSRevision.h
@@@ -1,2 -1,0 +1,2 @@@
- #define LLVM_REVISION "llvmorg-17.0.1-25-g098e653a5bed"
++#define LLVM_REVISION "llvmorg-17.0.2-0-gb2417f51dbbd"
 +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"