3 files changed, 84 insertions, 1 deletions

diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 3e6b852e642d..f4a28af03790 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -336,21 +336,31 @@ ALG_HEADERS+=	ranges_copy_n.h
 ALG_HEADERS+=	ranges_count.h
 ALG_HEADERS+=	ranges_count_if.h
 ALG_HEADERS+=	ranges_equal.h
+ALG_HEADERS+=	ranges_equal_range.h
 ALG_HEADERS+=	ranges_fill.h
 ALG_HEADERS+=	ranges_fill_n.h
 ALG_HEADERS+=	ranges_find.h
+ALG_HEADERS+=	ranges_find_end.h
 ALG_HEADERS+=	ranges_find_first_of.h
 ALG_HEADERS+=	ranges_find_if.h
 ALG_HEADERS+=	ranges_find_if_not.h
 ALG_HEADERS+=	ranges_for_each.h
 ALG_HEADERS+=	ranges_for_each_n.h
+ALG_HEADERS+=	ranges_generate.h
+ALG_HEADERS+=	ranges_generate_n.h
+ALG_HEADERS+=	ranges_includes.h
+ALG_HEADERS+=	ranges_inplace_merge.h
+ALG_HEADERS+=	ranges_is_heap.h
+ALG_HEADERS+=	ranges_is_heap_until.h
 ALG_HEADERS+=	ranges_is_partitioned.h
 ALG_HEADERS+=	ranges_is_sorted.h
 ALG_HEADERS+=	ranges_is_sorted_until.h
 ALG_HEADERS+=	ranges_lexicographical_compare.h
 ALG_HEADERS+=	ranges_lower_bound.h
+ALG_HEADERS+=	ranges_make_heap.h
 ALG_HEADERS+=	ranges_max.h
 ALG_HEADERS+=	ranges_max_element.h
+ALG_HEADERS+=	ranges_merge.h
 ALG_HEADERS+=	ranges_min.h
 ALG_HEADERS+=	ranges_min_element.h
 ALG_HEADERS+=	ranges_minmax.h
@@ -359,13 +369,39 @@ ALG_HEADERS+=	ranges_mismatch.h
 ALG_HEADERS+=	ranges_move.h
 ALG_HEADERS+=	ranges_move_backward.h
 ALG_HEADERS+=	ranges_none_of.h
+ALG_HEADERS+=	ranges_nth_element.h
+ALG_HEADERS+=	ranges_partial_sort_copy.h
+ALG_HEADERS+=	ranges_partition.h
+ALG_HEADERS+=	ranges_partition_copy.h
+ALG_HEADERS+=	ranges_partition_point.h
+ALG_HEADERS+=	ranges_pop_heap.h
+ALG_HEADERS+=	ranges_push_heap.h
+ALG_HEADERS+=	ranges_remove.h
+ALG_HEADERS+=	ranges_remove_copy.h
+ALG_HEADERS+=	ranges_remove_copy_if.h
+ALG_HEADERS+=	ranges_remove_if.h
 ALG_HEADERS+=	ranges_replace.h
+ALG_HEADERS+=	ranges_replace_copy.h
+ALG_HEADERS+=	ranges_replace_copy_if.h
 ALG_HEADERS+=	ranges_replace_if.h
 ALG_HEADERS+=	ranges_reverse.h
+ALG_HEADERS+=	ranges_reverse_copy.h
+ALG_HEADERS+=	ranges_rotate_copy.h
+ALG_HEADERS+=	ranges_search.h
+ALG_HEADERS+=	ranges_search_n.h
+ALG_HEADERS+=	ranges_set_difference.h
+ALG_HEADERS+=	ranges_set_intersection.h
+ALG_HEADERS+=	ranges_set_symmetric_difference.h
+ALG_HEADERS+=	ranges_set_union.h
+ALG_HEADERS+=	ranges_shuffle.h
 ALG_HEADERS+=	ranges_sort.h
+ALG_HEADERS+=	ranges_sort_heap.h
+ALG_HEADERS+=	ranges_stable_partition.h
 ALG_HEADERS+=	ranges_stable_sort.h
 ALG_HEADERS+=	ranges_swap_ranges.h
 ALG_HEADERS+=	ranges_transform.h
