CVS commit: pkgsrc/lang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Oct  6 19:18:15 UTC 2023

Modified Files:
        pkgsrc/lang/wasi-compiler-rt: Makefile buildlink3.mk
        pkgsrc/lang/wasi-libcxx: Makefile PLIST buildlink3.mk distinfo

Log Message:
wasi-compiler-rt, wasi-libcxx: update to LLVM 16


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/wasi-compiler-rt/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/wasi-compiler-rt/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/wasi-libcxx/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/wasi-libcxx/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/wasi-libcxx/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/wasi-libcxx/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/wasi-compiler-rt/Makefile
diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.21 pkgsrc/lang/wasi-compiler-rt/Makefile:1.22
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.21  Wed Apr 19 08:10:36 2023
+++ pkgsrc/lang/wasi-compiler-rt/Makefile       Fri Oct  6 19:18:15 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.21 2023/04/19 08:10:36 adam Exp $
+# $NetBSD: Makefile,v 1.22 2023/10/06 19:18:15 adam Exp $
 
-PKGREVISION= 1
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      compiler-rt-${LLVM_VERSION}.src
@@ -17,16 +16,12 @@ DISTINFO_FILE=      ${.CURDIR}/../../lang/com
 
 NOT_FOR_PLATFORM=      NetBSD-[0-7].*-*
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c99 c++11
 USE_TOOLS+=    ggrep
 
 SSP_SUPPORTED=         no
 PKGSRC_USE_STACK_CHECK=        no
 
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ${WRKSRC}/lib/builtins
-
 BUILDLINK_TRANSFORM+=  rm:-I/usr/include
 BUILDLINK_TRANSFORM+=  rm:-I${PREFIX}/include
 
@@ -54,14 +49,11 @@ CMAKE_ARGS+=        -DCMAKE_C_COMPILER_WORKS=1 
 CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER_WORKS=1 # Do not test clang++ compile
 CMAKE_ARGS+=   -DCOMPILER_RT_ENABLE_IOS=OFF
 
-CMAKE_INSTALL_PREFIX=  ${PREFIX}/lib/clang/${PKGVERSION_NOREV}
+CMAKE_INSTALL_PREFIX=  ${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}
 
 GENERATE_PLIST+=       find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
                        sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
 
-post-extract:
-       ${MKDIR} ${WRKSRC}/build
-
 .include "../../mk/bsd.prefs.mk"
 
 # Run llvm-ranlib again on the archive. Fixes mystery build failure
@@ -70,7 +62,7 @@ post-extract:
 .if ${OPSYS} != "Darwin"
 post-install:
        ${PREFIX}/bin/llvm-ranlib \
