1 files changed, 105 insertions, 4 deletions

diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 540118e4038f..e19ee5722c46 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -30,7 +30,6 @@ SRCS+=		exception.cpp
 SRCS+=		filesystem/directory_iterator.cpp
 SRCS+=		filesystem/int128_builtins.cpp
 SRCS+=		filesystem/operations.cpp
-SRCS+=		format.cpp
 SRCS+=		functional.cpp
 SRCS+=		future.cpp
 SRCS+=		hash.cpp
@@ -41,6 +40,7 @@ SRCS+=		legacy_debug_handler.cpp
 SRCS+=		legacy_pointer_safety.cpp
 SRCS+=		locale.cpp
 SRCS+=		memory.cpp
+SRCS+=		memory_resource.cpp
 SRCS+=		mutex.cpp
 SRCS+=		mutex_destructor.cpp
 SRCS+=		new.cpp
@@ -101,7 +101,6 @@ STDDIR=		${CXXINCLUDEDIR}
 STD_HEADERS+=	__assert
 STD_HEADERS+=	__availability
 STD_HEADERS+=	__bit_reference
-STD_HEADERS+=	__bits
 STD_HEADERS+=	__bsd_locale_defaults.h
 STD_HEADERS+=	__bsd_locale_fallbacks.h
 STD_HEADERS+=	__config
@@ -116,7 +115,6 @@ STD_HEADERS+=	__split_buffer
 STD_HEADERS+=	__std_stream
 STD_HEADERS+=	__threading_support
 STD_HEADERS+=	__tree
-STD_HEADERS+=	__tuple
 STD_HEADERS+=	__undef_macros
 STD_HEADERS+=	__verbose_abort
 STD_HEADERS+=	algorithm
@@ -165,6 +163,7 @@ STD_HEADERS+=	deque
 STD_HEADERS+=	errno.h
 STD_HEADERS+=	exception
 STD_HEADERS+=	execution
+STD_HEADERS+=	expected
 STD_HEADERS+=	fenv.h
 STD_HEADERS+=	filesystem
 STD_HEADERS+=	float.h
@@ -182,6 +181,7 @@ STD_HEADERS+=	iostream
 STD_HEADERS+=	istream
 STD_HEADERS+=	iterator
 STD_HEADERS+=	latch
+STD_HEADERS+=	libcxx.imp
 STD_HEADERS+=	limits
 STD_HEADERS+=	limits.h
 STD_HEADERS+=	list
@@ -190,6 +190,7 @@ STD_HEADERS+=	locale.h
 STD_HEADERS+=	map
 STD_HEADERS+=	math.h
 STD_HEADERS+=	memory
+STD_HEADERS+=	memory_resource
 STD_HEADERS+=	mutex
 STD_HEADERS+=	new
 STD_HEADERS+=	numbers
@@ -206,6 +207,7 @@ STD_HEADERS+=	semaphore
 STD_HEADERS+=	set
 STD_HEADERS+=	setjmp.h
 STD_HEADERS+=	shared_mutex
+STD_HEADERS+=	source_location
 STD_HEADERS+=	span
 STD_HEADERS+=	sstream
 STD_HEADERS+=	stack
@@ -267,6 +269,7 @@ ALG_HEADERS+=	comp_ref_type.h
 ALG_HEADERS+=	copy.h
 ALG_HEADERS+=	copy_backward.h
 ALG_HEADERS+=	copy_if.h
+ALG_HEADERS+=	copy_move_common.h
 ALG_HEADERS+=	copy_n.h
 ALG_HEADERS+=	count.h
 ALG_HEADERS+=	count_if.h
@@ -454,7 +457,18 @@ ALG+=		${HDRDIR}/__algorithm/${hdr}
 INCSGROUPS+=	BIT
 BITDIR=		${CXXINCLUDEDIR}/__bit
 BIT_HEADERS+=	bit_cast.h
