Skip to content

Commit b45491b

Browse files
0-wiz-00-wiz-0
committed
libcxx: finish update
1 parent 17c16c7 commit b45491b

File tree

2 files changed

+164
-10
lines changed

2 files changed

+164
-10
lines changed

‎libcxx/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ LICENSE= apache-2.0
1515
# libcxx's includes to build, so we have this unholy extra distfiles thing
1616
# in both of them to get them to build against each other without causing
1717
# circular dependencies. This must be kept in sync with libcxxabi/Makefile.
18-
LIBCXXABI= libcxxabi-${LLVM_VERSION}.src
19-
LLVMDIST= llvm-${LLVM_VERSION}.src
20-
_EXTRA_DIST= ${LIBCXXABI}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX}
18+
LIBCXXABI= libcxxabi-${LLVM_VERSION}.src
19+
LLVMDIST= llvm-${LLVM_VERSION}.src
20+
_EXTRA_DIST= ${LIBCXXABI}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX} # ${LIBUNWIND}${EXTRACT_SUFX}
2121
SITES.${LIBCXXABI}${EXTRACT_SUFX}= ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
2222
SITES.${LLLVMDIST}${EXTRACT_SUFX}= ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
2323

@@ -37,7 +37,7 @@ CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
3737
CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
3838
CMAKE_ARGS+= -DLIBCXX_CXX_ABI=libcxxabi
3939
CMAKE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
40-
CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=ON
40+
CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
4141
CMAKE_ARGS+= -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
4242