-         ${DESTDIR}${PREFIX}/lib/clang/${PKGVERSION_NOREV}/lib/wasi/libclang_rt.builtins-wasm32.a
+         ${DESTDIR}${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a
 .endif
 
 ABI=                   # 32
@@ -78,6 +70,7 @@ CFLAGS=                       -O2
 CXXFLAGS=              -O2
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
+.include "../../devel/cmake/build.mk"
 BUILDLINK_DEPMETHOD.clang=     build
 .include "../../lang/clang/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"

Index: pkgsrc/lang/wasi-compiler-rt/buildlink3.mk
diff -u pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.7 pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.8
--- pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.7      Tue May  2 18:19:24 2023
+++ pkgsrc/lang/wasi-compiler-rt/buildlink3.mk  Fri Oct  6 19:18:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2023/05/02 18:19:24 nikita Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2023/10/06 19:18:15 adam Exp $
 
 BUILDLINK_TREE+=       wasi-compiler-rt
 
@@ -9,7 +9,7 @@ WASI_COMPILER_RT_BUILDLINK3_MK:=
 
 # This exact version must be kept in sync with llvm, or firefox
 # minimum build dependencies will be incorrect.
-BUILDLINK_API_DEPENDS.wasi-compiler-rt+=       wasi-compiler-rt>=15.0.7<16
+BUILDLINK_API_DEPENDS.wasi-compiler-rt+=       wasi-compiler-rt>=16.0.0<17
 BUILDLINK_PKGSRCDIR.wasi-compiler-rt?=         ../../lang/wasi-compiler-rt
 
 .endif # WASI_COMPILER_RT_BUILDLINK3_MK

Index: pkgsrc/lang/wasi-libcxx/Makefile
diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.20 pkgsrc/lang/wasi-libcxx/Makefile:1.21
--- pkgsrc/lang/wasi-libcxx/Makefile:1.20       Tue Jun  6 12:41:47 2023
+++ pkgsrc/lang/wasi-libcxx/Makefile    Fri Oct  6 19:18:15 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.20 2023/06/06 12:41:47 riastradh Exp $
+# $NetBSD: Makefile,v 1.21 2023/10/06 19:18:15 adam Exp $
 
-PKGREVISION= 1
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      libcxxabi-${LLVM_VERSION}.src

Index: pkgsrc/lang/wasi-libcxx/PLIST
diff -u pkgsrc/lang/wasi-libcxx/PLIST:1.3 pkgsrc/lang/wasi-libcxx/PLIST:1.4
--- pkgsrc/lang/wasi-libcxx/PLIST:1.3   Mon Nov 14 18:44:07 2022
+++ pkgsrc/lang/wasi-libcxx/PLIST       Fri Oct  6 19:18:15 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/11/14 18:44:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/10/06 19:18:15 adam Exp $
 wasi/include/c++/v1/__algorithm/adjacent_find.h
 wasi/include/c++/v1/__algorithm/all_of.h
 wasi/include/c++/v1/__algorithm/any_of.h
@@ -9,6 +9,7 @@ wasi/include/c++/v1/__algorithm/comp_ref
 wasi/include/c++/v1/__algorithm/copy.h
 wasi/include/c++/v1/__algorithm/copy_backward.h
 wasi/include/c++/v1/__algorithm/copy_if.h
+wasi/include/c++/v1/__algorithm/copy_move_common.h
 wasi/include/c++/v1/__algorithm/copy_n.h
 wasi/include/c++/v1/__algorithm/count.h
 wasi/include/c++/v1/__algorithm/count_if.h
@@ -192,9 +193,19 @@ wasi/include/c++/v1/__algorithm/upper_bo
 wasi/include/c++/v1/__assert
 wasi/include/c++/v1/__availability
 wasi/include/c++/v1/__bit/bit_cast.h
+wasi/include/c++/v1/__bit/bit_ceil.h
+wasi/include/c++/v1/__bit/bit_floor.h
+wasi/include/c++/v1/__bit/bit_log2.h
+wasi/include/c++/v1/__bit/bit_width.h
+wasi/include/c++/v1/__bit/blsr.h
 wasi/include/c++/v1/__bit/byteswap.h
+wasi/include/c++/v1/__bit/countl.h
+wasi/include/c++/v1/__bit/countr.h
+wasi/include/c++/v1/__bit/endian.h
+wasi/include/c++/v1/__bit/has_single_bit.h
+wasi/include/c++/v1/__bit/popcount.h
+wasi/include/c++/v1/__bit/rotate.h
 wasi/include/c++/v1/__bit_reference
-wasi/include/c++/v1/__bits
 wasi/include/c++/v1/__bsd_locale_defaults.h
 wasi/include/c++/v1/__bsd_locale_fallbacks.h
 wasi/include/c++/v1/__charconv/chars_format.h
@@ -204,15 +215,20 @@ wasi/include/c++/v1/__charconv/to_chars_
 wasi/include/c++/v1/__charconv/to_chars_result.h
 wasi/include/c++/v1/__chrono/calendar.h
 wasi/include/c++/v1/__chrono/convert_to_timespec.h
+wasi/include/c++/v1/__chrono/convert_to_tm.h
 wasi/include/c++/v1/__chrono/day.h
 wasi/include/c++/v1/__chrono/duration.h
 wasi/include/c++/v1/__chrono/file_clock.h
+wasi/include/c++/v1/__chrono/formatter.h
 wasi/include/c++/v1/__chrono/hh_mm_ss.h
 wasi/include/c++/v1/__chrono/high_resolution_clock.h
 wasi/include/c++/v1/__chrono/literals.h
 wasi/include/c++/v1/__chrono/month.h
 wasi/include/c++/v1/__chrono/month_weekday.h
 wasi/include/c++/v1/__chrono/monthday.h
+wasi/include/c++/v1/__chrono/ostream.h
+wasi/include/c++/v1/__chrono/parser_std_format_spec.h
+wasi/include/c++/v1/__chrono/statically_widen.h
 wasi/include/c++/v1/__chrono/steady_clock.h
 wasi/include/c++/v1/__chrono/system_clock.h
 wasi/include/c++/v1/__chrono/time_point.h
@@ -266,6 +282,10 @@ wasi/include/c++/v1/__cxxabi_config.h
 wasi/include/c++/v1/__debug
 wasi/include/c++/v1/__debug_utils/randomize_range.h
 wasi/include/c++/v1/__errc
+wasi/include/c++/v1/__expected/bad_expected_access.h
+wasi/include/c++/v1/__expected/expected.h
+wasi/include/c++/v1/__expected/unexpect.h
+wasi/include/c++/v1/__expected/unexpected.h
 wasi/include/c++/v1/__filesystem/copy_options.h
 wasi/include/c++/v1/__filesystem/directory_entry.h
 wasi/include/c++/v1/__filesystem/directory_iterator.h
@@ -284,13 +304,16 @@ wasi/include/c++/v1/__filesystem/space_i
 wasi/include/c++/v1/__filesystem/u8path.h
 wasi/include/c++/v1/__format/buffer.h
 wasi/include/c++/v1/__format/concepts.h
+wasi/include/c++/v1/__format/container_adaptor.h
 wasi/include/c++/v1/__format/enable_insertable.h
+wasi/include/c++/v1/__format/escaped_output_table.h
 wasi/include/c++/v1/__format/extended_grapheme_cluster_table.h
 wasi/include/c++/v1/__format/format_arg.h
 wasi/include/c++/v1/__format/format_arg_store.h
 wasi/include/c++/v1/__format/format_args.h
 wasi/include/c++/v1/__format/format_context.h
 wasi/include/c++/v1/__format/format_error.h
+wasi/include/c++/v1/__format/format_functions.h
 wasi/include/c++/v1/__format/format_fwd.h
 wasi/include/c++/v1/__format/format_parse_context.h
 wasi/include/c++/v1/__format/format_string.h
@@ -304,7 +327,10 @@ wasi/include/c++/v1/__format/formatter_i
 wasi/include/c++/v1/__format/formatter_output.h
 wasi/include/c++/v1/__format/formatter_pointer.h
 wasi/include/c++/v1/__format/formatter_string.h
+wasi/include/c++/v1/__format/formatter_tuple.h
 wasi/include/c++/v1/__format/parser_std_format_spec.h
+wasi/include/c++/v1/__format/range_default_formatter.h
+wasi/include/c++/v1/__format/range_formatter.h
 wasi/include/c++/v1/__format/unicode.h
 wasi/include/c++/v1/__functional/binary_function.h
 wasi/include/c++/v1/__functional/binary_negate.h
@@ -334,8 +360,16 @@ wasi/include/c++/v1/__functional/unary_f
 wasi/include/c++/v1/__functional/unary_negate.h
 wasi/include/c++/v1/__functional/unwrap_ref.h
 wasi/include/c++/v1/__functional/weak_result_type.h
+wasi/include/c++/v1/__fwd/array.h
+wasi/include/c++/v1/__fwd/get.h
+wasi/include/c++/v1/__fwd/hash.h
+wasi/include/c++/v1/__fwd/memory_resource.h
+wasi/include/c++/v1/__fwd/pair.h
 wasi/include/c++/v1/__fwd/span.h
+wasi/include/c++/v1/__fwd/string.h
 wasi/include/c++/v1/__fwd/string_view.h
+wasi/include/c++/v1/__fwd/subrange.h
+wasi/include/c++/v1/__fwd/tuple.h
 wasi/include/c++/v1/__hash_table
 wasi/include/c++/v1/__ios/fpos.h
 wasi/include/c++/v1/__iterator/access.h
@@ -360,6 +394,7 @@ wasi/include/c++/v1/__iterator/iter_move
 wasi/include/c++/v1/__iterator/iter_swap.h
 wasi/include/c++/v1/__iterator/iterator.h
 wasi/include/c++/v1/__iterator/iterator_traits.h
+wasi/include/c++/v1/__iterator/iterator_with_data.h
 wasi/include/c++/v1/__iterator/mergeable.h
 wasi/include/c++/v1/__iterator/move_iterator.h
 wasi/include/c++/v1/__iterator/move_sentinel.h
@@ -372,6 +407,7 @@ wasi/include/c++/v1/__iterator/projected
 wasi/include/c++/v1/__iterator/readable_traits.h
 wasi/include/c++/v1/__iterator/reverse_access.h
 wasi/include/c++/v1/__iterator/reverse_iterator.h
+wasi/include/c++/v1/__iterator/segmented_iterator.h
 wasi/include/c++/v1/__iterator/size.h
 wasi/include/c++/v1/__iterator/sortable.h
 wasi/include/c++/v1/__iterator/unreachable_sentinel.h
@@ -379,27 +415,39 @@ wasi/include/c++/v1/__iterator/wrap_iter
 wasi/include/c++/v1/__locale
 wasi/include/c++/v1/__mbstate_t.h
 wasi/include/c++/v1/__memory/addressof.h
+wasi/include/c++/v1/__memory/align.h
 wasi/include/c++/v1/__memory/allocate_at_least.h
 wasi/include/c++/v1/__memory/allocation_guard.h
 wasi/include/c++/v1/__memory/allocator.h
 wasi/include/c++/v1/__memory/allocator_arg_t.h
+wasi/include/c++/v1/__memory/allocator_destructor.h
 wasi/include/c++/v1/__memory/allocator_traits.h
 wasi/include/c++/v1/__memory/assume_aligned.h
 wasi/include/c++/v1/__memory/auto_ptr.h
+wasi/include/c++/v1/__memory/builtin_new_allocator.h
 wasi/include/c++/v1/__memory/compressed_pair.h
 wasi/include/c++/v1/__memory/concepts.h
 wasi/include/c++/v1/__memory/construct_at.h
+wasi/include/c++/v1/__memory/destruct_n.h
 wasi/include/c++/v1/__memory/pointer_traits.h
 wasi/include/c++/v1/__memory/ranges_construct_at.h
 wasi/include/c++/v1/__memory/ranges_uninitialized_algorithms.h
 wasi/include/c++/v1/__memory/raw_storage_iterator.h
 wasi/include/c++/v1/__memory/shared_ptr.h
 wasi/include/c++/v1/__memory/swap_allocator.h
+wasi/include/c++/v1/__memory/temp_value.h
 wasi/include/c++/v1/__memory/temporary_buffer.h
 wasi/include/c++/v1/__memory/uninitialized_algorithms.h
 wasi/include/c++/v1/__memory/unique_ptr.h
 wasi/include/c++/v1/__memory/uses_allocator.h
+wasi/include/c++/v1/__memory/uses_allocator_construction.h
 wasi/include/c++/v1/__memory/voidify.h
+wasi/include/c++/v1/__memory_resource/memory_resource.h
+wasi/include/c++/v1/__memory_resource/monotonic_buffer_resource.h
+wasi/include/c++/v1/__memory_resource/polymorphic_allocator.h
+wasi/include/c++/v1/__memory_resource/pool_options.h
+wasi/include/c++/v1/__memory_resource/synchronized_pool_resource.h
+wasi/include/c++/v1/__memory_resource/unsynchronized_pool_resource.h
 wasi/include/c++/v1/__mutex_base
 wasi/include/c++/v1/__node_handle
 wasi/include/c++/v1/__numeric/accumulate.h
@@ -454,6 +502,7 @@ wasi/include/c++/v1/__random/uniform_rea
 wasi/include/c++/v1/__random/weibull_distribution.h
 wasi/include/c++/v1/__ranges/access.h
 wasi/include/c++/v1/__ranges/all.h
+wasi/include/c++/v1/__ranges/as_rvalue_view.h
 wasi/include/c++/v1/__ranges/common_view.h
 wasi/include/c++/v1/__ranges/concepts.h
 wasi/include/c++/v1/__ranges/copyable_box.h
@@ -461,12 +510,15 @@ wasi/include/c++/v1/__ranges/counted.h
 wasi/include/c++/v1/__ranges/dangling.h
 wasi/include/c++/v1/__ranges/data.h
 wasi/include/c++/v1/__ranges/drop_view.h
+wasi/include/c++/v1/__ranges/drop_while_view.h
+wasi/include/c++/v1/__ranges/elements_view.h
 wasi/include/c++/v1/__ranges/empty.h
 wasi/include/c++/v1/__ranges/empty_view.h
 wasi/include/c++/v1/__ranges/enable_borrowed_range.h
 wasi/include/c++/v1/__ranges/enable_view.h
 wasi/include/c++/v1/__ranges/filter_view.h
 wasi/include/c++/v1/__ranges/iota_view.h
+wasi/include/c++/v1/__ranges/istream_view.h
 wasi/include/c++/v1/__ranges/join_view.h
 wasi/include/c++/v1/__ranges/lazy_split_view.h
 wasi/include/c++/v1/__ranges/non_propagating_cache.h
@@ -478,8 +530,10 @@ wasi/include/c++/v1/__ranges/rend.h
 wasi/include/c++/v1/__ranges/reverse_view.h
 wasi/include/c++/v1/__ranges/single_view.h
 wasi/include/c++/v1/__ranges/size.h
+wasi/include/c++/v1/__ranges/split_view.h
 wasi/include/c++/v1/__ranges/subrange.h
 wasi/include/c++/v1/__ranges/take_view.h
+wasi/include/c++/v1/__ranges/take_while_view.h
 wasi/include/c++/v1/__ranges/transform_view.h
 wasi/include/c++/v1/__ranges/view_interface.h
 wasi/include/c++/v1/__ranges/views.h
@@ -500,7 +554,6 @@ wasi/include/c++/v1/__support/openbsd/xl
 wasi/include/c++/v1/__support/solaris/floatingpoint.h
 wasi/include/c++/v1/__support/solaris/wchar.h
 wasi/include/c++/v1/__support/solaris/xlocale.h
-wasi/include/c++/v1/__support/win32/limits_msvc_win32.h
 wasi/include/c++/v1/__support/win32/locale_win32.h
 wasi/include/c++/v1/__support/xlocale/__nop_locale_mgmt.h
 wasi/include/c++/v1/__support/xlocale/__posix_l_fallback.h
@@ -509,7 +562,16 @@ wasi/include/c++/v1/__thread/poll_with_b
 wasi/include/c++/v1/__thread/timed_backoff_policy.h
 wasi/include/c++/v1/__threading_support
 wasi/include/c++/v1/__tree
-wasi/include/c++/v1/__tuple
+wasi/include/c++/v1/__tuple_dir/apply_cv.h
+wasi/include/c++/v1/__tuple_dir/make_tuple_types.h
+wasi/include/c++/v1/__tuple_dir/pair_like.h
+wasi/include/c++/v1/__tuple_dir/sfinae_helpers.h
+wasi/include/c++/v1/__tuple_dir/tuple_element.h
+wasi/include/c++/v1/__tuple_dir/tuple_indices.h
+wasi/include/c++/v1/__tuple_dir/tuple_like.h
+wasi/include/c++/v1/__tuple_dir/tuple_like_ext.h
+wasi/include/c++/v1/__tuple_dir/tuple_size.h
+wasi/include/c++/v1/__tuple_dir/tuple_types.h
 wasi/include/c++/v1/__type_traits/add_const.h
 wasi/include/c++/v1/__type_traits/add_cv.h
 wasi/include/c++/v1/__type_traits/add_lvalue_reference.h
@@ -520,6 +582,7 @@ wasi/include/c++/v1/__type_traits/aligne
 wasi/include/c++/v1/__type_traits/aligned_union.h
 wasi/include/c++/v1/__type_traits/alignment_of.h
 wasi/include/c++/v1/__type_traits/apply_cv.h
+wasi/include/c++/v1/__type_traits/can_extract_key.h
 wasi/include/c++/v1/__type_traits/common_reference.h
 wasi/include/c++/v1/__type_traits/common_type.h
 wasi/include/c++/v1/__type_traits/conditional.h
@@ -527,6 +590,7 @@ wasi/include/c++/v1/__type_traits/conjun
 wasi/include/c++/v1/__type_traits/copy_cv.h
 wasi/include/c++/v1/__type_traits/copy_cvref.h
 wasi/include/c++/v1/__type_traits/decay.h
+wasi/include/c++/v1/__type_traits/dependent_type.h
 wasi/include/c++/v1/__type_traits/disjunction.h
 wasi/include/c++/v1/__type_traits/enable_if.h
 wasi/include/c++/v1/__type_traits/extent.h
@@ -535,12 +599,15 @@ wasi/include/c++/v1/__type_traits/has_vi
 wasi/include/c++/v1/__type_traits/integral_constant.h
 wasi/include/c++/v1/__type_traits/is_abstract.h
 wasi/include/c++/v1/__type_traits/is_aggregate.h
+wasi/include/c++/v1/__type_traits/is_allocator.h
+wasi/include/c++/v1/__type_traits/is_always_bitcastable.h
 wasi/include/c++/v1/__type_traits/is_arithmetic.h
 wasi/include/c++/v1/__type_traits/is_array.h
 wasi/include/c++/v1/__type_traits/is_assignable.h
 wasi/include/c++/v1/__type_traits/is_base_of.h
 wasi/include/c++/v1/__type_traits/is_bounded_array.h
 wasi/include/c++/v1/__type_traits/is_callable.h
+wasi/include/c++/v1/__type_traits/is_char_like_type.h
 wasi/include/c++/v1/__type_traits/is_class.h
 wasi/include/c++/v1/__type_traits/is_compound.h
 wasi/include/c++/v1/__type_traits/is_const.h
@@ -558,6 +625,7 @@ wasi/include/c++/v1/__type_traits/is_fin
 wasi/include/c++/v1/__type_traits/is_floating_point.h
 wasi/include/c++/v1/__type_traits/is_function.h
 wasi/include/c++/v1/__type_traits/is_fundamental.h
+wasi/include/c++/v1/__type_traits/is_implicitly_default_constructible.h
 wasi/include/c++/v1/__type_traits/is_integral.h
 wasi/include/c++/v1/__type_traits/is_literal_type.h
 wasi/include/c++/v1/__type_traits/is_member_function_pointer.h
@@ -588,7 +656,9 @@ wasi/include/c++/v1/__type_traits/is_sca
 wasi/include/c++/v1/__type_traits/is_scoped_enum.h
 wasi/include/c++/v1/__type_traits/is_signed.h
 wasi/include/c++/v1/__type_traits/is_signed_integer.h
+wasi/include/c++/v1/__type_traits/is_specialization.h
 wasi/include/c++/v1/__type_traits/is_standard_layout.h
+wasi/include/c++/v1/__type_traits/is_swappable.h
 wasi/include/c++/v1/__type_traits/is_trivial.h
 wasi/include/c++/v1/__type_traits/is_trivially_assignable.h
 wasi/include/c++/v1/__type_traits/is_trivially_constructible.h
@@ -608,20 +678,26 @@ wasi/include/c++/v1/__type_traits/is_voi
 wasi/include/c++/v1/__type_traits/is_volatile.h
 wasi/include/c++/v1/__type_traits/lazy.h
 wasi/include/c++/v1/__type_traits/make_32_64_or_128_bit.h
+wasi/include/c++/v1/__type_traits/make_const_lvalue_ref.h
 wasi/include/c++/v1/__type_traits/make_signed.h
 wasi/include/c++/v1/__type_traits/make_unsigned.h
+wasi/include/c++/v1/__type_traits/maybe_const.h
 wasi/include/c++/v1/__type_traits/nat.h
 wasi/include/c++/v1/__type_traits/negation.h
+wasi/include/c++/v1/__type_traits/noexcept_move_assign_container.h
 wasi/include/c++/v1/__type_traits/promote.h
 wasi/include/c++/v1/__type_traits/rank.h
 wasi/include/c++/v1/__type_traits/remove_all_extents.h
 wasi/include/c++/v1/__type_traits/remove_const.h
+wasi/include/c++/v1/__type_traits/remove_const_ref.h
 wasi/include/c++/v1/__type_traits/remove_cv.h
 wasi/include/c++/v1/__type_traits/remove_cvref.h
 wasi/include/c++/v1/__type_traits/remove_extent.h
 wasi/include/c++/v1/__type_traits/remove_pointer.h
 wasi/include/c++/v1/__type_traits/remove_reference.h
 wasi/include/c++/v1/__type_traits/remove_volatile.h
+wasi/include/c++/v1/__type_traits/result_of.h
+wasi/include/c++/v1/__type_traits/strip_signature.h
 wasi/include/c++/v1/__type_traits/type_identity.h
 wasi/include/c++/v1/__type_traits/type_list.h
 wasi/include/c++/v1/__type_traits/underlying_type.h
@@ -630,9 +706,12 @@ wasi/include/c++/v1/__undef_macros
 wasi/include/c++/v1/__utility/as_const.h
 wasi/include/c++/v1/__utility/auto_cast.h
 wasi/include/c++/v1/__utility/cmp.h
+wasi/include/c++/v1/__utility/convert_to_integral.h
 wasi/include/c++/v1/__utility/declval.h
+wasi/include/c++/v1/__utility/exception_guard.h
 wasi/include/c++/v1/__utility/exchange.h
 wasi/include/c++/v1/__utility/forward.h
+wasi/include/c++/v1/__utility/forward_like.h
 wasi/include/c++/v1/__utility/in_place.h
 wasi/include/c++/v1/__utility/integer_sequence.h
 wasi/include/c++/v1/__utility/move.h
@@ -642,7 +721,6 @@ wasi/include/c++/v1/__utility/priority_t
 wasi/include/c++/v1/__utility/rel_ops.h
 wasi/include/c++/v1/__utility/swap.h
 wasi/include/c++/v1/__utility/to_underlying.h
-wasi/include/c++/v1/__utility/transaction.h
 wasi/include/c++/v1/__utility/unreachable.h
 wasi/include/c++/v1/__variant/monostate.h
 wasi/include/c++/v1/__verbose_abort
@@ -693,6 +771,7 @@ wasi/include/c++/v1/deque
 wasi/include/c++/v1/errno.h
 wasi/include/c++/v1/exception
 wasi/include/c++/v1/execution
+wasi/include/c++/v1/expected
 wasi/include/c++/v1/experimental/__config
 wasi/include/c++/v1/experimental/__memory
 wasi/include/c++/v1/experimental/algorithm
@@ -734,6 +813,7 @@ wasi/include/c++/v1/iostream
 wasi/include/c++/v1/istream
 wasi/include/c++/v1/iterator
 wasi/include/c++/v1/latch
+wasi/include/c++/v1/libcxx.imp
 wasi/include/c++/v1/limits
 wasi/include/c++/v1/limits.h
 wasi/include/c++/v1/list
@@ -742,6 +822,7 @@ wasi/include/c++/v1/locale.h
 wasi/include/c++/v1/map
 wasi/include/c++/v1/math.h
 wasi/include/c++/v1/memory
+wasi/include/c++/v1/memory_resource
 wasi/include/c++/v1/module.modulemap
 wasi/include/c++/v1/mutex
 wasi/include/c++/v1/new
@@ -759,6 +840,7 @@ wasi/include/c++/v1/semaphore
 wasi/include/c++/v1/set
 wasi/include/c++/v1/setjmp.h
 wasi/include/c++/v1/shared_mutex
+wasi/include/c++/v1/source_location
 wasi/include/c++/v1/span
 wasi/include/c++/v1/sstream
 wasi/include/c++/v1/stack

Index: pkgsrc/lang/wasi-libcxx/buildlink3.mk
diff -u pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.6 pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.7
--- pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.6   Tue May  2 18:19:23 2023
+++ pkgsrc/lang/wasi-libcxx/buildlink3.mk       Fri Oct  6 19:18:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2023/05/02 18:19:23 nikita Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2023/10/06 19:18:15 adam Exp $
 
 BUILDLINK_TREE+=       wasi-libcxx
 
@@ -7,7 +7,7 @@ BUILDLINK_DEPMETHOD.wasi-libcxx?=       build
 .if !defined(WASI_LIBCXX_BUILDLINK3_MK)
 WASI_LIBCXX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.wasi-libcxx+=    wasi-libcxx>=15.0.6<16
+BUILDLINK_API_DEPENDS.wasi-libcxx+=    wasi-libcxx>=16.0.0<17
 BUILDLINK_PKGSRCDIR.wasi-libcxx?=      ../../lang/wasi-libcxx
 
 .endif # WASI_LIBCXX_BUILDLINK3_MK

Index: pkgsrc/lang/wasi-libcxx/distinfo
diff -u pkgsrc/lang/wasi-libcxx/distinfo:1.8 pkgsrc/lang/wasi-libcxx/distinfo:1.9
--- pkgsrc/lang/wasi-libcxx/distinfo:1.8        Thu Jan 12 19:32:54 2023
+++ pkgsrc/lang/wasi-libcxx/distinfo    Fri Oct  6 19:18:15 2023
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.8 2023/01/12 19:32:54 adam Exp $
+$NetBSD: distinfo,v 1.9 2023/10/06 19:18:15 adam Exp $
 
-BLAKE2s (cmake-15.0.7.src.tar.xz) = 2c299f2c58800bcb0c5930562d24baed0e94806df8b8d5295c0866ffeaaf233f
-SHA512 (cmake-15.0.7.src.tar.xz) = 85097a6eaee0df004567905f7e5ce8ca02e3b46c6fc66fa552fe99734642e6ee61685de4e5e6e8b505963334d7b91d98ecd9c5870e6bdd3f0018ee5b963ffa96
-Size (cmake-15.0.7.src.tar.xz) = 6972 bytes
-BLAKE2s (libcxx-15.0.7.src.tar.xz) = 952e9a57fd17139b2e298fdaa6ff893458b52d576495c47b734becc3d9d809fe
-SHA512 (libcxx-15.0.7.src.tar.xz) = 2c47cb93867e137a9bc8dd273335bb153e2353eb308635c2264be962fa421ddc10eb3ec8b5800204fc1f8ee51abbe0c526665300cb7e94e9f8b7e9891b5c5b64
-Size (libcxx-15.0.7.src.tar.xz) = 3337404 bytes
-BLAKE2s (libcxxabi-15.0.7.src.tar.xz) = 6757adcf553b335f75547484fa69799afd75b6933ce5d4dffafe97c14557ddbd
-SHA512 (libcxxabi-15.0.7.src.tar.xz) = 415417b1e5addfa6047f9a4e49b1ccd6ae7fa8c6138e61f3d1e57321c8723aaf133cf2673a6f8756f6ecbc1ca7d2b962406969d47b12b3d9e5a1f63f1353a2e5
-Size (libcxxabi-15.0.7.src.tar.xz) = 568764 bytes
+BLAKE2s (cmake-16.0.6.src.tar.xz) = a967225f31bcd98484d632a2d530c498131b0035f18b15e27915663b915dc6ba
+SHA512 (cmake-16.0.6.src.tar.xz) = 52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b
+Size (cmake-16.0.6.src.tar.xz) = 9008 bytes
+BLAKE2s (libcxx-16.0.6.src.tar.xz) = 4ad216b6f725c6b3207f76a0b1bcdb2ef46bfcf9cef8cbe289b3c89632fcbf3d
+SHA512 (libcxx-16.0.6.src.tar.xz) = d5ccadcceb67815ad0537ec82d40fd52b0ac5e5b37acba8951d92d2f16f7e19adf517d7249f0fca448c9f60a740c63ddfe23630e519148e8d8f37693614830db
+Size (libcxx-16.0.6.src.tar.xz) = 3655520 bytes
+BLAKE2s (libcxxabi-16.0.6.src.tar.xz) = 62b0fea4aa05c44ecf34f188f8aec8fc1a41bc34ff42fdc3831eb515c31a282c
+SHA512 (libcxxabi-16.0.6.src.tar.xz) = 5f49ad34d5d00a3cd5ca92c8570b0cd77123a818456fe30a3fab7c14a2fe134ada5215466f729c9e1da12a38a9e2b2254b80775bda2986c505a2cad5af5cb70e
+Size (libcxxabi-16.0.6.src.tar.xz) = 573564 bytes
 SHA1 (patch-libcxx_include_CMakeLists.txt) = ca1d4f8dbc99bbcfdad6a0bd389f973a48a938d7
 SHA1 (patch-libcxxabi_src_CMakeLists.txt) = ccd70bb5902b31a6bb989521e9a5f50fe0a4021d