Merge llvm-project release/14.x llvmorg-14-init-18315-g190be5457c90

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-14-init-18315-g190be5457c90. PR: 261742 MFC after: 2 weeks
2022-02-05 23:51:07 +01:00 · 2022-02-05 23:51:07 +01:00 · 1838bd0f48
commit 1838bd0f48
parent 1fd87a682a 1e9a9d6d05
74 changed files with 241 additions and 164 deletions
--- a/Makefile.inc1
+++ b/Makefile.inc1
@ -267,14 +267,13 @@ WANT_LINKER_TYPE=
 .if !defined(WANT_LINKER_FREEBSD_VERSION) && !make(showconfig) && \
    !make(test-system-compiler)
 .if ${WANT_LINKER_TYPE} == "lld"
-WANT_LINKER_FREEBSD_VERSION_FILE= lib/clang/include/VCSVersion.inc
-_WANT_LINKER_FREEBSD_VERSION!= \
-	awk '$$2 == "LLD_REVISION" {gsub(/"/, "", $$3); print $$3}' \
+WANT_LINKER_FREEBSD_VERSION_FILE= lib/clang/include/lld/Common/Version.inc
+WANT_LINKER_FREEBSD_VERSION!= \
+	awk '$$2 == "LLD_FREEBSD_VERSION" {print $$3}' \
 	${SRCDIR}/${WANT_LINKER_FREEBSD_VERSION_FILE} || echo unknown
-WANT_LINKER_FREEBSD_VERSION=${_WANT_LINKER_FREEBSD_VERSION:C/.*-(.*)/\1/}
 WANT_LINKER_VERSION_FILE= lib/clang/include/lld/Common/Version.inc
 WANT_LINKER_VERSION!= \
