3 files changed, 136 insertions, 117 deletions

diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 937d73434b0f..649590a3b67a 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -20,10 +20,12 @@ SRCS+=		any.cpp
 SRCS+=		atomic.cpp
 SRCS+=		barrier.cpp
 SRCS+=		bind.cpp
+SRCS+=		call_once.cpp
 SRCS+=		charconv.cpp
 SRCS+=		chrono.cpp
 SRCS+=		condition_variable.cpp
 SRCS+=		condition_variable_destructor.cpp
+SRCS+=		error_category.cpp
 SRCS+=		exception.cpp
 SRCS+=		filesystem/directory_entry.cpp
 SRCS+=		filesystem/directory_iterator.cpp
@@ -109,10 +111,8 @@ STD_HEADERS+=	__hash_table
 STD_HEADERS+=	__locale
 STD_HEADERS+=	__mbstate_t.h
 STD_HEADERS+=	__node_handle
-STD_HEADERS+=	__pstl_algorithm
-STD_HEADERS+=	__pstl_memory
-STD_HEADERS+=	__pstl_numeric
 STD_HEADERS+=	__split_buffer
+STD_HEADERS+=	__std_clang_module
 STD_HEADERS+=	__std_mbstate_t.h
 STD_HEADERS+=	__threading_support
 STD_HEADERS+=	__tree
@@ -184,7 +184,6 @@ STD_HEADERS+=	iterator
 STD_HEADERS+=	latch
 STD_HEADERS+=	libcxx.imp
 STD_HEADERS+=	limits
-STD_HEADERS+=	limits.h
 STD_HEADERS+=	list
 STD_HEADERS+=	locale
 STD_HEADERS+=	locale.h
@@ -208,7 +207,6 @@ STD_HEADERS+=	regex
 STD_HEADERS+=	scoped_allocator
 STD_HEADERS+=	semaphore
 STD_HEADERS+=	set
-STD_HEADERS+=	setjmp.h
 STD_HEADERS+=	shared_mutex
 STD_HEADERS+=	source_location
 STD_HEADERS+=	span
@@ -227,6 +225,7 @@ STD_HEADERS+=	string
 STD_HEADERS+=	string.h
 STD_HEADERS+=	string_view
 STD_HEADERS+=	strstream
+STD_HEADERS+=	syncstream
 STD_HEADERS+=	system_error
 STD_HEADERS+=	tgmath.h
 STD_HEADERS+=	thread
@@ -286,6 +285,7 @@ ALG_HEADERS+=	find_end.h
 ALG_HEADERS+=	find_first_of.h
 ALG_HEADERS+=	find_if.h
 ALG_HEADERS+=	find_if_not.h
+ALG_HEADERS+=	find_segment_if.h
 ALG_HEADERS+=	for_each.h
 ALG_HEADERS+=	for_each_n.h
 ALG_HEADERS+=	for_each_segment.h
@@ -338,6 +338,7 @@ ALG_HEADERS+=	pstl_any_all_none_of.h
 ALG_HEADERS+=	pstl_backend.h
 ALG_HEADERS+=	pstl_copy.h
 ALG_HEADERS+=	pstl_count.h
+ALG_HEADERS+=	pstl_equal.h
 ALG_HEADERS+=	pstl_fill.h
 ALG_HEADERS+=	pstl_find.h
 ALG_HEADERS+=	pstl_for_each.h
@@ -345,7 +346,9 @@ ALG_HEADERS+=	pstl_frontend_dispatch.h
 ALG_HEADERS+=	pstl_generate.h
 ALG_HEADERS+=	pstl_is_partitioned.h
 ALG_HEADERS+=	pstl_merge.h
+ALG_HEADERS+=	pstl_move.h
 ALG_HEADERS+=	pstl_replace.h
+ALG_HEADERS+=	pstl_rotate_copy.h
 ALG_HEADERS+=	pstl_sort.h
 ALG_HEADERS+=	pstl_stable_sort.h
 ALG_HEADERS+=	pstl_transform.h
@@ -361,6 +364,7 @@ ALG_HEADERS+=	ranges_copy_if.h
 ALG_HEADERS+=	ranges_copy_n.h
 ALG_HEADERS+=	ranges_count.h
 ALG_HEADERS+=	ranges_count_if.h
