diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2022-07-27 20:11:54 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2023-04-09 14:54:48 +0000 |
commit | 74093eb27f687d9f89d8db457e410aec1cd71b6b (patch) | |
tree | fcd16e7627ee72b42c8dc9044d09c65fd7885a8e /lib | |
parent | 13a2180118bde2302097a9e6cc995c1b255724bb (diff) | |
download | src-74093eb27f687d9f89d8db457e410aec1cd71b6b.tar.gz src-74093eb27f687d9f89d8db457e410aec1cd71b6b.zip |
Merge llvm-project main llvmorg-15-init-17826-g1f8ae9d7e7e4
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-15-init-17826-g1f8ae9d7e7e4, the last commit before
the upstream release/16.x branch was created.
PR: 265425
MFC after: 2 weeks
(cherry picked from commit 972a253a57b6f144b0e4a3e2080a2a0076ec55a0)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/clang/include/VCSVersion.inc | 6 | ||||
-rw-r--r-- | lib/clang/include/clang/Config/config.h | 2 | ||||
-rw-r--r-- | lib/clang/include/lld/Common/Version.inc | 2 | ||||
-rw-r--r-- | lib/clang/include/lldb/Version/Version.inc | 4 | ||||
-rw-r--r-- | lib/clang/include/llvm/Config/config.h | 4 | ||||
-rw-r--r-- | lib/clang/include/llvm/Config/llvm-config.h | 2 | ||||
-rw-r--r-- | lib/clang/include/llvm/Support/VCSRevision.h | 2 | ||||
-rw-r--r-- | lib/clang/libclang/Makefile | 9 | ||||
-rw-r--r-- | lib/clang/liblldb/LLDBWrapLua.cpp | 2 | ||||
-rw-r--r-- | lib/libc++/Makefile | 20 |
10 files changed, 41 insertions, 12 deletions
diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 28ec17e11314..571ed75d3dc9 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,10 +1,10 @@ // $FreeBSD$ -#define LLVM_REVISION "llvmorg-15-init-17485-ga3e38b4a206b" +#define LLVM_REVISION "llvmorg-15-init-17826-g1f8ae9d7e7e4" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-15-init-17485-ga3e38b4a206b" +#define CLANG_REVISION "llvmorg-15-init-17826-g1f8ae9d7e7e4" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-15-init-17485-ga3e38b4a206b" +#define LLDB_REVISION "llvmorg-15-init-17826-g1f8ae9d7e7e4" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h index 49a883a045a5..6c3208239419 100644 --- a/lib/clang/include/clang/Config/config.h +++ b/lib/clang/include/clang/Config/config.h @@ -80,7 +80,7 @@ #define CLANG_HAVE_RLIMITS 1 /* The LLVM product name and version */ -#define BACKEND_PACKAGE_STRING "LLVM 15.0.0git" +#define BACKEND_PACKAGE_STRING "LLVM 15.0.0" /* Linker version detected at compile time. */ /* #undef HOST_LINK_VERSION */ diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 5290875aeba6..6e25b65b845e 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 1400005 -#define LLD_VERSION_STRING "15.0.0 (FreeBSD llvmorg-15-init-17485-ga3e38b4a206b-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "15.0.0 (FreeBSD llvmorg-15-init-17826-g1f8ae9d7e7e4-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index f2f189e58e28..919499091d2a 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,5 +1,5 @@ -#define LLDB_VERSION 15.0.0git -#define LLDB_VERSION_STRING "15.0.0git" +#define LLDB_VERSION 15.0.0 +#define LLDB_VERSION_STRING "15.0.0" #define LLDB_VERSION_MAJOR 15 #define LLDB_VERSION_MINOR 0 #define LLDB_VERSION_PATCH 0 diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 7b98178f61ac..4834ac961e39 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -353,10 +353,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 15.0.0git" +#define PACKAGE_STRING "LLVM 15.0.0" /* Define to the version of this package. */ -#define PACKAGE_VERSION "15.0.0git" +#define PACKAGE_VERSION "15.0.0" /* 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 fcc0e63063e2..e0f50991ec6d 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -77,7 +77,7 @@ #define LLVM_VERSION_PATCH 0 /* LLVM version string */ -#define LLVM_VERSION_STRING "15.0.0git" +#define LLVM_VERSION_STRING "15.0.0" /* 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 981b9a094d58..1405a0d08395 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define LLVM_REVISION "llvmorg-15-init-17485-ga3e38b4a206b" +#define LLVM_REVISION "llvmorg-15-init-17826-g1f8ae9d7e7e4" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 7be8a7442dc1..7181da12a065 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -525,6 +525,7 @@ SRCS_MIN+= Sema/SemaObjCProperty.cpp SRCS_MIN+= Sema/SemaOpenMP.cpp SRCS_MIN+= Sema/SemaOverload.cpp SRCS_MIN+= Sema/SemaPseudoObject.cpp +SRCS_MIN+= Sema/SemaRISCVVectorLookup.cpp SRCS_MIN+= Sema/SemaSYCL.cpp SRCS_MIN+= Sema/SemaStmt.cpp SRCS_MIN+= Sema/SemaStmtAsm.cpp @@ -733,6 +734,7 @@ SRCS_FUL+= StaticAnalyzer/Frontend/CreateCheckerManager.cpp SRCS_FUL+= StaticAnalyzer/Frontend/FrontendActions.cpp SRCS_FUL+= StaticAnalyzer/Frontend/ModelConsumer.cpp SRCS_FUL+= StaticAnalyzer/Frontend/ModelInjector.cpp +SRCS_MIN+= Support/RISCVVIntrinsicUtils.cpp SRCS_MIN+= Tooling/ArgumentsAdjusters.cpp SRCS_MIN+= Tooling/CommonOptionsParser.cpp SRCS_MIN+= Tooling/CompilationDatabase.cpp @@ -1028,6 +1030,13 @@ clang/Basic/riscv_vector_builtin_cg.inc: \ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td TGHDRS+= clang/Basic/riscv_vector_builtin_cg.inc +clang/Basic/riscv_vector_builtin_sema.inc: \ + ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_TBLGEN} -gen-riscv-vector-builtin-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td +TGHDRS+= clang/Basic/riscv_vector_builtin_sema.inc + clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td ${LLVM_TBLGEN} -gen-opt-parser-defs \ -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ diff --git a/lib/clang/liblldb/LLDBWrapLua.cpp b/lib/clang/liblldb/LLDBWrapLua.cpp index 061eb327c437..c6c778cd6955 100644 --- a/lib/clang/liblldb/LLDBWrapLua.cpp +++ b/lib/clang/liblldb/LLDBWrapLua.cpp @@ -72736,10 +72736,10 @@ static swig_lua_const_info swig_SwigModule_constants[]= { {SWIG_LUA_CONSTTAB_INT("eSaveCoreFull", lldb::eSaveCoreFull)}, {SWIG_LUA_CONSTTAB_INT("eSaveCoreDirtyOnly", lldb::eSaveCoreDirtyOnly)}, {SWIG_LUA_CONSTTAB_INT("eSaveCoreStackOnly", lldb::eSaveCoreStackOnly)}, - {SWIG_LUA_CONSTTAB_INT("eTraceCounterTSC", lldb::eTraceCounterTSC)}, {SWIG_LUA_CONSTTAB_INT("eTraceEventDisabledSW", lldb::eTraceEventDisabledSW)}, {SWIG_LUA_CONSTTAB_INT("eTraceEventDisabledHW", lldb::eTraceEventDisabledHW)}, {SWIG_LUA_CONSTTAB_INT("eTraceEventCPUChanged", lldb::eTraceEventCPUChanged)}, + {SWIG_LUA_CONSTTAB_INT("eTraceEventHWClockTick", lldb::eTraceEventHWClockTick)}, {SWIG_LUA_CONSTTAB_INT("eTraceItemKindError", lldb::eTraceItemKindError)}, {SWIG_LUA_CONSTTAB_INT("eTraceItemKindEvent", lldb::eTraceItemKindEvent)}, {SWIG_LUA_CONSTTAB_INT("eTraceItemKindInstruction", lldb::eTraceItemKindInstruction)}, diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index 822ba8ec6911..31ba04b7da7f 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -711,6 +711,7 @@ MEM_HEADERS+= ranges_construct_at.h MEM_HEADERS+= ranges_uninitialized_algorithms.h MEM_HEADERS+= raw_storage_iterator.h MEM_HEADERS+= shared_ptr.h +MEM_HEADERS+= swap_allocator.h MEM_HEADERS+= temporary_buffer.h MEM_HEADERS+= uninitialized_algorithms.h MEM_HEADERS+= unique_ptr.h @@ -844,10 +845,16 @@ TTR_HEADERS+= add_lvalue_reference.h TTR_HEADERS+= add_pointer.h TTR_HEADERS+= add_rvalue_reference.h TTR_HEADERS+= add_volatile.h +TTR_HEADERS+= aligned_storage.h +TTR_HEADERS+= aligned_union.h TTR_HEADERS+= alignment_of.h TTR_HEADERS+= apply_cv.h +TTR_HEADERS+= common_reference.h +TTR_HEADERS+= common_type.h TTR_HEADERS+= conditional.h TTR_HEADERS+= conjunction.h +TTR_HEADERS+= copy_cv.h +TTR_HEADERS+= copy_cvref.h TTR_HEADERS+= decay.h TTR_HEADERS+= disjunction.h TTR_HEADERS+= enable_if.h @@ -889,6 +896,7 @@ TTR_HEADERS+= is_move_assignable.h TTR_HEADERS+= is_move_constructible.h TTR_HEADERS+= is_nothrow_assignable.h TTR_HEADERS+= is_nothrow_constructible.h +TTR_HEADERS+= is_nothrow_convertible.h TTR_HEADERS+= is_nothrow_copy_assignable.h TTR_HEADERS+= is_nothrow_copy_constructible.h TTR_HEADERS+= is_nothrow_default_constructible.h @@ -900,6 +908,7 @@ TTR_HEADERS+= is_object.h TTR_HEADERS+= is_pod.h TTR_HEADERS+= is_pointer.h TTR_HEADERS+= is_polymorphic.h +TTR_HEADERS+= is_primary_template.h TTR_HEADERS+= is_reference.h TTR_HEADERS+= is_reference_wrapper.h TTR_HEADERS+= is_referenceable.h @@ -907,6 +916,7 @@ TTR_HEADERS+= is_same.h TTR_HEADERS+= is_scalar.h TTR_HEADERS+= is_scoped_enum.h TTR_HEADERS+= is_signed.h +TTR_HEADERS+= is_signed_integer.h TTR_HEADERS+= is_standard_layout.h TTR_HEADERS+= is_trivial.h TTR_HEADERS+= is_trivially_assignable.h @@ -921,18 +931,28 @@ TTR_HEADERS+= is_trivially_move_constructible.h TTR_HEADERS+= is_unbounded_array.h TTR_HEADERS+= is_union.h TTR_HEADERS+= is_unsigned.h +TTR_HEADERS+= is_unsigned_integer.h +TTR_HEADERS+= is_valid_expansion.h TTR_HEADERS+= is_void.h TTR_HEADERS+= is_volatile.h +TTR_HEADERS+= lazy.h +TTR_HEADERS+= make_32_64_or_128_bit.h +TTR_HEADERS+= make_signed.h +TTR_HEADERS+= make_unsigned.h +TTR_HEADERS+= nat.h TTR_HEADERS+= negation.h +TTR_HEADERS+= promote.h TTR_HEADERS+= rank.h TTR_HEADERS+= remove_all_extents.h TTR_HEADERS+= remove_const.h TTR_HEADERS+= remove_cv.h +TTR_HEADERS+= remove_cvref.h TTR_HEADERS+= remove_extent.h TTR_HEADERS+= remove_pointer.h TTR_HEADERS+= remove_reference.h TTR_HEADERS+= remove_volatile.h TTR_HEADERS+= type_identity.h +TTR_HEADERS+= type_list.h TTR_HEADERS+= underlying_type.h TTR_HEADERS+= void_t.h .for hdr in ${TTR_HEADERS} |