-	awk '$$2 == "LLD_VERSION_STRING" { gsub("\"", "", $$3); split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \
+	awk '$$2 == "LLD_VERSION_STRING" {gsub("\"", "", $$3); split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \
 	${SRCDIR}/${WANT_LINKER_VERSION_FILE} || echo unknown
 .else
 WANT_LINKER_FREEBSD_VERSION_FILE=
--- a/contrib/llvm-project/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/Linux.cpp
@ -687,7 +687,7 @@ bool Linux::IsAArch64OutlineAtomicsDefault(const ArgList &Args) const {
 }

 bool Linux::IsMathErrnoDefault() const {
-  if (getTriple().isAndroid())
+  if (getTriple().isAndroid() || getTriple().isMusl())
    return false;
  return Generic_ELF::IsMathErrnoDefault();
 }
--- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
@ -217,7 +217,7 @@ namespace __sanitizer {
  unsigned struct_sockaddr_sz = sizeof(struct sockaddr);

  unsigned ucontext_t_sz(void *ctx) {
-#    if SANITIZER_LINUX && SANITIZER_X64
+#    if SANITIZER_GLIBC && SANITIZER_X64
    // See kernel arch/x86/kernel/fpu/signal.c for details.
    const auto *fpregs = static_cast<ucontext_t *>(ctx)->uc_mcontext.fpregs;
    // The member names differ across header versions, but the actual layout
--- a/contrib/llvm-project/libcxx/include/__algorithm/in_in_out_result.h
+++ b/contrib/llvm-project/libcxx/include/__algorithm/in_in_out_result.h
@ -14,11 +14,16 @@
 #include <__config>
 #include <__utility/move.h>

+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
 _LIBCPP_BEGIN_NAMESPACE_STD

-#ifndef _LIBCPP_HAS_NO_CONCEPTS
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 namespace ranges {
+
 template <class _I1, class _I2, class _O1>
 struct in_in_out_result {
  [[no_unique_address]] _I1 in1;
@ -39,10 +44,11 @@ struct in_in_out_result {
    return {_VSTD::move(in1), _VSTD::move(in2), _VSTD::move(out)};
  }
 };
+
 } // namespace ranges

-#endif // _LIBCPP_HAS_NO_CONCEPTS
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

-#endif // _LIBCPP___ALGORITHM_IN_IN_RESULT_H
+#endif // _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H
--- a/contrib/llvm-project/libcxx/include/__algorithm/in_in_result.h
+++ b/contrib/llvm-project/libcxx/include/__algorithm/in_in_result.h
@ -14,11 +14,16 @@
 #include <__config>
 #include <__utility/move.h>

+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
 _LIBCPP_BEGIN_NAMESPACE_STD

-#ifndef _LIBCPP_HAS_NO_CONCEPTS
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 namespace ranges {
+
 template <class _I1, class _I2>
 struct in_in_result {
  [[no_unique_address]] _I1 in1;
@ -36,9 +41,10 @@ struct in_in_result {
  _LIBCPP_HIDE_FROM_ABI constexpr
  operator in_in_result<_II1, _II2>() && { return {_VSTD::move(in1), _VSTD::move(in2)}; }
 };
+
 } // namespace ranges

-#endif // _LIBCPP_HAS_NO_CONCEPTS
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__algorithm/in_out_result.h
+++ b/contrib/llvm-project/libcxx/include/__algorithm/in_out_result.h
@ -21,6 +21,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD

 #if !defined(_LIBCPP_HAS_NO_CONCEPTS)
+
 namespace ranges {

 template<class _InputIterator, class _OutputIterator>
@ -45,6 +46,7 @@ struct in_out_result {
 };

 } // namespace ranges
+
 #endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD
--- a/contrib/llvm-project/libcxx/include/__chrono/duration.h
+++ b/contrib/llvm-project/libcxx/include/__chrono/duration.h
@ -251,7 +251,7 @@ public:
        explicit duration(const _Rep2& __r,
            typename enable_if
            <
-               is_convertible<_Rep2, rep>::value &&
+               is_convertible<const _Rep2&, rep>::value &&
               (treat_as_floating_point<rep>::value ||
               !treat_as_floating_point<_Rep2>::value)
            >::type* = nullptr)
--- a/contrib/llvm-project/libcxx/include/__compare/compare_partial_order_fallback.h
+++ b/contrib/llvm-project/libcxx/include/__compare/compare_partial_order_fallback.h
@ -22,7 +22,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [cmp.alg]
 namespace __compare_partial_order_fallback {
@ -66,7 +66,7 @@ inline namespace __cpo {
    inline constexpr auto compare_partial_order_fallback = __compare_partial_order_fallback::__fn{};
 } // namespace __cpo

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__compare/compare_strong_order_fallback.h
+++ b/contrib/llvm-project/libcxx/include/__compare/compare_strong_order_fallback.h
@ -22,7 +22,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [cmp.alg]
 namespace __compare_strong_order_fallback {
@ -63,7 +63,7 @@ inline namespace __cpo {
    inline constexpr auto compare_strong_order_fallback = __compare_strong_order_fallback::__fn{};
 } // namespace __cpo

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__compare/compare_three_way.h
+++ b/contrib/llvm-project/libcxx/include/__compare/compare_three_way.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 struct _LIBCPP_TEMPLATE_VIS compare_three_way
 {
@ -34,7 +34,7 @@ struct _LIBCPP_TEMPLATE_VIS compare_three_way
    using is_transparent = void;
 };

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__compare/compare_weak_order_fallback.h
+++ b/contrib/llvm-project/libcxx/include/__compare/compare_weak_order_fallback.h
@ -22,7 +22,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [cmp.alg]
 namespace __compare_weak_order_fallback {
@ -63,7 +63,7 @@ inline namespace __cpo {
    inline constexpr auto compare_weak_order_fallback = __compare_weak_order_fallback::__fn{};
 } // namespace __cpo

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__compare/partial_order.h
+++ b/contrib/llvm-project/libcxx/include/__compare/partial_order.h
@ -23,7 +23,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [cmp.alg]
 namespace __partial_order {
@ -64,7 +64,7 @@ inline namespace __cpo {
    inline constexpr auto partial_order = __partial_order::__fn{};
 } // namespace __cpo

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__compare/strong_order.h
+++ b/contrib/llvm-project/libcxx/include/__compare/strong_order.h
@ -29,7 +29,7 @@ _LIBCPP_PUSH_MACROS

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [cmp.alg]
 namespace __strong_order {
@ -127,7 +127,7 @@ inline namespace __cpo {
    inline constexpr auto strong_order = __strong_order::__fn{};
 } // namespace __cpo

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__compare/synth_three_way.h
+++ b/contrib/llvm-project/libcxx/include/__compare/synth_three_way.h
@ -21,7 +21,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [expos.only.func]

@ -44,7 +44,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr auto __synth_three_way =
 template <class _Tp, class _Up = _Tp>
 using __synth_three_way_result = decltype(__synth_three_way(declval<_Tp&>(), declval<_Up&>()));

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__compare/three_way_comparable.h
+++ b/contrib/llvm-project/libcxx/include/__compare/three_way_comparable.h
@ -24,7 +24,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 template<class _Tp, class _Cat>
 concept __compares_as =
@ -51,7 +51,7 @@ concept three_way_comparable_with =
    { __u <=> __t } -> __compares_as<_Cat>;
  };

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__compare/weak_order.h
+++ b/contrib/llvm-project/libcxx/include/__compare/weak_order.h
@ -24,7 +24,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [cmp.alg]
 namespace __weak_order {
@ -93,7 +93,7 @@ inline namespace __cpo {
    inline constexpr auto weak_order = __weak_order::__fn{};
 } // namespace __cpo

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/arithmetic.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/arithmetic.h
@ -18,7 +18,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concepts.arithmetic], arithmetic concepts

@ -41,7 +41,7 @@ concept __libcpp_unsigned_integer = __libcpp_is_unsigned_integer<_Tp>::value;
 template <class _Tp>
 concept __libcpp_signed_integer = __libcpp_is_signed_integer<_Tp>::value;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/assignable.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/assignable.h
@ -21,7 +21,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.assignable]

@ -33,7 +33,7 @@ concept assignable_from =
    { __lhs = _VSTD::forward<_Rhs>(__rhs) } -> same_as<_Lhs>;
  };

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/boolean_testable.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/boolean_testable.h
@ -19,7 +19,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concepts.booleantestable]

@ -31,7 +31,7 @@ concept __boolean_testable = __boolean_testable_impl<_Tp> && requires(_Tp&& __t)
  { !_VSTD::forward<_Tp>(__t) } -> __boolean_testable_impl;
 };

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/class_or_enum.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/class_or_enum.h
@ -18,7 +18,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // Whether a type is a class type or enumeration type according to the Core wording.

@ -29,7 +29,7 @@ concept __class_or_enum = is_class_v<_Tp> || is_union_v<_Tp> || is_enum_v<_Tp>;
 template<class _Tp>
 concept __workaround_52970 = is_class_v<__uncvref_t<_Tp>> || is_union_v<__uncvref_t<_Tp>>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/common_reference_with.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/common_reference_with.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.commonref]

@ -30,7 +30,7 @@ concept common_reference_with =
  convertible_to<_Tp, common_reference_t<_Tp, _Up>> &&
  convertible_to<_Up, common_reference_t<_Tp, _Up>>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/common_with.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/common_with.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.common]

@ -40,7 +40,7 @@ concept common_with =
      add_lvalue_reference_t<const _Tp>,
      add_lvalue_reference_t<const _Up>>>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/constructible.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/constructible.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.constructible]
 template<class _Tp, class... _Args>
@ -49,7 +49,7 @@ concept copy_constructible =
  constructible_from<_Tp, const _Tp&> && convertible_to<const _Tp&, _Tp> &&
  constructible_from<_Tp, const _Tp> && convertible_to<const _Tp, _Tp>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/convertible_to.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/convertible_to.h
@ -19,7 +19,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.convertible]