+BIT_HEADERS+=	bit_ceil.h
+BIT_HEADERS+=	bit_floor.h
+BIT_HEADERS+=	bit_log2.h
+BIT_HEADERS+=	bit_width.h
+BIT_HEADERS+=	blsr.h
 BIT_HEADERS+=	byteswap.h
+BIT_HEADERS+=	countl.h
+BIT_HEADERS+=	countr.h
+BIT_HEADERS+=	endian.h
+BIT_HEADERS+=	has_single_bit.h
+BIT_HEADERS+=	popcount.h
+BIT_HEADERS+=	rotate.h
 .for hdr in ${BIT_HEADERS}
 BIT+=		${HDRDIR}/__bit/${hdr}
 .endfor
@@ -474,15 +488,20 @@ INCSGROUPS+=	CHR
 CHRDIR=		${CXXINCLUDEDIR}/__chrono
 CHR_HEADERS+=	calendar.h
 CHR_HEADERS+=	convert_to_timespec.h
+CHR_HEADERS+=	convert_to_tm.h
 CHR_HEADERS+=	day.h
 CHR_HEADERS+=	duration.h
 CHR_HEADERS+=	file_clock.h
+CHR_HEADERS+=	formatter.h
 CHR_HEADERS+=	hh_mm_ss.h
 CHR_HEADERS+=	high_resolution_clock.h
 CHR_HEADERS+=	literals.h
 CHR_HEADERS+=	month.h
 CHR_HEADERS+=	month_weekday.h
 CHR_HEADERS+=	monthday.h
+CHR_HEADERS+=	ostream.h
+CHR_HEADERS+=	parser_std_format_spec.h
+CHR_HEADERS+=	statically_widen.h
 CHR_HEADERS+=	steady_clock.h
 CHR_HEADERS+=	system_clock.h
 CHR_HEADERS+=	time_point.h
@@ -559,6 +578,16 @@ DBG_HEADERS+=	randomize_range.h
 DBG+=		${HDRDIR}/__debug_utils/${hdr}
 .endfor
 
+INCSGROUPS+=	EXC
+EXCDIR=		${CXXINCLUDEDIR}/__expected
+EXC_HEADERS+=	bad_expected_access.h
+EXC_HEADERS+=	expected.h
+EXC_HEADERS+=	unexpect.h
+EXC_HEADERS+=	unexpected.h
+.for hdr in ${EXC_HEADERS}
+EXC+=		${HDRDIR}/__expected/${hdr}
+.endfor
+
 INCSGROUPS+=	FS
 FSDIR=		${CXXINCLUDEDIR}/__filesystem
 FS_HEADERS+=	copy_options.h
@@ -585,13 +614,16 @@ INCSGROUPS+=	FMT
 FMTDIR=		${CXXINCLUDEDIR}/__format
 FMT_HEADERS+=	buffer.h
 FMT_HEADERS+=	concepts.h
+FMT_HEADERS+=	container_adaptor.h
 FMT_HEADERS+=	enable_insertable.h
+FMT_HEADERS+=	escaped_output_table.h
 FMT_HEADERS+=	extended_grapheme_cluster_table.h
 FMT_HEADERS+=	format_arg.h
 FMT_HEADERS+=	format_arg_store.h
 FMT_HEADERS+=	format_args.h
 FMT_HEADERS+=	format_context.h
 FMT_HEADERS+=	format_error.h
+FMT_HEADERS+=	format_functions.h
 FMT_HEADERS+=	format_fwd.h
 FMT_HEADERS+=	format_parse_context.h
 FMT_HEADERS+=	format_string.h
@@ -605,7 +637,10 @@ FMT_HEADERS+=	formatter_integral.h
 FMT_HEADERS+=	formatter_output.h
 FMT_HEADERS+=	formatter_pointer.h
 FMT_HEADERS+=	formatter_string.h
+FMT_HEADERS+=	formatter_tuple.h
 FMT_HEADERS+=	parser_std_format_spec.h