+ALG_HEADERS+=	ranges_unique.h
+ALG_HEADERS+=	ranges_unique_copy.h
 ALG_HEADERS+=	ranges_upper_bound.h
 ALG_HEADERS+=	remove.h
 ALG_HEADERS+=	remove_copy.h
@@ -505,6 +541,13 @@ COR_HEADERS+=	trivial_awaitables.h
 COR+=		${HDRDIR}/__coroutine/${hdr}
 .endfor
 
+INCSGROUPS+=	DBG
+DBGDIR=		${CXXINCLUDEDIR}/__debug_utils
+DBG_HEADERS+=	randomize_range.h
+.for hdr in ${DBG_HEADERS}
+DBG+=		${HDRDIR}/__debug_utils/${hdr}
+.endfor
+
 INCSGROUPS+=	FS
 FSDIR=		${CXXINCLUDEDIR}/__filesystem
 FS_HEADERS+=	copy_options.h
diff --git a/lib/libc++/__config_site b/lib/libc++/__config_site
index 2d7d5d73f0ff..af9b6af5eede 100644
--- a/lib/libc++/__config_site
+++ b/lib/libc++/__config_site
@@ -13,7 +13,6 @@
 #define _LIBCPP_ABI_NAMESPACE __1
 /* #undef _LIBCPP_ABI_FORCE_ITANIUM */
 /* #undef _LIBCPP_ABI_FORCE_MICROSOFT */
-/* #undef _LIBCPP_HIDE_FROM_ABI_PER_TU_BY_DEFAULT */
 /* #undef _LIBCPP_HAS_NO_THREADS */
 /* #undef _LIBCPP_HAS_NO_MONOTONIC_CLOCK */
 /* #undef _LIBCPP_HAS_MUSL_LIBC */