4343
# avoid conflict with stddef.h
@@ -49,4 +49,5 @@ post-extract:
4949
${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
5050

5151
.include "../../wip/libcxxabi/buildlink3.mk"
52+
.include "../../wip/libunwind/buildlink3.mk"
5253
.include "../../mk/bsd.pkg.mk"

‎libcxx/PLIST

Lines changed: 159 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.7 2021/11/23 20:55:43 wiz Exp $
1+
@comment $NetBSD$
22
include/c++/v1/__algorithm/adjacent_find.h
33
include/c++/v1/__algorithm/all_of.h
44
include/c++/v1/__algorithm/any_of.h
@@ -26,6 +26,9 @@ include/c++/v1/__algorithm/for_each_n.h
2626
include/c++/v1/__algorithm/generate.h
2727
include/c++/v1/__algorithm/generate_n.h
2828
include/c++/v1/__algorithm/half_positive.h
29+
include/c++/v1/__algorithm/in_in_out_result.h
30+
include/c++/v1/__algorithm/in_in_result.h
31+
include/c++/v1/__algorithm/in_out_result.h
2932
include/c++/v1/__algorithm/includes.h
3033
include/c++/v1/__algorithm/inplace_merge.h
3134
include/c++/v1/__algorithm/is_heap.h
@@ -93,24 +96,108 @@ include/c++/v1/__algorithm/unique_copy.h
9396
include/c++/v1/__algorithm/unwrap_iter.h
9497
include/c++/v1/__algorithm/upper_bound.h
9598
include/c++/v1/__availability
99+
include/c++/v1/__bit/bit_cast.h
100+
include/c++/v1/__bit/byteswap.h
96101
include/c++/v1/__bit_reference
97102
include/c++/v1/__bits
98103
include/c++/v1/__bsd_locale_defaults.h
99104
include/c++/v1/__bsd_locale_fallbacks.h
105+
include/c++/v1/__charconv/chars_format.h
106+
include/c++/v1/__charconv/from_chars_result.h
107+
include/c++/v1/__charconv/to_chars_result.h
108+
include/c++/v1/__chrono/calendar.h
109+
include/c++/v1/__chrono/convert_to_timespec.h
110+
include/c++/v1/__chrono/duration.h
111+
include/c++/v1/__chrono/file_clock.h
112+
include/c++/v1/__chrono/high_resolution_clock.h
113+
include/c++/v1/__chrono/steady_clock.h
114+
include/c++/v1/__chrono/system_clock.h
115+
include/c++/v1/__chrono/time_point.h
116+
include/c++/v1/__compare/common_comparison_category.h
117+
include/c++/v1/__compare/compare_partial_order_fallback.h
118+
include/c++/v1/__compare/compare_strong_order_fallback.h
119+
include/c++/v1/__compare/compare_three_way.h
120+
include/c++/v1/__compare/compare_three_way_result.h
121+
include/c++/v1/__compare/compare_weak_order_fallback.h
122+
include/c++/v1/__compare/is_eq.h
123+
include/c++/v1/__compare/ordering.h
124+
include/c++/v1/__compare/partial_order.h
125+
include/c++/v1/__compare/strong_order.h
126+
include/c++/v1/__compare/synth_three_way.h
127+
include/c++/v1/__compare/three_way_comparable.h
128+
include/c++/v1/__compare/weak_order.h
129+
include/c++/v1/__concepts/arithmetic.h
130+
include/c++/v1/__concepts/assignable.h
131+
include/c++/v1/__concepts/boolean_testable.h
132+
include/c++/v1/__concepts/class_or_enum.h
133+
include/c++/v1/__concepts/common_reference_with.h
134+
include/c++/v1/__concepts/common_with.h
135+
include/c++/v1/__concepts/constructible.h
136+
include/c++/v1/__concepts/convertible_to.h
137+
include/c++/v1/__concepts/copyable.h
138+
include/c++/v1/__concepts/derived_from.h
139+
include/c++/v1/__concepts/destructible.h
140+
include/c++/v1/__concepts/different_from.h
141+
include/c++/v1/__concepts/equality_comparable.h
142+
include/c++/v1/__concepts/invocable.h
143+
include/c++/v1/__concepts/movable.h
144+
include/c++/v1/__concepts/predicate.h
145+
include/c++/v1/__concepts/regular.h
146+
include/c++/v1/__concepts/relation.h
147+
include/c++/v1/__concepts/same_as.h
148+
include/c++/v1/__concepts/semiregular.h
149+
include/c++/v1/__concepts/swappable.h
150+
include/c++/v1/__concepts/totally_ordered.h
100151
include/c++/v1/__config
101152
include/c++/v1/__config_site
153+
include/c++/v1/__coroutine/coroutine_handle.h
154+
include/c++/v1/__coroutine/coroutine_traits.h
155+
include/c++/v1/__coroutine/noop_coroutine_handle.h
156+
include/c++/v1/__coroutine/trivial_awaitables.h
102157
include/c++/v1/__cxxabi_config.h
103158
include/c++/v1/__debug
104159
include/c++/v1/__errc
160+
include/c++/v1/__filesystem/copy_options.h
161+
include/c++/v1/__filesystem/directory_entry.h
162+
include/c++/v1/__filesystem/directory_iterator.h
163+
include/c++/v1/__filesystem/directory_options.h
164+
include/c++/v1/__filesystem/file_status.h
165+
include/c++/v1/__filesystem/file_time_type.h
166+
include/c++/v1/__filesystem/file_type.h
167+
include/c++/v1/__filesystem/filesystem_error.h
168+
include/c++/v1/__filesystem/operations.h
169+
include/c++/v1/__filesystem/path.h
170+
include/c++/v1/__filesystem/path_iterator.h
171+
include/c++/v1/__filesystem/perm_options.h
172+
include/c++/v1/__filesystem/perms.h
173+
include/c++/v1/__filesystem/recursive_directory_iterator.h
174+
include/c++/v1/__filesystem/space_info.h
175+
include/c++/v1/__filesystem/u8path.h
176+
include/c++/v1/__format/format_arg.h
177+
include/c++/v1/__format/format_args.h
178+
include/c++/v1/__format/format_context.h
105179
include/c++/v1/__format/format_error.h
180+
include/c++/v1/__format/format_fwd.h
106181
include/c++/v1/__format/format_parse_context.h
107-
include/c++/v1/__function_like.h
182+
include/c++/v1/__format/format_string.h
183+
include/c++/v1/__format/format_to_n_result.h
184+
include/c++/v1/__format/formatter.h
185+
include/c++/v1/__format/formatter_bool.h
186+
include/c++/v1/__format/formatter_char.h
187+
include/c++/v1/__format/formatter_floating_point.h
188+
include/c++/v1/__format/formatter_integer.h
189+
include/c++/v1/__format/formatter_integral.h
190+
include/c++/v1/__format/formatter_pointer.h
191+
include/c++/v1/__format/formatter_string.h
192+
include/c++/v1/__format/parser_std_format_spec.h
108193
include/c++/v1/__functional/binary_function.h
109194
include/c++/v1/__functional/binary_negate.h
110195
include/c++/v1/__functional/bind.h
196+
include/c++/v1/__functional/bind_back.h
111197
include/c++/v1/__functional/bind_front.h
112198
include/c++/v1/__functional/binder1st.h
113199
include/c++/v1/__functional/binder2nd.h
200+
include/c++/v1/__functional/compose.h
114201
include/c++/v1/__functional/default_searcher.h
115202
include/c++/v1/__functional/function.h
116203
include/c++/v1/__functional/hash.h
@@ -145,6 +232,7 @@ include/c++/v1/__iterator/empty.h
145232
include/c++/v1/__iterator/erase_if_container.h
146233
include/c++/v1/__iterator/front_insert_iterator.h
147234
include/c++/v1/__iterator/incrementable_traits.h
235+
include/c++/v1/__iterator/indirectly_comparable.h
148236
include/c++/v1/__iterator/insert_iterator.h
149237
include/c++/v1/__iterator/istream_iterator.h
150238
include/c++/v1/__iterator/istreambuf_iterator.h
@@ -162,62 +250,122 @@ include/c++/v1/__iterator/readable_traits.h
162250
include/c++/v1/__iterator/reverse_access.h
163251
include/c++/v1/__iterator/reverse_iterator.h
164252
include/c++/v1/__iterator/size.h
253+
include/c++/v1/__iterator/unreachable_sentinel.h
165254
include/c++/v1/__iterator/wrap_iter.h
166255
include/c++/v1/__libcpp_version
167256
include/c++/v1/__locale
257+
include/c++/v1/__mbstate_t.h
168258
include/c++/v1/__memory/addressof.h
169259
include/c++/v1/__memory/allocation_guard.h
170260
include/c++/v1/__memory/allocator.h
171261
include/c++/v1/__memory/allocator_arg_t.h
172262
include/c++/v1/__memory/allocator_traits.h
173263
include/c++/v1/__memory/auto_ptr.h
174264
include/c++/v1/__memory/compressed_pair.h
265+
include/c++/v1/__memory/concepts.h
175266
include/c++/v1/__memory/construct_at.h
176-
include/c++/v1/__memory/pointer_safety.h
177267
include/c++/v1/__memory/pointer_traits.h
268+
include/c++/v1/__memory/ranges_construct_at.h
269+
include/c++/v1/__memory/ranges_uninitialized_algorithms.h
178270
include/c++/v1/__memory/raw_storage_iterator.h
179271
include/c++/v1/__memory/shared_ptr.h
180272
include/c++/v1/__memory/temporary_buffer.h
181273
include/c++/v1/__memory/uninitialized_algorithms.h
182274
include/c++/v1/__memory/unique_ptr.h
183275
include/c++/v1/__memory/uses_allocator.h
276+
include/c++/v1/__memory/voidify.h
184277
include/c++/v1/__mutex_base
185278
include/c++/v1/__node_handle
186279
include/c++/v1/__nullptr
280+
include/c++/v1/__numeric/accumulate.h
281+
include/c++/v1/__numeric/adjacent_difference.h
282+
include/c++/v1/__numeric/exclusive_scan.h
283+
include/c++/v1/__numeric/gcd_lcm.h
284+
include/c++/v1/__numeric/inclusive_scan.h
285+
include/c++/v1/__numeric/inner_product.h
286+
include/c++/v1/__numeric/iota.h
287+
include/c++/v1/__numeric/midpoint.h
288+
include/c++/v1/__numeric/partial_sum.h
289+
include/c++/v1/__numeric/reduce.h
290+
include/c++/v1/__numeric/transform_exclusive_scan.h
291+
include/c++/v1/__numeric/transform_inclusive_scan.h
292+
include/c++/v1/__numeric/transform_reduce.h
293+
include/c++/v1/__random/bernoulli_distribution.h
294+
include/c++/v1/__random/binomial_distribution.h
295+
include/c++/v1/__random/cauchy_distribution.h
296+
include/c++/v1/__random/chi_squared_distribution.h
297+
include/c++/v1/__random/clamp_to_integral.h
298+
include/c++/v1/__random/default_random_engine.h
299+
include/c++/v1/__random/discard_block_engine.h
300+
include/c++/v1/__random/discrete_distribution.h
301+
include/c++/v1/__random/exponential_distribution.h
302+
include/c++/v1/__random/extreme_value_distribution.h
303+
include/c++/v1/__random/fisher_f_distribution.h
304+
include/c++/v1/__random/gamma_distribution.h
305+
include/c++/v1/__random/generate_canonical.h
306+
include/c++/v1/__random/geometric_distribution.h
307+
include/c++/v1/__random/independent_bits_engine.h
308+
include/c++/v1/__random/is_seed_sequence.h
309+
include/c++/v1/__random/knuth_b.h
310+
include/c++/v1/__random/linear_congruential_engine.h
311+
include/c++/v1/__random/log2.h
312+
include/c++/v1/__random/lognormal_distribution.h
313+
include/c++/v1/__random/mersenne_twister_engine.h
314+
include/c++/v1/__random/negative_binomial_distribution.h
315+
include/c++/v1/__random/normal_distribution.h
316+
include/c++/v1/__random/piecewise_constant_distribution.h
317+
include/c++/v1/__random/piecewise_linear_distribution.h
318+
include/c++/v1/__random/poisson_distribution.h
319+
include/c++/v1/__random/random_device.h
320+
include/c++/v1/__random/ranlux.h
321+
include/c++/v1/__random/seed_seq.h
322+
include/c++/v1/__random/shuffle_order_engine.h
323+
include/c++/v1/__random/student_t_distribution.h
324+
include/c++/v1/__random/subtract_with_carry_engine.h
187325
include/c++/v1/__random/uniform_int_distribution.h
326+
include/c++/v1/__random/uniform_random_bit_generator.h
327+
include/c++/v1/__random/uniform_real_distribution.h
328+
include/c++/v1/__random/weibull_distribution.h
188329
include/c++/v1/__ranges/access.h
189330
include/c++/v1/__ranges/all.h
190331
include/c++/v1/__ranges/common_view.h
191332
include/c++/v1/__ranges/concepts.h
192333
include/c++/v1/__ranges/copyable_box.h
334+
include/c++/v1/__ranges/counted.h
193335
include/c++/v1/__ranges/dangling.h
194336
include/c++/v1/__ranges/data.h
195337
include/c++/v1/__ranges/drop_view.h
196338
include/c++/v1/__ranges/empty.h
197339
include/c++/v1/__ranges/empty_view.h
198340
include/c++/v1/__ranges/enable_borrowed_range.h
199341
include/c++/v1/__ranges/enable_view.h
342+
include/c++/v1/__ranges/iota_view.h
343+
include/c++/v1/__ranges/join_view.h
200344
include/c++/v1/__ranges/non_propagating_cache.h
345+
include/c++/v1/__ranges/owning_view.h
346+
include/c++/v1/__ranges/range_adaptor.h
201347
include/c++/v1/__ranges/ref_view.h
348+
include/c++/v1/__ranges/reverse_view.h
349+
include/c++/v1/__ranges/single_view.h
202350
include/c++/v1/__ranges/size.h
203351
include/c++/v1/__ranges/subrange.h
352+
include/c++/v1/__ranges/take_view.h
204353
include/c++/v1/__ranges/transform_view.h
205354
include/c++/v1/__ranges/view_interface.h
355+
include/c++/v1/__ranges/views.h
206356
include/c++/v1/__split_buffer
207357
include/c++/v1/__std_stream
208358
include/c++/v1/__string
209359
include/c++/v1/__support/android/locale_bionic.h
210360
include/c++/v1/__support/fuchsia/xlocale.h
211361
include/c++/v1/__support/ibm/gettod_zos.h
212362
include/c++/v1/__support/ibm/limits.h
213-
include/c++/v1/__support/ibm/locale_mgmt_aix.h
214363
include/c++/v1/__support/ibm/locale_mgmt_zos.h
215364
include/c++/v1/__support/ibm/nanosleep.h
216365
include/c++/v1/__support/ibm/support.h
217366
include/c++/v1/__support/ibm/xlocale.h
218367
include/c++/v1/__support/musl/xlocale.h
219368
include/c++/v1/__support/newlib/xlocale.h
220-
include/c++/v1/__support/nuttx/xlocale.h
221369
include/c++/v1/__support/openbsd/xlocale.h
222370
include/c++/v1/__support/solaris/floatingpoint.h
223371
include/c++/v1/__support/solaris/wchar.h
@@ -227,12 +375,14 @@ include/c++/v1/__support/win32/locale_win32.h
227375
include/c++/v1/__support/xlocale/__nop_locale_mgmt.h
228376
include/c++/v1/__support/xlocale/__posix_l_fallback.h
229377
include/c++/v1/__support/xlocale/__strtonum_fallback.h
378+
include/c++/v1/__thread/poll_with_backoff.h
379+
include/c++/v1/__thread/timed_backoff_policy.h
230380
include/c++/v1/__threading_support
231381
include/c++/v1/__tree
232382
include/c++/v1/__tuple
233383
include/c++/v1/__undef_macros
234-
include/c++/v1/__utility/__decay_copy.h
235384
include/c++/v1/__utility/as_const.h
385+
include/c++/v1/__utility/auto_cast.h
236386
include/c++/v1/__utility/cmp.h
237387
include/c++/v1/__utility/declval.h
238388
include/c++/v1/__utility/exchange.h
@@ -242,9 +392,11 @@ include/c++/v1/__utility/integer_sequence.h
242392
include/c++/v1/__utility/move.h
243393
include/c++/v1/__utility/pair.h
244394
include/c++/v1/__utility/piecewise_construct.h
395+
include/c++/v1/__utility/priority_tag.h
245396
include/c++/v1/__utility/rel_ops.h
246397
include/c++/v1/__utility/swap.h
247398
include/c++/v1/__utility/to_underlying.h
399+
include/c++/v1/__utility/transaction.h
248400
include/c++/v1/__variant/monostate.h
249401
include/c++/v1/algorithm
250402
include/c++/v1/any
@@ -272,6 +424,7 @@ include/c++/v1/complex
272424
include/c++/v1/complex.h
273425
include/c++/v1/concepts
274426
include/c++/v1/condition_variable
427+
include/c++/v1/coroutine
275428
include/c++/v1/csetjmp
276429
include/c++/v1/csignal
277430
include/c++/v1/cstdarg

0 commit comments

Comments
 (0)