@ -30,7 +30,7 @@ concept convertible_to =
    static_cast<_To>(declval<_From>());
  };

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/copyable.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/copyable.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concepts.object]

@ -32,7 +32,7 @@ concept copyable =
  assignable_from<_Tp&, const _Tp&> &&
  assignable_from<_Tp&, const _Tp>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/derived_from.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/derived_from.h
@ -18,7 +18,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.derived]

@ -27,7 +27,7 @@ concept derived_from =
  is_base_of_v<_Bp, _Dp> &&
  is_convertible_v<const volatile _Dp*, const volatile _Bp*>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/destructible.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/destructible.h
@ -18,14 +18,14 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.destructible]

 template<class _Tp>
 concept destructible = is_nothrow_destructible_v<_Tp>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/different_from.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/different_from.h
@ -19,12 +19,12 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 template<class _Tp, class _Up>
 concept __different_from = !same_as<remove_cvref_t<_Tp>, remove_cvref_t<_Up>>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/equality_comparable.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/equality_comparable.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.equalitycomparable]

@ -46,7 +46,7 @@ concept equality_comparable_with =
      __make_const_lvalue_ref<_Up>>> &&
  __weakly_equality_comparable_with<_Tp, _Up>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/invocable.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/invocable.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.invocable]

@ -34,7 +34,7 @@ concept invocable = requires(_Fn&& __fn, _Args&&... __args) {
 template<class _Fn, class... _Args>
 concept regular_invocable = invocable<_Fn, _Args...>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/movable.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/movable.h
@ -21,7 +21,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concepts.object]

@ -32,7 +32,7 @@ concept movable =
  assignable_from<_Tp&, _Tp> &&
  swappable<_Tp>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/predicate.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/predicate.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.predicate]

@ -28,7 +28,7 @@ template<class _Fn, class... _Args>
 concept predicate =
  regular_invocable<_Fn, _Args...> && __boolean_testable<invoke_result_t<_Fn, _Args...>>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/regular.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/regular.h
@ -19,14 +19,14 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.object]

 template<class _Tp>
 concept regular = semiregular<_Tp> && equality_comparable<_Tp>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/relation.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/relation.h
@ -18,7 +18,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.relation]

@ -37,7 +37,7 @@ concept equivalence_relation = relation<_Rp, _Tp, _Up>;
 template<class _Rp, class _Tp, class _Up>
 concept strict_weak_order = relation<_Rp, _Tp, _Up>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/same_as.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/same_as.h
@ -18,7 +18,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.same]

@ -28,7 +28,7 @@ concept __same_as_impl = _IsSame<_Tp, _Up>::value;
 template<class _Tp, class _Up>
 concept same_as = __same_as_impl<_Tp, _Up> && __same_as_impl<_Up, _Tp>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/semiregular.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/semiregular.h
@ -19,14 +19,14 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.object]

 template<class _Tp>
 concept semiregular = copyable<_Tp> && default_initializable<_Tp>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/swappable.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/swappable.h
@ -25,7 +25,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.swappable]

@ -109,7 +109,7 @@ concept swappable_with =
    ranges::swap(_VSTD::forward<_Up>(__u), _VSTD::forward<_Tp>(__t));
  };

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__concepts/totally_ordered.h
+++ b/contrib/llvm-project/libcxx/include/__concepts/totally_ordered.h
@ -20,7 +20,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [concept.totallyordered]

@ -50,7 +50,7 @@ concept totally_ordered_with =
      __make_const_lvalue_ref<_Up>>> &&
  __partially_ordered_with<_Tp, _Up>;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__config
+++ b/contrib/llvm-project/libcxx/include/__config
@ -115,7 +115,7 @@
 // about ABI compatibility.
 #  define _LIBCPP_ABI_NO_RANDOM_DEVICE_COMPATIBILITY_LAYOUT
 // Remove basic_string common base
-#  define _LIBCPP_ABI_NO_BASIC_STRING_BASE_CLASS
+#  define _LIBCPP_ABI_DO_NOT_EXPORT_BASIC_STRING_COMMON
 #elif _LIBCPP_ABI_VERSION == 1
 #  if !defined(_LIBCPP_OBJECT_FORMAT_COFF)
 // Enable compiling copies of now inline methods into the dylib to support
--- a/contrib/llvm-project/libcxx/include/__iterator/distance.h
+++ b/contrib/llvm-project/libcxx/include/__iterator/distance.h
@ -52,7 +52,7 @@ distance(_InputIter __first, _InputIter __last)
    return _VSTD::__distance(__first, __last, typename iterator_traits<_InputIter>::iterator_category());
 }

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [range.iter.op.distance]

@ -100,7 +100,7 @@ inline namespace __cpo {
 } // namespace __cpo
 } // namespace ranges

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__iterator/indirectly_comparable.h
+++ b/contrib/llvm-project/libcxx/include/__iterator/indirectly_comparable.h
@ -17,13 +17,13 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#ifndef _LIBCPP_HAS_NO_CONCEPTS
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 template <class _I1, class _I2, class _Rp, class _P1 = identity, class _P2 = identity>
 concept indirectly_comparable =
  indirect_binary_predicate<_Rp, projected<_I1, _P1>, projected<_I2, _P2>>;

-#endif // _LIBCPP_HAS_NO_CONCEPTS
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__iterator/insert_iterator.h
+++ b/contrib/llvm-project/libcxx/include/__iterator/insert_iterator.h
@ -24,7 +24,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
 template <class _Container>
 using __insert_iterator_iter_t = ranges::iterator_t<_Container>;
 #else