+ALG_HEADERS+=	ranges_ends_with.h
 ALG_HEADERS+=	ranges_equal.h
 ALG_HEADERS+=	ranges_equal_range.h
 ALG_HEADERS+=	ranges_fill.h
@@ -535,6 +539,7 @@ BIT_HEADERS+=	countl.h
 BIT_HEADERS+=	countr.h
 BIT_HEADERS+=	endian.h
 BIT_HEADERS+=	has_single_bit.h
+BIT_HEADERS+=	invert_if.h
 BIT_HEADERS+=	popcount.h
 BIT_HEADERS+=	rotate.h
 .for hdr in ${BIT_HEADERS}
@@ -579,6 +584,8 @@ CHR_HEADERS+=	statically_widen.h
 CHR_HEADERS+=	steady_clock.h
 CHR_HEADERS+=	system_clock.h
 CHR_HEADERS+=	time_point.h
+CHR_HEADERS+=	tzdb.h
+CHR_HEADERS+=	tzdb_list.h
 CHR_HEADERS+=	weekday.h
 CHR_HEADERS+=	year.h
 CHR_HEADERS+=	year_month.h
@@ -777,6 +784,7 @@ FUN+=		${HDRDIR}/__functional/${hdr}
 INCSGROUPS+=	FWD
 FWDDIR=		${CXXINCLUDEDIR}/__fwd
 FWD_HEADERS+=	array.h
+FWD_HEADERS+=	bit_reference.h
 FWD_HEADERS+=	fstream.h
 FWD_HEADERS+=	get.h
 FWD_HEADERS+=	hash.h
@@ -861,12 +869,38 @@ LBA_HEADERS+=	locale_guard.h
 LBA+=		${HDRDIR}/__locale_dir/locale_base_api/${hdr}
 .endfor
 
+INCSGROUPS+=	MAT
+MATDIR=		${CXXINCLUDEDIR}/__math
+MAT_HEADERS+=	abs.h
+MAT_HEADERS+=	copysign.h
+MAT_HEADERS+=	error_functions.h
+MAT_HEADERS+=	exponential_functions.h
+MAT_HEADERS+=	fdim.h
+MAT_HEADERS+=	fma.h
+MAT_HEADERS+=	gamma.h
+MAT_HEADERS+=	hyperbolic_functions.h
+MAT_HEADERS+=	hypot.h
+MAT_HEADERS+=	inverse_hyperbolic_functions.h
+MAT_HEADERS+=	inverse_trigonometric_functions.h
+MAT_HEADERS+=	logarithms.h
+MAT_HEADERS+=	min_max.h
+MAT_HEADERS+=	modulo.h
+MAT_HEADERS+=	remainder.h
+MAT_HEADERS+=	roots.h
+MAT_HEADERS+=	rounding_functions.h
+MAT_HEADERS+=	traits.h
+MAT_HEADERS+=	trigonometric_functions.h
+.for hdr in ${MAT_HEADERS}
+MAT+=		${HDRDIR}/__math/${hdr}
+.endfor
+
 INCSGROUPS+=	MDS
 MDSDIR=		${CXXINCLUDEDIR}/__mdspan
 MDS_HEADERS+=	default_accessor.h
 MDS_HEADERS+=	extents.h
 MDS_HEADERS+=	layout_left.h
 MDS_HEADERS+=	layout_right.h
+MDS_HEADERS+=	layout_stride.h
 MDS_HEADERS+=	mdspan.h
 .for hdr in ${MDS_HEADERS}
 MDS+=		${HDRDIR}/__mdspan/${hdr}
@@ -923,6 +957,7 @@ INCSGROUPS+=	MUT
 MUTDIR=		${CXXINCLUDEDIR}/__mutex
 MUT_HEADERS+=	lock_guard.h
 MUT_HEADERS+=	mutex.h
+MUT_HEADERS+=	once_flag.h
 MUT_HEADERS+=	tag_types.h
 MUT_HEADERS+=	unique_lock.h
 .for hdr in ${MUT_HEADERS}