+FMT_HEADERS+=	range_default_formatter.h
+FMT_HEADERS+=	range_formatter.h
 FMT_HEADERS+=	unicode.h
 .for hdr in ${FMT_HEADERS}
 FMT+=		${HDRDIR}/__format/${hdr}
@@ -647,8 +682,16 @@ FUN+=		${HDRDIR}/__functional/${hdr}
 
 INCSGROUPS+=	FWD
 FWDDIR=		${CXXINCLUDEDIR}/__fwd
+FWD_HEADERS+=	array.h
+FWD_HEADERS+=	get.h
+FWD_HEADERS+=	hash.h
+FWD_HEADERS+=	memory_resource.h
+FWD_HEADERS+=	pair.h
 FWD_HEADERS+=	span.h
+FWD_HEADERS+=	string.h
 FWD_HEADERS+=	string_view.h
+FWD_HEADERS+=	subrange.h
+FWD_HEADERS+=	tuple.h
 .for hdr in ${FWD_HEADERS}
 FWD+=		${HDRDIR}/__fwd/${hdr}
 .endfor
@@ -684,6 +727,7 @@ IT_HEADERS+=	iter_move.h
 IT_HEADERS+=	iter_swap.h
 IT_HEADERS+=	iterator.h
 IT_HEADERS+=	iterator_traits.h
+IT_HEADERS+=	iterator_with_data.h
 IT_HEADERS+=	mergeable.h
 IT_HEADERS+=	move_iterator.h
 IT_HEADERS+=	move_sentinel.h
@@ -696,6 +740,7 @@ IT_HEADERS+=	projected.h
 IT_HEADERS+=	readable_traits.h
 IT_HEADERS+=	reverse_access.h
 IT_HEADERS+=	reverse_iterator.h
+IT_HEADERS+=	segmented_iterator.h
 IT_HEADERS+=	size.h
 IT_HEADERS+=	sortable.h
 IT_HEADERS+=	unreachable_sentinel.h
@@ -707,31 +752,49 @@ IT+=		${HDRDIR}/__iterator/${hdr}
 INCSGROUPS+=	MEM
 MEMDIR=		${CXXINCLUDEDIR}/__memory
 MEM_HEADERS+=	addressof.h
+MEM_HEADERS+=	align.h
 MEM_HEADERS+=	allocate_at_least.h
 MEM_HEADERS+=	allocation_guard.h
 MEM_HEADERS+=	allocator.h
 MEM_HEADERS+=	allocator_arg_t.h
+MEM_HEADERS+=	allocator_destructor.h
 MEM_HEADERS+=	allocator_traits.h
 MEM_HEADERS+=	assume_aligned.h
 MEM_HEADERS+=	auto_ptr.h
+MEM_HEADERS+=	builtin_new_allocator.h
 MEM_HEADERS+=	compressed_pair.h
 MEM_HEADERS+=	concepts.h
 MEM_HEADERS+=	construct_at.h
+MEM_HEADERS+=	destruct_n.h
 MEM_HEADERS+=	pointer_traits.h
 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+=	temp_value.h
 MEM_HEADERS+=	temporary_buffer.h
 MEM_HEADERS+=	uninitialized_algorithms.h
 MEM_HEADERS+=	unique_ptr.h
 MEM_HEADERS+=	uses_allocator.h
+MEM_HEADERS+=	uses_allocator_construction.h
 MEM_HEADERS+=	voidify.h
 .for hdr in ${MEM_HEADERS}
 MEM+=		${HDRDIR}/__memory/${hdr}
 .endfor
 
+INCSGROUPS+=	MER
+MERDIR=		${CXXINCLUDEDIR}/__memory_resource
+MER_HEADERS+=	memory_resource.h
+MER_HEADERS+=	monotonic_buffer_resource.h
+MER_HEADERS+=	polymorphic_allocator.h
+MER_HEADERS+=	pool_options.h
+MER_HEADERS+=	synchronized_pool_resource.h
+MER_HEADERS+=	unsynchronized_pool_resource.h
+.for hdr in ${MER_HEADERS}
+MER+=		${HDRDIR}/__memory_resource/${hdr}
+.endfor
+
 INCSGROUPS+=	NUM
 NUMDIR=		${CXXINCLUDEDIR}/__numeric
 NUM_HEADERS+=	accumulate.h