--- a/contrib/llvm-project/libcxx/include/__iterator/reverse_iterator.h
+++ b/contrib/llvm-project/libcxx/include/__iterator/reverse_iterator.h
@ -184,7 +184,7 @@ operator<=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>&
    return __x.base() >= __y.base();
 }

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
 template <class _Iter1, three_way_comparable_with<_Iter1> _Iter2>
 _LIBCPP_HIDE_FROM_ABI constexpr
 compare_three_way_result_t<_Iter1, _Iter2>
--- a/contrib/llvm-project/libcxx/include/__random/uniform_random_bit_generator.h
+++ b/contrib/llvm-project/libcxx/include/__random/uniform_random_bit_generator.h
@ -24,7 +24,7 @@ _LIBCPP_PUSH_MACROS

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [rand.req.urng]
 template<class _Gen>
@ -36,7 +36,7 @@ concept uniform_random_bit_generator =
    requires bool_constant<(_Gen::min() < _Gen::max())>::value;
  };

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__ranges/access.h
+++ b/contrib/llvm-project/libcxx/include/__ranges/access.h
@ -59,10 +59,17 @@ namespace __begin {

  struct __fn {
    template <class _Tp>
-      requires is_array_v<remove_cv_t<_Tp>>
-    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp& __t) const noexcept
+    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp (&__t)[]) const noexcept
+      requires (sizeof(_Tp) != 0)  // Disallow incomplete element types.
    {
-      return __t;
+      return __t + 0;
+    }
+
+    template <class _Tp, size_t _Np>
+    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp (&__t)[_Np]) const noexcept
+      requires (sizeof(_Tp) != 0)  // Disallow incomplete element types.
+    {
+      return __t + 0;
    }

    template <class _Tp>
@ -127,7 +134,7 @@ namespace __end {
  public:
    template <class _Tp, size_t _Np>
    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp (&__t)[_Np]) const noexcept
-      requires (sizeof(*__t) != 0)  // Disallow incomplete element types.
+      requires (sizeof(_Tp) != 0)  // Disallow incomplete element types.
    {
      return __t + _Np;
    }
--- a/contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h
+++ b/contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h
@ -22,7 +22,7 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 namespace ranges
 {
@ -34,7 +34,7 @@ inline constexpr bool enable_borrowed_range = false;

 } // namespace ranges

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__ranges/non_propagating_cache.h
+++ b/contrib/llvm-project/libcxx/include/__ranges/non_propagating_cache.h
@ -107,7 +107,7 @@ namespace ranges {
  struct __empty_cache { };
 } // namespace ranges

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/__utility/cmp.h
+++ b/contrib/llvm-project/libcxx/include/__utility/cmp.h
@ -24,7 +24,7 @@ _LIBCPP_PUSH_MACROS

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
 template<class _Tp, class... _Up>
 struct _IsSameAsAny : _Or<_IsSame<_Tp, _Up>...> {};

--- a/contrib/llvm-project/libcxx/include/__utility/pair.h
+++ b/contrib/llvm-project/libcxx/include/__utility/pair.h
@ -330,7 +330,7 @@ operator==(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
    return __x.first == __y.first && __x.second == __y.second;
 }

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 template <class _T1, class _T2>
 _LIBCPP_HIDE_FROM_ABI constexpr
@ -345,7 +345,7 @@ operator<=>(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
    return _VSTD::__synth_three_way(__x.second, __y.second);
 }

-#else // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#else // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 template <class _T1, class _T2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
@ -387,7 +387,7 @@ operator<=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
    return !(__y < __x);
 }

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 template <class _T1, class _T2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
--- a/contrib/llvm-project/libcxx/include/module.modulemap
+++ b/contrib/llvm-project/libcxx/include/module.modulemap
@ -2,7 +2,8 @@
 // since __config may be included from C headers which may create an
 // include cycle.
 module std_config [system] [extern_c] {
-    header "__config"
+  textual header "__config"
+  textual header "__config_site"
 }

 module std [system] {
--- a/contrib/llvm-project/libcxx/include/numbers
+++ b/contrib/llvm-project/libcxx/include/numbers
@ -63,7 +63,7 @@ namespace std::numbers {
 #include <type_traits>
 #include <version>

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
@ -128,6 +128,6 @@ inline constexpr double phi        = phi_v<double>;

 _LIBCPP_END_NAMESPACE_STD

-#endif //_LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif //!defined(_LIBCPP_HAS_NO_CONCEPTS)

 #endif // _LIBCPP_NUMBERS
--- a/contrib/llvm-project/libcxx/include/ranges
+++ b/contrib/llvm-project/libcxx/include/ranges
@ -239,11 +239,11 @@ namespace std::ranges {

 _LIBCPP_BEGIN_NAMESPACE_STD

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 namespace views = ranges::views;

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 _LIBCPP_END_NAMESPACE_STD

--- a/contrib/llvm-project/libcxx/include/string
+++ b/contrib/llvm-project/libcxx/include/string
@ -618,18 +618,6 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, _CharT __y);

 _LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS string operator+<char, char_traits<char>, allocator<char> >(char const*, string const&))

-#ifndef _LIBCPP_ABI_NO_BASIC_STRING_BASE_CLASS
-template <bool>
-struct __basic_string_common;
-
-template <>
-struct __basic_string_common<true> {
-    // Both are defined in string.cpp
-    _LIBCPP_NORETURN _LIBCPP_EXPORTED_FROM_ABI void __throw_length_error() const;
-    _LIBCPP_NORETURN _LIBCPP_EXPORTED_FROM_ABI void __throw_out_of_range() const;
-};
-#endif
-
 template <class _Iter>
 struct __string_is_trivial_iterator : public false_type {};

@ -682,9 +670,6 @@ class
    _LIBCPP_PREFERRED_NAME(u32string)
 #endif
    basic_string
-#ifndef _LIBCPP_ABI_NO_BASIC_STRING_BASE_CLASS
-    : private __basic_string_common<true> // This base class is historical, but it needs to remain for ABI compatibility
-#endif
 {
 public:
    typedef basic_string                                 __self;
--- a/contrib/llvm-project/libcxx/include/string_view
+++ b/contrib/llvm-project/libcxx/include/string_view
@ -286,7 +286,7 @@ public:
 #endif
    }

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
    template <contiguous_iterator _It, sized_sentinel_for<_It> _End>
      requires (is_same_v<iter_value_t<_It>, _CharT> && !is_convertible_v<_End, size_type>)
    constexpr _LIBCPP_HIDE_FROM_ABI basic_string_view(_It __begin, _End __end)
@ -707,17 +707,17 @@ private:
    size_type           __size;
 };

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
 template <class _CharT, class _Traits>
 inline constexpr bool ranges::enable_view<basic_string_view<_CharT, _Traits>> = true;

 template <class _CharT, class _Traits>
 inline constexpr bool ranges::enable_borrowed_range<basic_string_view<_CharT, _Traits> > = true;
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // [string.view.deduct]

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
 template <contiguous_iterator _It, sized_sentinel_for<_It> _End>
  basic_string_view(_It, _End) -> basic_string_view<iter_value_t<_It>>;
 #endif