@@ -950,48 +985,6 @@ NUM_HEADERS+=	transform_reduce.h
 NUM+=		${HDRDIR}/__numeric/${hdr}
 .endfor
 
-INCSGROUPS+=	PSI
-PSIDIR=		${CXXINCLUDEDIR}/__pstl/internal
-PSI_HEADERS+=	algorithm_fwd.h
-PSI_HEADERS+=	algorithm_impl.h
-PSI_HEADERS+=	execution_defs.h
-PSI_HEADERS+=	execution_impl.h
-PSI_HEADERS+=	glue_algorithm_defs.h
-PSI_HEADERS+=	glue_algorithm_impl.h
-PSI_HEADERS+=	glue_memory_defs.h
-PSI_HEADERS+=	glue_memory_impl.h
-PSI_HEADERS+=	glue_numeric_defs.h
-PSI_HEADERS+=	glue_numeric_impl.h
-PSI_HEADERS+=	memory_impl.h
-PSI_HEADERS+=	numeric_fwd.h
-PSI_HEADERS+=	numeric_impl.h
-PSI_HEADERS+=	parallel_backend.h
-PSI_HEADERS+=	parallel_backend_omp.h
-PSI_HEADERS+=	parallel_backend_serial.h
-PSI_HEADERS+=	parallel_backend_tbb.h
-PSI_HEADERS+=	parallel_backend_utils.h
-PSI_HEADERS+=	unseq_backend_simd.h
-PSI_HEADERS+=	utils.h
-.for hdr in ${PSI_HEADERS}
-PSI+=		${HDRDIR}/__pstl/internal/${hdr}
-.endfor
-
-INCSGROUPS+=	PSO
-PSODIR=		${CXXINCLUDEDIR}/__pstl/internal/omp
-PSO_HEADERS+=	parallel_for.h
-PSO_HEADERS+=	parallel_for_each.h
-PSO_HEADERS+=	parallel_invoke.h
-PSO_HEADERS+=	parallel_merge.h
-PSO_HEADERS+=	parallel_scan.h
-PSO_HEADERS+=	parallel_stable_partial_sort.h
-PSO_HEADERS+=	parallel_stable_sort.h
-PSO_HEADERS+=	parallel_transform_reduce.h
-PSO_HEADERS+=	parallel_transform_scan.h
-PSO_HEADERS+=	util.h
-.for hdr in ${PSO_HEADERS}
-PSO+=		${HDRDIR}/__pstl/internal/omp/${hdr}
-.endfor
-
 INCSGROUPS+=	RND
 RNDDIR=		${CXXINCLUDEDIR}/__random
 RND_HEADERS+=	bernoulli_distribution.h
@@ -1040,6 +1033,7 @@ RNGDIR=		${CXXINCLUDEDIR}/__ranges
 RNG_HEADERS+=	access.h
 RNG_HEADERS+=	all.h
 RNG_HEADERS+=	as_rvalue_view.h
+RNG_HEADERS+=	chunk_by_view.h
 RNG_HEADERS+=	common_view.h
 RNG_HEADERS+=	concepts.h
 RNG_HEADERS+=	container_compatible_range.h
@@ -1120,6 +1114,7 @@ INCSGROUPS+=	THR
 THRDIR=		${CXXINCLUDEDIR}/__thread
 THR_HEADERS+=	formatter.h
 THR_HEADERS+=	id.h
+THR_HEADERS+=	jthread.h
 THR_HEADERS+=	poll_with_backoff.h
 THR_HEADERS+=	this_thread.h
 THR_HEADERS+=	thread.h
@@ -1264,7 +1259,6 @@ TTR_HEADERS+=	nat.h
 TTR_HEADERS+=	negation.h
 TTR_HEADERS+=	noexcept_move_assign_container.h
 TTR_HEADERS+=	operation_traits.h
-TTR_HEADERS+=	predicate_traits.h
 TTR_HEADERS+=	promote.h
 TTR_HEADERS+=	rank.h
 TTR_HEADERS+=	remove_all_extents.h
@@ -1290,10 +1284,12 @@ TTR+=		${HDRDIR}/__type_traits/${hdr}
 INCSGROUPS+=	UTL
 UTLDIR=		${CXXINCLUDEDIR}/__utility
 UTL_HEADERS+=	as_const.h