@@ -798,6 +861,7 @@ INCSGROUPS+=	RNG
 RNGDIR=		${CXXINCLUDEDIR}/__ranges
 RNG_HEADERS+=	access.h
 RNG_HEADERS+=	all.h
+RNG_HEADERS+=	as_rvalue_view.h
 RNG_HEADERS+=	common_view.h
 RNG_HEADERS+=	concepts.h
 RNG_HEADERS+=	copyable_box.h
@@ -805,12 +869,15 @@ RNG_HEADERS+=	counted.h
 RNG_HEADERS+=	dangling.h
 RNG_HEADERS+=	data.h
 RNG_HEADERS+=	drop_view.h
+RNG_HEADERS+=	drop_while_view.h
+RNG_HEADERS+=	elements_view.h
 RNG_HEADERS+=	empty.h
 RNG_HEADERS+=	empty_view.h
 RNG_HEADERS+=	enable_borrowed_range.h
 RNG_HEADERS+=	enable_view.h
 RNG_HEADERS+=	filter_view.h
 RNG_HEADERS+=	iota_view.h
+RNG_HEADERS+=	istream_view.h
 RNG_HEADERS+=	join_view.h
 RNG_HEADERS+=	lazy_split_view.h
 RNG_HEADERS+=	non_propagating_cache.h
@@ -822,8 +889,10 @@ RNG_HEADERS+=	rend.h
 RNG_HEADERS+=	reverse_view.h
 RNG_HEADERS+=	single_view.h
 RNG_HEADERS+=	size.h
+RNG_HEADERS+=	split_view.h
 RNG_HEADERS+=	subrange.h
 RNG_HEADERS+=	take_view.h
+RNG_HEADERS+=	take_while_view.h
 RNG_HEADERS+=	transform_view.h
 RNG_HEADERS+=	view_interface.h
 RNG_HEADERS+=	views.h
@@ -848,6 +917,22 @@ THR_HEADERS+=	timed_backoff_policy.h
 THR+=		${HDRDIR}/__thread/${hdr}
 .endfor
 
+INCSGROUPS+=	TUP
+TUPDIR=		${CXXINCLUDEDIR}/__tuple_dir
+TUP_HEADERS+=	apply_cv.h
+TUP_HEADERS+=	make_tuple_types.h
+TUP_HEADERS+=	pair_like.h
+TUP_HEADERS+=	sfinae_helpers.h
+TUP_HEADERS+=	tuple_element.h
+TUP_HEADERS+=	tuple_indices.h
+TUP_HEADERS+=	tuple_like.h
+TUP_HEADERS+=	tuple_like_ext.h
+TUP_HEADERS+=	tuple_size.h
+TUP_HEADERS+=	tuple_types.h
+.for hdr in ${TUP_HEADERS}
+TUP+=		${HDRDIR}/__tuple_dir/${hdr}
+.endfor
+
 INCSGROUPS+=	TTR
 TTRDIR=		${CXXINCLUDEDIR}/__type_traits
 TTR_HEADERS+=	add_const.h
@@ -860,6 +945,7 @@ TTR_HEADERS+=	aligned_storage.h
 TTR_HEADERS+=	aligned_union.h
 TTR_HEADERS+=	alignment_of.h
 TTR_HEADERS+=	apply_cv.h
+TTR_HEADERS+=	can_extract_key.h
 TTR_HEADERS+=	common_reference.h
 TTR_HEADERS+=	common_type.h
 TTR_HEADERS+=	conditional.h
@@ -867,6 +953,7 @@ TTR_HEADERS+=	conjunction.h
 TTR_HEADERS+=	copy_cv.h
 TTR_HEADERS+=	copy_cvref.h
 TTR_HEADERS+=	decay.h