diff --git a/lib/libc++/module.modulemap b/lib/libc++/module.modulemap
index 75df8e58310f..0107fb6f417b 100644
--- a/lib/libc++/module.modulemap
+++ b/lib/libc++/module.modulemap
@@ -318,21 +318,31 @@ module std [system] {
       module ranges_count                    { private header "__algorithm/ranges_count.h" }
       module ranges_count_if                 { private header "__algorithm/ranges_count_if.h" }
       module ranges_equal                    { private header "__algorithm/ranges_equal.h" }
+      module ranges_equal_range              { private header "__algorithm/ranges_equal_range.h" }
       module ranges_fill                     { private header "__algorithm/ranges_fill.h" }
       module ranges_fill_n                   { private header "__algorithm/ranges_fill_n.h" }
       module ranges_find                     { private header "__algorithm/ranges_find.h" }
+      module ranges_find_end                 { private header "__algorithm/ranges_find_end.h" }
       module ranges_find_first_of            { private header "__algorithm/ranges_find_first_of.h" }
       module ranges_find_if                  { private header "__algorithm/ranges_find_if.h" }
       module ranges_find_if_not              { private header "__algorithm/ranges_find_if_not.h" }
       module ranges_for_each                 { private header "__algorithm/ranges_for_each.h" }
       module ranges_for_each_n               { private header "__algorithm/ranges_for_each_n.h" }
+      module ranges_generate                 { private header "__algorithm/ranges_generate.h" }
+      module ranges_generate_n               { private header "__algorithm/ranges_generate_n.h" }
+      module ranges_includes                 { private header "__algorithm/ranges_includes.h" }
+      module ranges_inplace_merge            { private header "__algorithm/ranges_inplace_merge.h" }
+      module ranges_is_heap                  { private header "__algorithm/ranges_is_heap.h" }
+      module ranges_is_heap_until            { private header "__algorithm/ranges_is_heap_until.h" }
       module ranges_is_partitioned           { private header "__algorithm/ranges_is_partitioned.h" }
       module ranges_is_sorted                { private header "__algorithm/ranges_is_sorted.h" }
       module ranges_is_sorted_until          { private header "__algorithm/ranges_is_sorted_until.h" }
       module ranges_lexicographical_compare  { private header "__algorithm/ranges_lexicographical_compare.h" }
       module ranges_lower_bound              { private header "__algorithm/ranges_lower_bound.h" }
+      module ranges_make_heap                { private header "__algorithm/ranges_make_heap.h" }
       module ranges_max                      { private header "__algorithm/ranges_max.h" }
       module ranges_max_element              { private header "__algorithm/ranges_max_element.h" }
+      module ranges_merge                    { private header "__algorithm/ranges_merge.h" }
       module ranges_min                      { private header "__algorithm/ranges_min.h" }
       module ranges_min_element              { private header "__algorithm/ranges_min_element.h" }
       module ranges_minmax                   { private header "__algorithm/ranges_minmax.h" }
@@ -341,13 +351,39 @@ module std [system] {
       module ranges_move                     { private header "__algorithm/ranges_move.h" }
       module ranges_move_backward            { private header "__algorithm/ranges_move_backward.h" }
       module ranges_none_of                  { private header "__algorithm/ranges_none_of.h" }
+      module ranges_nth_element              { private header "__algorithm/ranges_nth_element.h" }
+      module ranges_partial_sort_copy        { private header "__algorithm/ranges_partial_sort_copy.h" }
+      module ranges_partition                { private header "__algorithm/ranges_partition.h" }
+      module ranges_partition_copy           { private header "__algorithm/ranges_partition_copy.h" }
+      module ranges_partition_point          { private header "__algorithm/ranges_partition_point.h" }
+      module ranges_pop_heap                 { private header "__algorithm/ranges_pop_heap.h" }
+      module ranges_push_heap                { private header "__algorithm/ranges_push_heap.h" }
+      module ranges_remove                   { private header "__algorithm/ranges_remove.h" }
+      module ranges_remove_copy              { private header "__algorithm/ranges_remove_copy.h" }
+      module ranges_remove_copy_if           { private header "__algorithm/ranges_remove_copy_if.h" }
+      module ranges_remove_if                { private header "__algorithm/ranges_remove_if.h" }
       module ranges_replace                  { private header "__algorithm/ranges_replace.h" }
+      module ranges_replace_copy             { private header "__algorithm/ranges_replace_copy.h" }
+      module ranges_replace_copy_if          { private header "__algorithm/ranges_replace_copy_if.h" }
       module ranges_replace_if               { private header "__algorithm/ranges_replace_if.h" }
       module ranges_reverse                  { private header "__algorithm/ranges_reverse.h" }
+      module ranges_reverse_copy             { private header "__algorithm/ranges_reverse_copy.h" }
+      module ranges_rotate_copy              { private header "__algorithm/ranges_rotate_copy.h" }
+      module ranges_search                   { private header "__algorithm/ranges_search.h" }
+      module ranges_search_n                 { private header "__algorithm/ranges_search_n.h" }
+      module ranges_set_difference           { private header "__algorithm/ranges_set_difference.h" }
+      module ranges_set_intersection         { private header "__algorithm/ranges_set_intersection.h" }
+      module ranges_set_symmetric_difference { private header "__algorithm/ranges_set_symmetric_difference.h" }
+      module ranges_set_union                { private header "__algorithm/ranges_set_union.h" }
+      module ranges_shuffle                  { private header "__algorithm/ranges_shuffle.h" }
       module ranges_sort                     { private header "__algorithm/ranges_sort.h" }
+      module ranges_sort_heap                { private header "__algorithm/ranges_sort_heap.h" }
+      module ranges_stable_partition         { private header "__algorithm/ranges_stable_partition.h" }
       module ranges_stable_sort              { private header "__algorithm/ranges_stable_sort.h" }
       module ranges_swap_ranges              { private header "__algorithm/ranges_swap_ranges.h" }
       module ranges_transform                { private header "__algorithm/ranges_transform.h" }
+      module ranges_unique                   { private header "__algorithm/ranges_unique.h" }
+      module ranges_unique_copy              { private header "__algorithm/ranges_unique_copy.h" }
       module ranges_upper_bound              { private header "__algorithm/ranges_upper_bound.h" }
       module remove                          { private header "__algorithm/remove.h" }
       module remove_copy                     { private header "__algorithm/remove_copy.h" }
@@ -747,6 +783,11 @@ module std [system] {
     header "latch"
     export *
   }
+
+  module __debug_utils {
+    module randomize_range { private header "__debug_utils/randomize_range.h" }
+  }
+
   module limits {
     header "limits"
     export *