+UTL_HEADERS+=	as_lvalue.h
 UTL_HEADERS+=	auto_cast.h
 UTL_HEADERS+=	cmp.h
 UTL_HEADERS+=	convert_to_integral.h
 UTL_HEADERS+=	declval.h
+UTL_HEADERS+=	empty.h
 UTL_HEADERS+=	exception_guard.h
 UTL_HEADERS+=	exchange.h
 UTL_HEADERS+=	forward.h
@@ -1302,12 +1298,13 @@ UTL_HEADERS+=	in_place.h
 UTL_HEADERS+=	integer_sequence.h
 UTL_HEADERS+=	is_pointer_in_range.h
 UTL_HEADERS+=	move.h
+UTL_HEADERS+=	no_destroy.h
 UTL_HEADERS+=	pair.h
 UTL_HEADERS+=	piecewise_construct.h
 UTL_HEADERS+=	priority_tag.h
 UTL_HEADERS+=	rel_ops.h
+UTL_HEADERS+=	small_buffer.h
 UTL_HEADERS+=	swap.h
-UTL_HEADERS+=	terminate_on_exception.h
 UTL_HEADERS+=	to_underlying.h
 UTL_HEADERS+=	unreachable.h
 .for hdr in ${UTL_HEADERS}
@@ -1325,26 +1322,33 @@ INCSGROUPS+=	EXP
 EXPDIR=		${CXXINCLUDEDIR}/experimental
 EXP_HEADERS+=	__config
 EXP_HEADERS+=	__memory
-EXP_HEADERS+=	deque
-EXP_HEADERS+=	forward_list
 EXP_HEADERS+=	iterator
-EXP_HEADERS+=	list
-EXP_HEADERS+=	map
-EXP_HEADERS+=	memory_resource
+EXP_HEADERS+=	memory
 EXP_HEADERS+=	propagate_const
-EXP_HEADERS+=	regex
-EXP_HEADERS+=	set
 EXP_HEADERS+=	simd
-EXP_HEADERS+=	string
 EXP_HEADERS+=	type_traits
-EXP_HEADERS+=	unordered_map
-EXP_HEADERS+=	unordered_set
 EXP_HEADERS+=	utility
-EXP_HEADERS+=	vector
 .for hdr in ${EXP_HEADERS}
 EXP+=		${HDRDIR}/experimental/${hdr}
 .endfor
 
+INCSGROUPS+=	EXS
+EXSDIR=		${CXXINCLUDEDIR}/experimental/__simd
+EXS_HEADERS+=	abi_tag.h
+EXS_HEADERS+=	aligned_tag.h
+EXS_HEADERS+=	declaration.h
+EXS_HEADERS+=	internal_declaration.h
+EXS_HEADERS+=	reference.h
+EXS_HEADERS+=	scalar.h
+EXS_HEADERS+=	simd.h
+EXS_HEADERS+=	simd_mask.h
+EXS_HEADERS+=	traits.h
+EXS_HEADERS+=	utility.h
+EXS_HEADERS+=	vec_ext.h
+.for hdr in ${EXS_HEADERS}
+EXS+=		${HDRDIR}/experimental/__simd/${hdr}
+.endfor
+
 INCSGROUPS+=	EXT
 EXTDIR=		${CXXINCLUDEDIR}/ext
 EXT_HEADERS+=	__hash
diff --git a/lib/libc++/__config_site b/lib/libc++/__config_site
index 858699c83b3d..5693995b9d9f 100644
--- a/lib/libc++/__config_site
+++ b/lib/libc++/__config_site
@@ -27,7 +27,9 @@
 /* #undef _LIBCPP_HAS_NO_RANDOM_DEVICE */
 /* #undef _LIBCPP_HAS_NO_LOCALIZATION */
 /* #undef _LIBCPP_HAS_NO_WIDE_CHARACTERS */