--- a/contrib/llvm-project/libcxx/include/tuple
+++ b/contrib/llvm-project/libcxx/include/tuple
@ -1333,7 +1333,7 @@ operator==(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
    return __tuple_equal<sizeof...(_Tp)>()(__x, __y);
 }

-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // operator<=>

@ -1355,7 +1355,7 @@ operator<=>(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
    return _VSTD::__tuple_compare_three_way(__x, __y, index_sequence_for<_Tp...>{});
 }

-#else // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#else // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 template <class ..._Tp, class ..._Up>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
@ -1425,7 +1425,7 @@ operator<=(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
    return !(__y < __x);
 }

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // tuple_cat

--- a/contrib/llvm-project/libcxx/include/type_traits
+++ b/contrib/llvm-project/libcxx/include/type_traits
@ -2442,7 +2442,7 @@ using __copy_cvref_t = typename __copy_cvref<_From, _To>::type;
 #endif // _LIBCPP_STD_VER > 11

 // common_reference
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
 // Let COND_RES(X, Y) be:
 template <class _Xp, class _Yp>
 using __cond_res =
@ -2596,7 +2596,7 @@ struct common_reference<_Tp, _Up, _Vp, _Rest...>
 // bullet 5 - Otherwise, there shall be no member `type`.
 template <class...> struct common_reference {};

-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)

 // is_assignable

--- a/contrib/llvm-project/libcxx/src/string.cpp
+++ b/contrib/llvm-project/libcxx/src/string.cpp
@ -21,15 +21,26 @@

 _LIBCPP_BEGIN_NAMESPACE_STD

-#ifndef _LIBCPP_ABI_NO_BASIC_STRING_BASE_CLASS
+#ifndef _LIBCPP_ABI_DO_NOT_EXPORT_BASIC_STRING_COMMON
+
+template <bool>
+struct __basic_string_common;
+
+// The struct isn't declared anymore in the headers. It's only here for ABI compatibility.
+template <>
+struct __basic_string_common<true> {
+    _LIBCPP_NORETURN _LIBCPP_EXPORTED_FROM_ABI void __throw_length_error() const;
+    _LIBCPP_NORETURN _LIBCPP_EXPORTED_FROM_ABI void __throw_out_of_range() const;
+};
+
 void __basic_string_common<true>::__throw_length_error() const {
-    _VSTD::__throw_length_error("basic_string");
+    std::__throw_length_error("basic_string");
+}
+void __basic_string_common<true>::__throw_out_of_range() const {
+    std::__throw_out_of_range("basic_string");
 }

-void __basic_string_common<true>::__throw_out_of_range() const {
-    _VSTD::__throw_out_of_range("basic_string");
-}
-#endif
+#endif // _LIBCPP_ABI_DO_NOT_EXPORT_BASIC_STRING_COMMON

 #define _LIBCPP_EXTERN_TEMPLATE_DEFINE(...) template __VA_ARGS__;
 #ifdef _LIBCPP_ABI_STRING_OPTIMIZED_EXTERNAL_INSTANTIATION