+TTR_HEADERS+=	dependent_type.h
 TTR_HEADERS+=	disjunction.h
 TTR_HEADERS+=	enable_if.h
 TTR_HEADERS+=	extent.h
@@ -875,12 +962,15 @@ TTR_HEADERS+=	has_virtual_destructor.h
 TTR_HEADERS+=	integral_constant.h
 TTR_HEADERS+=	is_abstract.h
 TTR_HEADERS+=	is_aggregate.h
+TTR_HEADERS+=	is_allocator.h
+TTR_HEADERS+=	is_always_bitcastable.h
 TTR_HEADERS+=	is_arithmetic.h
 TTR_HEADERS+=	is_array.h
 TTR_HEADERS+=	is_assignable.h
 TTR_HEADERS+=	is_base_of.h
 TTR_HEADERS+=	is_bounded_array.h
 TTR_HEADERS+=	is_callable.h
+TTR_HEADERS+=	is_char_like_type.h
 TTR_HEADERS+=	is_class.h
 TTR_HEADERS+=	is_compound.h
 TTR_HEADERS+=	is_const.h
@@ -898,6 +988,7 @@ TTR_HEADERS+=	is_final.h
 TTR_HEADERS+=	is_floating_point.h
 TTR_HEADERS+=	is_function.h
 TTR_HEADERS+=	is_fundamental.h
+TTR_HEADERS+=	is_implicitly_default_constructible.h
 TTR_HEADERS+=	is_integral.h
 TTR_HEADERS+=	is_literal_type.h
 TTR_HEADERS+=	is_member_function_pointer.h
@@ -928,7 +1019,9 @@ 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_specialization.h
 TTR_HEADERS+=	is_standard_layout.h
+TTR_HEADERS+=	is_swappable.h
 TTR_HEADERS+=	is_trivial.h
 TTR_HEADERS+=	is_trivially_assignable.h
 TTR_HEADERS+=	is_trivially_constructible.h
@@ -948,20 +1041,26 @@ 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_const_lvalue_ref.h
 TTR_HEADERS+=	make_signed.h
 TTR_HEADERS+=	make_unsigned.h
+TTR_HEADERS+=	maybe_const.h
 TTR_HEADERS+=	nat.h
 TTR_HEADERS+=	negation.h
+TTR_HEADERS+=	noexcept_move_assign_container.h
 TTR_HEADERS+=	promote.h
 TTR_HEADERS+=	rank.h
 TTR_HEADERS+=	remove_all_extents.h
 TTR_HEADERS+=	remove_const.h
+TTR_HEADERS+=	remove_const_ref.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+=	result_of.h
+TTR_HEADERS+=	strip_signature.h
 TTR_HEADERS+=	type_identity.h
 TTR_HEADERS+=	type_list.h
 TTR_HEADERS+=	underlying_type.h
@@ -975,9 +1074,12 @@ UTLDIR=		${CXXINCLUDEDIR}/__utility
 UTL_HEADERS+=	as_const.h
 UTL_HEADERS+=	auto_cast.h
 UTL_HEADERS+=	cmp.h
+UTL_HEADERS+=	convert_to_integral.h
 UTL_HEADERS+=	declval.h
+UTL_HEADERS+=	exception_guard.h
 UTL_HEADERS+=	exchange.h
 UTL_HEADERS+=	forward.h
+UTL_HEADERS+=	forward_like.h
 UTL_HEADERS+=	in_place.h
 UTL_HEADERS+=	integer_sequence.h
 UTL_HEADERS+=	move.h
@@ -987,7 +1089,6 @@ UTL_HEADERS+=	priority_tag.h
 UTL_HEADERS+=	rel_ops.h
 UTL_HEADERS+=	swap.h
 UTL_HEADERS+=	to_underlying.h
-UTL_HEADERS+=	transaction.h
 UTL_HEADERS+=	unreachable.h
 .for hdr in ${UTL_HEADERS}
 UTL+=		${HDRDIR}/__utility/${hdr}