-#define _LIBCPP_ENABLE_ASSERTIONS_DEFAULT 0
+#define _LIBCPP_HAS_NO_STD_MODULES
+#define _LIBCPP_HAS_NO_TIME_ZONE_DATABASE
+/* #undef _LIBCPP_INSTRUMENTED_WITH_ASAN */
 
 // PSTL backends
 /* #undef _LIBCPP_PSTL_CPU_BACKEND_SERIAL */
@@ -35,8 +37,7 @@
 /* #undef _LIBCPP_PSTL_CPU_BACKEND_LIBDISPATCH */
 
 // Hardening.
-#define _LIBCPP_ENABLE_HARDENED_MODE_DEFAULT 0
-#define _LIBCPP_ENABLE_DEBUG_MODE_DEFAULT 0
+#define _LIBCPP_HARDENING_MODE_DEFAULT 16
 
 // __USE_MINGW_ANSI_STDIO gets redefined on MinGW
 #ifdef __clang__
diff --git a/lib/libc++/module.modulemap b/lib/libc++/module.modulemap
index e3929e56525b..5f57a8a2b1bf 100644
--- a/lib/libc++/module.modulemap
+++ b/lib/libc++/module.modulemap
@@ -265,6 +265,10 @@ module std_strstream [system] {
   header "strstream"
   export *
 }