--- a/contrib/llvm-project/libunwind/src/DwarfInstructions.hpp
+++ b/contrib/llvm-project/libunwind/src/DwarfInstructions.hpp
@ -114,8 +114,6 @@ double DwarfInstructions<A, R>::getSavedFloatRegister(
    return addressSpace.getDouble(
        evaluateExpression((pint_t)savedReg.value, addressSpace,
                            registers, cfa));
-  case CFI_Parser<A>::kRegisterUndefined:
-    return 0.0;
  case CFI_Parser<A>::kRegisterInRegister:
 #ifndef _LIBUNWIND_TARGET_ARM
    return registers.getFloatRegister((int)savedReg.value);
--- a/contrib/llvm-project/llvm/lib/Debuginfod/HTTPClient.cpp
+++ b/contrib/llvm-project/llvm/lib/Debuginfod/HTTPClient.cpp
@ -156,7 +156,8 @@ HTTPClient::HTTPClient() {
         "Must call HTTPClient::initialize() at the beginning of main().");
  if (Curl)
    return;
-  assert((Curl = curl_easy_init()) && "Curl could not be initialized.");
+  Curl = curl_easy_init();
+  assert(Curl && "Curl could not be initialized");
  // Set the callback hooks.
  curl_easy_setopt(Curl, CURLOPT_WRITEFUNCTION, curlWriteFunction);
  curl_easy_setopt(Curl, CURLOPT_HEADERFUNCTION, curlHeaderFunction);
--- a/contrib/llvm-project/llvm/lib/ObjectYAML/ELFYAML.cpp
+++ b/contrib/llvm-project/llvm/lib/ObjectYAML/ELFYAML.cpp
@ -839,6 +839,9 @@ void ScalarEnumerationTraits<ELFYAML::ELF_REL>::enumeration(
  case ELF::EM_CSKY:
 #include "llvm/BinaryFormat/ELFRelocs/CSKY.def"
    break;
+  case ELF::EM_PPC:
+#include "llvm/BinaryFormat/ELFRelocs/PowerPC.def"
+    break;
  case ELF::EM_PPC64:
 #include "llvm/BinaryFormat/ELFRelocs/PowerPC64.def"
    break;
--- a/contrib/llvm-project/llvm/lib/Target/AVR/AVRFrameLowering.cpp
+++ b/contrib/llvm-project/llvm/lib/Target/AVR/AVRFrameLowering.cpp
@ -298,11 +298,11 @@ bool AVRFrameLowering::restoreCalleeSavedRegisters(
 /// Replace pseudo store instructions that pass arguments through the stack with
 /// real instructions.
 static void fixStackStores(MachineBasicBlock &MBB,
-                           MachineBasicBlock::iterator MI,
+                           MachineBasicBlock::iterator StartMI,
                           const TargetInstrInfo &TII, Register FP) {
  // Iterate through the BB until we hit a call instruction or we reach the end.
  for (MachineInstr &MI :
-       llvm::make_early_inc_range(llvm::make_range(MI, MBB.end()))) {
+       llvm::make_early_inc_range(llvm::make_range(StartMI, MBB.end()))) {
    if (MI.isCall())
      break;

--- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
@ -1310,7 +1310,9 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM,
    setLibcallName(RTLIB::SHL_I128, nullptr);
    setLibcallName(RTLIB::SRL_I128, nullptr);
    setLibcallName(RTLIB::SRA_I128, nullptr);
+    setLibcallName(RTLIB::MUL_I128, nullptr);
    setLibcallName(RTLIB::MULO_I64, nullptr);
+    setLibcallName(RTLIB::MULO_I128, nullptr);
  }

  if (!isPPC64)
--- a/lib/clang/include/VCSVersion.inc
+++ b/lib/clang/include/VCSVersion.inc
@ -1,14 +1,10 @@
 // $FreeBSD$

-#define LLVM_REVISION "llvmorg-14-init-18294-gdb01b123d012"
+#define LLVM_REVISION "llvmorg-14-init-18315-g190be5457c90"
 #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"

-#define CLANG_REVISION "llvmorg-14-init-18294-gdb01b123d012"
+#define CLANG_REVISION "llvmorg-14-init-18315-g190be5457c90"
 #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git"

-// <Upstream revision at import>-<Local identifier in __FreeBSD_version style>
-#define LLD_REVISION "llvmorg-14-init-18294-gdb01b123d012-1400003"
-#define LLD_REPOSITORY "FreeBSD"
-
-#define LLDB_REVISION "llvmorg-14-init-18294-gdb01b123d012"
+#define LLDB_REVISION "llvmorg-14-init-18315-g190be5457c90"
 #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git"
--- a/lib/clang/include/lld/Common/Version.inc
+++ b/lib/clang/include/lld/Common/Version.inc
@ -1,3 +1,4 @@
-// $FreeBSD$
+// Local identifier in __FreeBSD_version style
+#define LLD_FREEBSD_VERSION 1400003

-#define LLD_VERSION_STRING "14.0.0"
+#define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14-init-18315-g190be5457c90-" __XSTRING(LLD_FREEBSD_VERSION) ")"
--- 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-14-init-18294-gdb01b123d012"
+#define LLVM_REVISION "llvmorg-14-init-18315-g190be5457c90"
 #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@ -634,6 +634,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/SmartPtrModeling.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/StreamChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/StringChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/Taint.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/TaintTesterChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/TestAfterDivZeroChecker.cpp
@ -660,6 +661,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/WebKit/UncountedCallArgsChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/WebKit/UncountedLambdaCapturesChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/WebKit/UncountedLocalVarsChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/cert/InvalidPtrChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/APSIntType.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/AnalysisManager.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/AnalyzerOptions.cpp
@ -667,6 +669,7 @@ SRCS_FUL+=	StaticAnalyzer/Core/BasicValueFactory.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/BlockCounter.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/BugReporter.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/BugReporterVisitors.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/CallDescription.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/CallEvent.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/Checker.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/CheckerContext.cpp
--- a/lib/clang/liblldb/LLDBWrapLua.cpp
+++ b/lib/clang/liblldb/LLDBWrapLua.cpp
@ -56832,23 +56832,16 @@ fail:
 static int _wrap_SBThread_GetSiginfo(lua_State* L) {
  int SWIG_arg = 0;
  lldb::SBThread *arg1 = (lldb::SBThread *) 0 ;
-  lldb::SBError *arg2 = 0 ;
  lldb::SBValue result;
  
-  SWIG_check_num_args("lldb::SBThread::GetSiginfo",2,2)
+  SWIG_check_num_args("lldb::SBThread::GetSiginfo",1,1)
  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("lldb::SBThread::GetSiginfo",1,"lldb::SBThread *");
-  if(!lua_isuserdata(L,2)) SWIG_fail_arg("lldb::SBThread::GetSiginfo",2,"lldb::SBError &");
  
  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_lldb__SBThread,0))){
    SWIG_fail_ptr("SBThread_GetSiginfo",1,SWIGTYPE_p_lldb__SBThread);
  }
  
-  
-  if (!SWIG_IsOK(SWIG_ConvertPtr(L,2,(void**)&arg2,SWIGTYPE_p_lldb__SBError,0))){
-    SWIG_fail_ptr("SBThread_GetSiginfo",2,SWIGTYPE_p_lldb__SBError);
-  }
-  
-  result = (arg1)->GetSiginfo(*arg2);
+  result = (arg1)->GetSiginfo();
  {
    lldb::SBValue * resultptr = new lldb::SBValue((const lldb::SBValue &) result);
    SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_lldb__SBValue,1); SWIG_arg++;
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@ -926,7 +926,7 @@ SRCS_MIN+=	ProfileData/InstrProfCorrelator.cpp
 SRCS_MIN+=	ProfileData/InstrProfReader.cpp
 SRCS_MIN+=	ProfileData/InstrProfWriter.cpp
 SRCS_MIN+=	ProfileData/ProfileSummaryBuilder.cpp
-SRCS_EXT+=	ProfileData/RawMemProfReader.cpp
+SRCS_MIW+=	ProfileData/RawMemProfReader.cpp
 SRCS_MIN+=	ProfileData/SampleProf.cpp
 SRCS_MIN+=	ProfileData/SampleProfReader.cpp
 SRCS_MIN+=	ProfileData/SampleProfWriter.cpp
--- a/lib/libgcc_eh/Makefile
+++ b/lib/libgcc_eh/Makefile
@ -14,6 +14,8 @@ SRCS_EXC+=	int_util.c
 INCS+=		${UNWINDINCDIR}/__libunwind_config.h
 INCS+=		${UNWINDINCDIR}/libunwind.h
 INCS+=		${UNWINDINCDIR}/unwind.h
+INCS+=		${UNWINDINCDIR}/unwind_arm_ehabi.h
+INCS+=		${UNWINDINCDIR}/unwind_itanium.h

 .if ${.MAKE.LEVEL} > 0
 # avoid circular dependencies
--- a/lib/libomp/kmp_config.h
+++ b/lib/libomp/kmp_config.h
@ -1,4 +1,3 @@
-// $FreeBSD$
 /*
 * kmp_config.h -- Feature macros
 */
@ -51,7 +50,11 @@
 #define OMP_PROFILING_SUPPORT LIBOMP_PROFILING_SUPPORT
 #define LIBOMP_OMPT_OPTIONAL 1
 #define OMPT_OPTIONAL LIBOMP_OMPT_OPTIONAL
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_USE_ADAPTIVE_LOCKS 1
+#else
+#define LIBOMP_USE_ADAPTIVE_LOCKS 0
+#endif // } FreeBSD customization
 #define KMP_USE_ADAPTIVE_LOCKS LIBOMP_USE_ADAPTIVE_LOCKS
 #define KMP_DEBUG_ADAPTIVE_LOCKS 0
 #define LIBOMP_USE_INTERNODE_ALIGNMENT 0
@ -65,29 +68,73 @@
 #define KMP_USE_HWLOC LIBOMP_USE_HWLOC
 #define LIBOMP_ENABLE_SHARED 1
 #define KMP_DYNAMIC_LIB LIBOMP_ENABLE_SHARED
+#if KMP_ARCH_X86 // FreeBSD customization {
+#define KMP_ARCH_STR "IA-32"
+#elif KMP_ARCH_X86_64
 #define KMP_ARCH_STR "Intel(R) 64"
+#elif KMP_ARCH_AARCH64
+#define KMP_ARCH_STR "AARCH64"
+#elif KMP_ARCH_PPC64
+#define KMP_ARCH_STR "PPC64BE"
+#elif KMP_ARCH_MIPS
+#define KMP_ARCH_STR "MIPS"
+#elif KMP_ARCH_MIPS64
+#define KMP_ARCH_STR "MIPS64"
+#elif KMP_ARCH_RISCV64
+#define KMP_ARCH_STR "RISCV64"
+#else
+#error Unknown KMP_ARCH value
+#endif // } FreeBSD customization
 #define KMP_LIBRARY_FILE "libomp.so"
 #define KMP_VERSION_MAJOR 5
 #define KMP_VERSION_MINOR 0
 #define MSVC 0
 #define KMP_MSVC_COMPAT MSVC
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_WAITPKG_INTRINSICS 1
+#else
+#define LIBOMP_HAVE_WAITPKG_INTRINSICS 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_WAITPKG_INTRINSICS LIBOMP_HAVE_WAITPKG_INTRINSICS
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_RTM_INTRINSICS 1
+#else
+#define LIBOMP_HAVE_RTM_INTRINSICS 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_RTM_INTRINSICS LIBOMP_HAVE_RTM_INTRINSICS
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_IMMINTRIN_H 1
+#else
+#define LIBOMP_HAVE_IMMINTRIN_H 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_IMMINTRIN_H LIBOMP_HAVE_IMMINTRIN_H
 #define LIBOMP_HAVE_INTRIN_H 0
 #define KMP_HAVE_INTRIN_H LIBOMP_HAVE_INTRIN_H
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_ATTRIBUTE_WAITPKG 1
+#else
+#define LIBOMP_HAVE_ATTRIBUTE_WAITPKG 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_ATTRIBUTE_WAITPKG LIBOMP_HAVE_ATTRIBUTE_WAITPKG
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_ATTRIBUTE_RTM 1
+#else
+#define LIBOMP_HAVE_ATTRIBUTE_RTM 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_ATTRIBUTE_RTM LIBOMP_HAVE_ATTRIBUTE_RTM
 #define LIBOMP_ARCH_AARCH64_A64FX 0
 #define KMP_ARCH_AARCH64_A64FX LIBOMP_ARCH_AARCH64_A64FX
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_XMMINTRIN_H 1
+#else
+#define LIBOMP_HAVE_XMMINTRIN_H 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_XMMINTRIN_H LIBOMP_HAVE_XMMINTRIN_H
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE__MM_MALLOC 1
+#else
+#define LIBOMP_HAVE__MM_MALLOC 0
+#endif // } FreeBSD customization
 #define KMP_HAVE__MM_MALLOC LIBOMP_HAVE__MM_MALLOC
 #define LIBOMP_HAVE_ALIGNED_ALLOC 1
 #define KMP_HAVE_ALIGNED_ALLOC LIBOMP_HAVE_ALIGNED_ALLOC
--- a/lib/libomp/kmp_i18n_default.inc
+++ b/lib/libomp/kmp_i18n_default.inc
@ -1,6 +1,5 @@
-// $FreeBSD$
 // Do not edit this file! //
-// The file was generated from en_US.txt by message-converter.pl on Mon Nov 22 22:46:03 2021. //
+// The file was generated from en_US.txt by message-converter.pl on Sat Feb  5 21:17:04 2022. //

 static char const *
 __kmp_i18n_default_meta[] =
@ -310,6 +309,7 @@ __kmp_i18n_default_messages[] =
        "%1$s: %2$s (%3$d total cores)",
        "%1$s: granularity setting: %2$s does not exist in topology.  Using granularity=%3$s instead.",
        "%1$s: hybrid core type detected: %2$d %3$s cores.",
+        "%1$s:   %2$d with core efficiency %3$d.",
        "%1$s must be bound to a work-sharing or work-queuing construct with an \"ordered\" clause",
        "Detected end of %1$s without first executing a corresponding beginning.",
        "Iteration range too large in %1$s.",
@ -407,6 +407,13 @@ __kmp_i18n_default_messages[] =
        "%1$s: topology layer \"%2$s\" is equivalent to \"%3$s\".",
        "%1$s: granularity=%2$s is too coarse, setting granularity=group.",
        "%1$s: \"%2$s\" value is deprecated. Please use \"%3$s\" instead.",
+        "num_teams value must be positive, it is %1$d, using %2$d instead.",
+        "KMP_HW_SUBSET ignored: %1$s, %2$s: attributes are ambiguous, please only specify one.",
+        "KMP_HW_SUBSET ignored: %1$s: attribute specified more than once.",
+        "KMP_HW_SUBSET ignored: %1$s: attribute value %2$s is invalid.",
+        "KMP_HW_SUBSET ignored: all hardware resources would be filtered, please reduce the filter.",
+        "KMP_HW_SUBSET ignored: Too many attributes specified. This machine is not a hybrid architecutre.",
+        "KMP_HW_SUBSET: ignoring %1$s attribute. This machine is not a hybrid architecutre.",
        NULL
    };

@ -442,6 +449,7 @@ __kmp_i18n_default_hints[] =
        "System error #193 is \"Bad format of EXE or DLL file\". Usually it means the file is found, but it is corrupted or a file for another architecture. Check whether \"%1$s\" is a file for %2$s architecture.",
        "System-related limit on the number of threads.",
        "Try setting new bounds (preferably less than or equal to %1$d) for num_teams clause.",
+        "Valid values are from %1$d to %2$d.",
        NULL
    };

@ -458,8 +466,8 @@ __kmp_i18n_sections[] =
        { 5, __kmp_i18n_default_meta },
        { 79, __kmp_i18n_default_strings },
        { 6, __kmp_i18n_default_formats },
-        { 290, __kmp_i18n_default_messages },
-        { 28, __kmp_i18n_default_hints },
+        { 298, __kmp_i18n_default_messages },
+        { 29, __kmp_i18n_default_hints },
        { 0, NULL }
    };

--- a/lib/libomp/kmp_i18n_id.inc
+++ b/lib/libomp/kmp_i18n_id.inc
@ -1,6 +1,5 @@
-// $FreeBSD$
 // Do not edit this file! //
-// The file was generated from en_US.txt by message-converter.pl on Mon Nov 22 22:46:03 2021. //
+// The file was generated from en_US.txt by message-converter.pl on Sat Feb  5 21:17:04 2022. //

 enum kmp_i18n_id {

@ -304,6 +303,7 @@ enum kmp_i18n_id {
    kmp_i18n_msg_TopologyGeneric,
    kmp_i18n_msg_AffGranularityBad,
    kmp_i18n_msg_TopologyHybrid,
+    kmp_i18n_msg_TopologyHybridCoreEff,
    kmp_i18n_msg_CnsBoundToWorksharing,
    kmp_i18n_msg_CnsDetectedEnd,
    kmp_i18n_msg_CnsIterationRangeTooLarge,
@ -401,6 +401,13 @@ enum kmp_i18n_id {
    kmp_i18n_msg_AffEqualTopologyTypes,
    kmp_i18n_msg_AffGranTooCoarseProcGroup,
    kmp_i18n_msg_StgDeprecatedValue,
+    kmp_i18n_msg_NumTeamsNotPositive,
+    kmp_i18n_msg_AffHWSubsetIncompat,
+    kmp_i18n_msg_AffHWSubsetAttrRepeat,
+    kmp_i18n_msg_AffHWSubsetAttrInvalid,
+    kmp_i18n_msg_AffHWSubsetAllFiltered,
+    kmp_i18n_msg_AffHWSubsetAttrsNonHybrid,
+    kmp_i18n_msg_AffHWSubsetIgnoringAttr,
    kmp_i18n_msg_last,

    // Set #5, hints.
@ -433,6 +440,7 @@ enum kmp_i18n_id {
    kmp_i18n_hnt_BadExeFormat,
    kmp_i18n_hnt_SystemLimitOnThreads,
    kmp_i18n_hnt_SetNewBound,
+    kmp_i18n_hnt_ValidValuesRange,
    kmp_i18n_hnt_last,

    kmp_i18n_xxx_lastest
--- a/lib/libomp/omp-tools.h
+++ b/lib/libomp/omp-tools.h
@ -1,4 +1,3 @@
-// $FreeBSD$
 /*
 * include/omp-tools.h.var
 */
--- a/lib/libomp/omp.h
+++ b/lib/libomp/omp.h
@ -1,4 +1,3 @@
-// $FreeBSD$
 /*
 * include/omp.h.var
 */