+module std_syncstream [system] {
+  header "syncstream"
+  export *
+}
 module std_system_error [system] {
   header "system_error"
   export *
@@ -448,10 +452,6 @@ module std_inttypes_h [system] {
   export *
 }
 // <iso646.h> provided by compiler.
-module std_limits_h [system] {
-  header "limits.h"
-  export *
-}
 module std_locale_h [system] {
   header "locale.h"
   export *
@@ -460,10 +460,7 @@ module std_math_h [system] {
   header "math.h"
   export *
 }
-module std_setjmp_h [system] {
-  header "setjmp.h"
-  export *
-}
+// <setjmp.h> provided by C library.
 // <signal.h> provided by C library.
 // FIXME: <stdalign.h> is missing.
 // <stdarg.h> provided by compiler.
@@ -520,73 +517,44 @@ module std_wctype_h [system] {
 
 // Experimental C++ standard library interfaces
 module std_experimental [system] {
-  module deque {
-    header "experimental/deque"
-    export *
-  }
-  module forward_list {
-    header "experimental/forward_list"
-    export *
-  }
   module iterator {
     header "experimental/iterator"
     export *
   }
-  module list {
-    header "experimental/list"
-    export *
-  }
-  module map {
-    header "experimental/map"
-    export *
-  }
-  module memory_resource {
-    header "experimental/memory_resource"
+  module memory {
+    header "experimental/memory"
     export *
   }
   module propagate_const {
     header "experimental/propagate_const"
     export *
   }
-  module regex {
-    
-    header "experimental/regex"
-    export *
-  }
   module simd {
+    module abi_tag              { private header "experimental/__simd/abi_tag.h" }
+    module aligned_tag          { private header "experimental/__simd/aligned_tag.h" }
+    module declaration          { private header "experimental/__simd/declaration.h" }
+    module internal_declaration { private header "experimental/__simd/internal_declaration.h" }
+    module reference            { private header "experimental/__simd/reference.h" }
+    module scalar               { private header "experimental/__simd/scalar.h" }
+    module simd                 { private header "experimental/__simd/simd.h" }
+    module simd_mask            { private header "experimental/__simd/simd_mask.h" }
+    module traits               { private header "experimental/__simd/traits.h" }
+    module utility              { private header "experimental/__simd/utility.h" }
+    module vec_ext              { private header "experimental/__simd/vec_ext.h" }
+
     header "experimental/simd"
     export *
   }
-  module set {
-    header "experimental/set"
-    export *
-  }
-  module string {
-    header "experimental/string"
-    export *
-  }
   module type_traits {
     header "experimental/type_traits"
     export *
   }
-  module unordered_map {
-    header "experimental/unordered_map"
-    export *
-  }
-  module unordered_set {
-    header "experimental/unordered_set"
-    export *
-  }
   module utility {
     header "experimental/utility"
     export *
   }
-  module vector {
-    header "experimental/vector"
-    export *
-  }
   module __config {
-    private textual header "experimental/__config"
+    textual header "experimental/__config"
     export *
   }
   // FIXME these should be private
@@ -617,6 +585,9 @@ module std_private_bit_reference     [system] {
   header "__bit_reference"
   export *
 }
+module std_private_fwd_bit_reference [system] {
+  header "__fwd/bit_reference.h"
+}
 module std_private_config            [system] {
   textual header "__config"
   export *
@@ -694,6 +665,7 @@ module std_private_algorithm_find_end                                    [system
 module std_private_algorithm_find_first_of                               [system] { header "__algorithm/find_first_of.h" }
 module std_private_algorithm_find_if                                     [system] { header "__algorithm/find_if.h" }
 module std_private_algorithm_find_if_not                                 [system] { header "__algorithm/find_if_not.h" }
+module std_private_algorithm_find_segment_if                             [system] { header "__algorithm/find_segment_if.h" }
 module std_private_algorithm_for_each                                    [system] { header "__algorithm/for_each.h" }
 module std_private_algorithm_for_each_n                                  [system] { header "__algorithm/for_each_n.h" }
 module std_private_algorithm_for_each_segment                            [system] { header "__algorithm/for_each_segment.h" }
@@ -777,6 +749,7 @@ module std_private_algorithm_pstl_backends_cpu_backends_transform        [system
 module std_private_algorithm_pstl_backends_cpu_backends_transform_reduce [system] { header "__algorithm/pstl_backends/cpu_backends/transform_reduce.h" }
 module std_private_algorithm_pstl_copy                                   [system] { header "__algorithm/pstl_copy.h" }
 module std_private_algorithm_pstl_count                                  [system] { header "__algorithm/pstl_count.h" }
+module std_private_algorithm_pstl_equal                                  [system] { header "__algorithm/pstl_equal.h" }
 module std_private_algorithm_pstl_fill                                   [system] { header "__algorithm/pstl_fill.h" }
 module std_private_algorithm_pstl_find                                   [system] {
   header "__algorithm/pstl_find.h"
@@ -793,7 +766,9 @@ module std_private_algorithm_pstl_frontend_dispatch                      [system
 module std_private_algorithm_pstl_generate                               [system] { header "__algorithm/pstl_generate.h" }
 module std_private_algorithm_pstl_is_partitioned                         [system] { header "__algorithm/pstl_is_partitioned.h" }
 module std_private_algorithm_pstl_merge                                  [system] { header "__algorithm/pstl_merge.h" }
+module std_private_algorithm_pstl_move                                   [system] { header "__algorithm/pstl_move.h" }
 module std_private_algorithm_pstl_replace                                [system] { header "__algorithm/pstl_replace.h" }
+module std_private_algorithm_pstl_rotate_copy                            [system] { header "__algorithm/pstl_rotate_copy.h" }
 module std_private_algorithm_pstl_sort                                   [system] { header "__algorithm/pstl_sort.h" }
 module std_private_algorithm_pstl_stable_sort                            [system] {
   header "__algorithm/pstl_stable_sort.h"
@@ -830,6 +805,7 @@ module std_private_algorithm_ranges_copy_n                               [system
 }
 module std_private_algorithm_ranges_count                                [system] { header "__algorithm/ranges_count.h" }
 module std_private_algorithm_ranges_count_if                             [system] { header "__algorithm/ranges_count_if.h" }
+module std_private_algorithm_ranges_ends_with                            [system] { header "__algorithm/ranges_ends_with.h" }
 module std_private_algorithm_ranges_equal                                [system] { header "__algorithm/ranges_equal.h" }
 module std_private_algorithm_ranges_equal_range                          [system] {
   header "__algorithm/ranges_equal_range.h"
@@ -1139,6 +1115,7 @@ module std_private_bit_countl         [system] { header "__bit/countl.h" }
 module std_private_bit_countr         [system] { header "__bit/countr.h" }
 module std_private_bit_endian         [system] { header "__bit/endian.h" }
 module std_private_bit_has_single_bit [system] { header "__bit/has_single_bit.h" }
+module std_private_bit_invert_if      [system] { header "__bit/invert_if.h" }
 module std_private_bit_popcount       [system] { header "__bit/popcount.h" }
 module std_private_bit_rotate         [system] { header "__bit/rotate.h" }
 
@@ -1191,6 +1168,14 @@ module std_private_chrono_system_clock           [system] {
   header "__chrono/system_clock.h"
   export std_private_chrono_time_point
 }
+module std_private_chrono_tzdb                   [system] {
+  header "__chrono/tzdb.h"
+  export *
+}
+module std_private_chrono_tzdb_list              [system] {
+  header "__chrono/tzdb_list.h"
+  export *
+}
 module std_private_chrono_time_point             [system] { header "__chrono/time_point.h" }
 module std_private_chrono_weekday                [system] { header "__chrono/weekday.h" }
 module std_private_chrono_year                   [system] { header "__chrono/year.h" }
@@ -1482,6 +1467,26 @@ module std_private_locale_locale_base_api_bsd_locale_defaults  [system] { textua
 module std_private_locale_locale_base_api_bsd_locale_fallbacks [system] { textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h" }
 module std_private_locale_locale_base_api_locale_guard         [system] { header "__locale_dir/locale_base_api/locale_guard.h" }
 
+module std_private_math_abs                             [system] { header "__math/abs.h" }
+module std_private_math_copysign                        [system] { header "__math/copysign.h" }
+module std_private_math_error_functions                 [system] { header "__math/error_functions.h" }
+module std_private_math_exponential_functions           [system] { header "__math/exponential_functions.h" }
+module std_private_math_fdim                            [system] { header "__math/fdim.h" }
+module std_private_math_fma                             [system] { header "__math/fma.h" }
+module std_private_math_gamma                           [system] { header "__math/gamma.h" }
+module std_private_math_hyperbolic_functions            [system] { header "__math/hyperbolic_functions.h" }
+module std_private_math_hypot                           [system] { header "__math/hypot.h" }
+module std_private_math_inverse_hyperbolic_functions    [system] { header "__math/inverse_hyperbolic_functions.h" }
+module std_private_math_inverse_trigonometric_functions [system] { header "__math/inverse_trigonometric_functions.h" }
+module std_private_math_logarithms                      [system] { header "__math/logarithms.h" }
+module std_private_math_min_max                         [system] { header "__math/min_max.h" }
+module std_private_math_modulo                          [system] { header "__math/modulo.h" }
+module std_private_math_remainder                       [system] { header "__math/remainder.h" }
+module std_private_math_roots                           [system] { header "__math/roots.h" }
+module std_private_math_rounding_functions              [system] { header "__math/rounding_functions.h" }
+module std_private_math_traits                          [system] { header "__math/traits.h" }
+module std_private_math_trigonometric_functions         [system] { header "__math/trigonometric_functions.h" }
+
 module std_private_mdspan_default_accessor [system] { header "__mdspan/default_accessor.h" }
 module std_private_mdspan_extents          [system] {
   header "__mdspan/extents.h"
@@ -1489,6 +1494,7 @@ module std_private_mdspan_extents          [system] {
 }
 module std_private_mdspan_layout_left      [system] { header "__mdspan/layout_left.h" }
 module std_private_mdspan_layout_right     [system] { header "__mdspan/layout_right.h" }
+module std_private_mdspan_layout_stride    [system] { header "__mdspan/layout_stride.h" }
 module std_private_mdspan_mdspan           [system] { header "__mdspan/mdspan.h" }
 module std_private_mdspan_mdspan_fwd       [system] { header "__fwd/mdspan.h" }
 
@@ -1555,6 +1561,7 @@ module std_private_memory_resource_unsynchronized_pool_resource [system] { heade
 
 module std_private_mutex_lock_guard  [system] { header "__mutex/lock_guard.h" }
 module std_private_mutex_mutex       [system] { header "__mutex/mutex.h" }
+module std_private_mutex_once_flag  [system]  { header "__mutex/once_flag.h" }
 module std_private_mutex_tag_types   [system] { header "__mutex/tag_types.h" }
 module std_private_mutex_unique_lock [system] { header "__mutex/unique_lock.h" }
 
@@ -1638,6 +1645,7 @@ module std_private_ranges_all                        [system] {
   export std_private_ranges_owning_view
 }
 module std_private_ranges_as_rvalue_view             [system] { header "__ranges/as_rvalue_view.h" }
+module std_private_ranges_chunk_by_view              [system] { header "__ranges/chunk_by_view.h" }
 module std_private_ranges_common_view                [system] { header "__ranges/common_view.h" }
 module std_private_ranges_concepts                   [system] {
   header "__ranges/concepts.h"
@@ -1759,6 +1767,10 @@ module std_private_system_error_system_error    [system] { header "__system_erro
 
 module std_private_thread_formatter            [system] { header "__thread/formatter.h" }
 module std_private_thread_id                   [system] { header "__thread/id.h" }
+module std_private_thread_jthread              [system] {
+  header "__thread/jthread.h"
+  export *
+}
 module std_private_thread_poll_with_backoff    [system] { header "__thread/poll_with_backoff.h" }
 module std_private_thread_this_thread          [system] { header "__thread/this_thread.h" }
 module std_private_thread_thread               [system] {
@@ -1981,7 +1993,6 @@ module std_private_type_traits_nat                                       [system
 module std_private_type_traits_negation                                  [system] { header "__type_traits/negation.h" }
 module std_private_type_traits_noexcept_move_assign_container            [system] { header "__type_traits/noexcept_move_assign_container.h" }
 module std_private_type_traits_operation_traits                          [system] { header "__type_traits/operation_traits.h" }
-module std_private_type_traits_predicate_traits                          [system] { header "__type_traits/predicate_traits.h" }
 module std_private_type_traits_promote                                   [system] { header "__type_traits/promote.h" }
 module std_private_type_traits_rank                                      [system] { header "__type_traits/rank.h" }
 module std_private_type_traits_remove_all_extents                        [system] { header "__type_traits/remove_all_extents.h" }
@@ -2009,6 +2020,7 @@ module std_private_type_traits_unwrap_ref                                [system
 module std_private_type_traits_void_t                                    [system] { header "__type_traits/void_t.h" }
 
 module std_private_utility_as_const               [system] { header "__utility/as_const.h" }
+module std_private_utility_as_lvalue              [system] { header "__utility/as_lvalue.h" }
 module std_private_utility_auto_cast              [system] {
   header "__utility/auto_cast.h"
   export std_private_type_traits_decay
@@ -2019,6 +2031,7 @@ module std_private_utility_cmp                    [system] {
 }
 module std_private_utility_convert_to_integral    [system] { header "__utility/convert_to_integral.h" }
 module std_private_utility_declval                [system] { header "__utility/declval.h" }
+module std_private_utility_empty                  [system] { header "__utility/empty.h" }
 module std_private_utility_exception_guard        [system] { header "__utility/exception_guard.h" }
 module std_private_utility_exchange               [system] { header "__utility/exchange.h" }
 module std_private_utility_forward                [system] { header "__utility/forward.h" }
@@ -2032,6 +2045,7 @@ module std_private_utility_move                   [system] {
   export std_private_type_traits_is_nothrow_move_constructible
   export std_private_type_traits_remove_reference
 }
+module std_private_utility_no_destroy             [system] { header "__utility/no_destroy.h" }
 module std_private_utility_pair                   [system] {
   header "__utility/pair.h"
   export std_private_ranges_subrange_fwd
@@ -2050,11 +2064,11 @@ module std_private_utility_pair_fwd               [system] { header "__fwd/pair.
 module std_private_utility_piecewise_construct    [system] { header "__utility/piecewise_construct.h" }
 module std_private_utility_priority_tag           [system] { header "__utility/priority_tag.h" }
 module std_private_utility_rel_ops                [system] { header "__utility/rel_ops.h" }
+module std_private_utility_small_buffer           [system] { header "__utility/small_buffer.h" }
 module std_private_utility_swap                   [system] {
   header "__utility/swap.h"
   export std_private_type_traits_is_swappable
 }
-module std_private_utility_terminate_on_exception [system] { header "__utility/terminate_on_exception.h" }
 module std_private_utility_to_underlying          [system] { header "__utility/to_underlying.h" }
 module std_private_utility_unreachable            [system] { header "__utility/unreachable.h" }