Skip to content

Commit a08a308

Browse files
DimitryAndricDimitryAndric
committed
Update build glue for libc++.
1 parent 326d983 commit a08a308

File tree

6 files changed

+194
-124
lines changed

6 files changed

+194
-124
lines changed

‎ObsoleteFiles.inc

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,59 @@ OLD_FILES+=usr/lib/clang/17/share/msan_ignorelist.txt
439439
OLD_DIRS+=usr/lib/clang/17/share
440440
OLD_DIRS+=usr/lib/clang/17
441441

442+
# 2024mmdd: new libc++ import which bumps version from 17 to 18
443+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/algorithm_fwd.h
444+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/algorithm_impl.h
445+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/execution_defs.h
446+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/execution_impl.h
447+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_algorithm_defs.h
448+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_algorithm_impl.h
449+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_memory_defs.h
450+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_memory_impl.h
451+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_numeric_defs.h
452+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_numeric_impl.h
453+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/memory_impl.h
454+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/numeric_fwd.h
455+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/numeric_impl.h
456+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_for.h
457+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_for_each.h
458+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_invoke.h
459+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_merge.h
460+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_scan.h
461+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_stable_partial_sort.h
462+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_stable_sort.h
463+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_transform_reduce.h
464+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_transform_scan.h
465+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/util.h
466+
OLD_DIRS+=usr/include/include/c++/v1/__pstl/internal/omp
467+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend.h
468+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend_omp.h
469+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend_serial.h
470+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend_tbb.h
471+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend_utils.h
472+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/unseq_backend_simd.h
473+
OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/utils.h
474+
OLD_DIRS+=usr/include/include/c++/v1/__pstl/internal
475+
OLD_DIRS+=usr/include/include/c++/v1/__pstl
476+
OLD_FILES+=usr/include/include/c++/v1/__pstl_algorithm
477+
OLD_FILES+=usr/include/include/c++/v1/__pstl_memory
478+
OLD_FILES+=usr/include/include/c++/v1/__pstl_numeric
479+
OLD_FILES+=usr/include/include/c++/v1/__type_traits/predicate_traits.h
480+
OLD_FILES+=usr/include/include/c++/v1/__utility/terminate_on_exception.h
481+
OLD_FILES+=usr/include/include/c++/v1/experimental/deque
482+
OLD_FILES+=usr/include/include/c++/v1/experimental/forward_list
483+
OLD_FILES+=usr/include/include/c++/v1/experimental/list
484+
OLD_FILES+=usr/include/include/c++/v1/experimental/map
485+
OLD_FILES+=usr/include/include/c++/v1/experimental/memory_resource
486+
OLD_FILES+=usr/include/include/c++/v1/experimental/regex
487+
OLD_FILES+=usr/include/include/c++/v1/experimental/set
488+
OLD_FILES+=usr/include/include/c++/v1/experimental/string
489+
OLD_FILES+=usr/include/include/c++/v1/experimental/unordered_map
490+
OLD_FILES+=usr/include/include/c++/v1/experimental/unordered_set
491+
OLD_FILES+=usr/include/include/c++/v1/experimental/vector
492+
OLD_FILES+=usr/include/include/c++/v1/limits.h
493+
OLD_FILES+=usr/include/include/c++/v1/setjmp.h
494+
442495
# 20240122: callout_async_drain() removed
443496
OLD_FILES+=usr/share/man/man9/callout_async_drain.9.gz
444497

‎etc/mtree/BSD.include.dist

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
locale_base_api
6161
..
6262
..
63+
__math
64+
..
6365
__mdspan
6466
..
6567
__memory
@@ -70,12 +72,6 @@
7072
..
7173
__numeric
7274
..
73-
__pstl
74-
internal
75-
omp
76-
..
77-
..
78-
..
7975
__random
8076
..
8177
__ranges
@@ -97,6 +93,8 @@
9793
__variant
9894
..
9995
experimental
96+
__simd
97+
..
10098
..
10199
ext
102100
..

‎lib/libc++/Makefile

Lines changed: 64 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ SRCS+= any.cpp
2020
SRCS+= atomic.cpp
2121
SRCS+= barrier.cpp
2222
SRCS+= bind.cpp
23+
SRCS+= call_once.cpp
2324
SRCS+= charconv.cpp
2425
SRCS+= chrono.cpp
2526
SRCS+= condition_variable.cpp
2627
SRCS+= condition_variable_destructor.cpp
28+
SRCS+= error_category.cpp
2729
SRCS+= exception.cpp
2830
SRCS+= filesystem/directory_entry.cpp
2931
SRCS+= filesystem/directory_iterator.cpp
@@ -109,10 +111,8 @@ STD_HEADERS+= __hash_table
109111
STD_HEADERS+= __locale
110112
STD_HEADERS+= __mbstate_t.h
111113
STD_HEADERS+= __node_handle
112-
STD_HEADERS+= __pstl_algorithm
113-
STD_HEADERS+= __pstl_memory
114-
STD_HEADERS+= __pstl_numeric
115114
STD_HEADERS+= __split_buffer
115+
STD_HEADERS+= __std_clang_module
116116
STD_HEADERS+= __std_mbstate_t.h
117117
STD_HEADERS+= __threading_support
118118
STD_HEADERS+= __tree
@@ -184,7 +184,6 @@ STD_HEADERS+= iterator
184184
STD_HEADERS+= latch
185185
STD_HEADERS+= libcxx.imp
186186
STD_HEADERS+= limits
187-
STD_HEADERS+= limits.h
188187
STD_HEADERS+= list
189188
STD_HEADERS+= locale
190189
STD_HEADERS+= locale.h
@@ -208,7 +207,6 @@ STD_HEADERS+= regex
208207
STD_HEADERS+= scoped_allocator
209208
STD_HEADERS+= semaphore
210209
STD_HEADERS+= set
211-
STD_HEADERS+= setjmp.h
212210
STD_HEADERS+= shared_mutex
213211
STD_HEADERS+= source_location
214212
STD_HEADERS+= span
@@ -227,6 +225,7 @@ STD_HEADERS+= string
227225
STD_HEADERS+= string.h
228226
STD_HEADERS+= string_view
229227
STD_HEADERS+= strstream
228+
STD_HEADERS+= syncstream
230229
STD_HEADERS+= system_error
231230
STD_HEADERS+= tgmath.h
232231
STD_HEADERS+= thread
@@ -286,6 +285,7 @@ ALG_HEADERS+= find_end.h
286285
ALG_HEADERS+= find_first_of.h
287286
ALG_HEADERS+= find_if.h
288287
ALG_HEADERS+= find_if_not.h
288+
ALG_HEADERS+= find_segment_if.h
289289
ALG_HEADERS+= for_each.h
290290
ALG_HEADERS+= for_each_n.h
291291
ALG_HEADERS+= for_each_segment.h
@@ -338,14 +338,17 @@ ALG_HEADERS+= pstl_any_all_none_of.h
338338
ALG_HEADERS+= pstl_backend.h
339339
ALG_HEADERS+= pstl_copy.h
340340
ALG_HEADERS+= pstl_count.h
341+
ALG_HEADERS+= pstl_equal.h
341342
ALG_HEADERS+= pstl_fill.h
342343
ALG_HEADERS+= pstl_find.h
343344
ALG_HEADERS+= pstl_for_each.h
344345
ALG_HEADERS+= pstl_frontend_dispatch.h
345346
ALG_HEADERS+= pstl_generate.h
346347
ALG_HEADERS+= pstl_is_partitioned.h
347348
ALG_HEADERS+= pstl_merge.h
349+
ALG_HEADERS+= pstl_move.h
348350
ALG_HEADERS+= pstl_replace.h
351+
ALG_HEADERS+= pstl_rotate_copy.h
349352
ALG_HEADERS+= pstl_sort.h
350353
ALG_HEADERS+= pstl_stable_sort.h
351354
ALG_HEADERS+= pstl_transform.h
@@ -361,6 +364,7 @@ ALG_HEADERS+= ranges_copy_if.h
361364
ALG_HEADERS+= ranges_copy_n.h
362365
ALG_HEADERS+= ranges_count.h
363366
ALG_HEADERS+= ranges_count_if.h
367+
ALG_HEADERS+= ranges_ends_with.h
364368
ALG_HEADERS+= ranges_equal.h
365369
ALG_HEADERS+= ranges_equal_range.h
366370
ALG_HEADERS+= ranges_fill.h
@@ -535,6 +539,7 @@ BIT_HEADERS+= countl.h
535539
BIT_HEADERS+= countr.h
536540
BIT_HEADERS+= endian.h
537541
BIT_HEADERS+= has_single_bit.h
542+
BIT_HEADERS+= invert_if.h
538543
BIT_HEADERS+= popcount.h
539544
BIT_HEADERS+= rotate.h
540545
.for hdr in ${BIT_HEADERS}
@@ -579,6 +584,8 @@ CHR_HEADERS+= statically_widen.h
579584
CHR_HEADERS+= steady_clock.h
580585
CHR_HEADERS+= system_clock.h
581586
CHR_HEADERS+= time_point.h
587+
CHR_HEADERS+= tzdb.h
588+
CHR_HEADERS+= tzdb_list.h
582589
CHR_HEADERS+= weekday.h
583590
CHR_HEADERS+= year.h
584591
CHR_HEADERS+= year_month.h
@@ -777,6 +784,7 @@ FUN+= ${HDRDIR}/__functional/${hdr}
777784
INCSGROUPS+= FWD
778785
FWDDIR= ${CXXINCLUDEDIR}/__fwd
779786
FWD_HEADERS+= array.h
787+
FWD_HEADERS+= bit_reference.h
780788
FWD_HEADERS+= fstream.h
781789
FWD_HEADERS+= get.h
782790
FWD_HEADERS+= hash.h
@@ -861,12 +869,38 @@ LBA_HEADERS+= locale_guard.h
861869
LBA+= ${HDRDIR}/__locale_dir/locale_base_api/${hdr}
862870
.endfor
863871

872+
INCSGROUPS+= MAT
873+
MATDIR= ${CXXINCLUDEDIR}/__math
874+
MAT_HEADERS+= abs.h
875+
MAT_HEADERS+= copysign.h
876+
MAT_HEADERS+= error_functions.h
877+
MAT_HEADERS+= exponential_functions.h
878+
MAT_HEADERS+= fdim.h
879+
MAT_HEADERS+= fma.h
880+
MAT_HEADERS+= gamma.h
881+
MAT_HEADERS+= hyperbolic_functions.h
882+
MAT_HEADERS+= hypot.h
883+
MAT_HEADERS+= inverse_hyperbolic_functions.h
884+
MAT_HEADERS+= inverse_trigonometric_functions.h
885+
MAT_HEADERS+= logarithms.h
886+
MAT_HEADERS+= min_max.h
887+
MAT_HEADERS+= modulo.h
888+
MAT_HEADERS+= remainder.h
889+
MAT_HEADERS+= roots.h
890+
MAT_HEADERS+= rounding_functions.h
891+
MAT_HEADERS+= traits.h
892+
MAT_HEADERS+= trigonometric_functions.h
893+
.for hdr in ${MAT_HEADERS}
894+
MAT+= ${HDRDIR}/__math/${hdr}
895+
.endfor
896+
864897
INCSGROUPS+= MDS
865898
MDSDIR= ${CXXINCLUDEDIR}/__mdspan
866899
MDS_HEADERS+= default_accessor.h
867900
MDS_HEADERS+= extents.h
868901
MDS_HEADERS+= layout_left.h
869902
MDS_HEADERS+= layout_right.h
903+
MDS_HEADERS+= layout_stride.h
870904
MDS_HEADERS+= mdspan.h
871905
.for hdr in ${MDS_HEADERS}
872906
MDS+= ${HDRDIR}/__mdspan/${hdr}
@@ -923,6 +957,7 @@ INCSGROUPS+= MUT
923957
MUTDIR= ${CXXINCLUDEDIR}/__mutex
924958
MUT_HEADERS+= lock_guard.h
925959
MUT_HEADERS+= mutex.h
960+
MUT_HEADERS+= once_flag.h
926961
MUT_HEADERS+= tag_types.h
927962
MUT_HEADERS+= unique_lock.h
928963
.for hdr in ${MUT_HEADERS}
@@ -950,48 +985,6 @@ NUM_HEADERS+= transform_reduce.h
950985
NUM+= ${HDRDIR}/__numeric/${hdr}
951986
.endfor
952987

953-
INCSGROUPS+= PSI
954-
PSIDIR= ${CXXINCLUDEDIR}/__pstl/internal
955-
PSI_HEADERS+= algorithm_fwd.h
956-
PSI_HEADERS+= algorithm_impl.h
957-
PSI_HEADERS+= execution_defs.h
958-
PSI_HEADERS+= execution_impl.h
959-
PSI_HEADERS+= glue_algorithm_defs.h
960-
PSI_HEADERS+= glue_algorithm_impl.h
961-
PSI_HEADERS+= glue_memory_defs.h
962-
PSI_HEADERS+= glue_memory_impl.h
963-
PSI_HEADERS+= glue_numeric_defs.h
964-
PSI_HEADERS+= glue_numeric_impl.h
965-
PSI_HEADERS+= memory_impl.h
966-
PSI_HEADERS+= numeric_fwd.h
967-
PSI_HEADERS+= numeric_impl.h
968-
PSI_HEADERS+= parallel_backend.h
969-
PSI_HEADERS+= parallel_backend_omp.h
970-
PSI_HEADERS+= parallel_backend_serial.h
971-
PSI_HEADERS+= parallel_backend_tbb.h
972-
PSI_HEADERS+= parallel_backend_utils.h
973-
PSI_HEADERS+= unseq_backend_simd.h
974-
PSI_HEADERS+= utils.h
975-
.for hdr in ${PSI_HEADERS}
976-
PSI+= ${HDRDIR}/__pstl/internal/${hdr}
977-
.endfor
978-
979-
INCSGROUPS+= PSO
980-
PSODIR= ${CXXINCLUDEDIR}/__pstl/internal/omp
981-
PSO_HEADERS+= parallel_for.h
982-
PSO_HEADERS+= parallel_for_each.h
983-
PSO_HEADERS+= parallel_invoke.h
984-
PSO_HEADERS+= parallel_merge.h
985-
PSO_HEADERS+= parallel_scan.h
986-
PSO_HEADERS+= parallel_stable_partial_sort.h
987-
PSO_HEADERS+= parallel_stable_sort.h
988-
PSO_HEADERS+= parallel_transform_reduce.h
989-
PSO_HEADERS+= parallel_transform_scan.h
990-
PSO_HEADERS+= util.h
991-
.for hdr in ${PSO_HEADERS}
992-
PSO+= ${HDRDIR}/__pstl/internal/omp/${hdr}
993-
.endfor
994-
995988
INCSGROUPS+= RND
996989
RNDDIR= ${CXXINCLUDEDIR}/__random
997990
RND_HEADERS+= bernoulli_distribution.h
@@ -1040,6 +1033,7 @@ RNGDIR= ${CXXINCLUDEDIR}/__ranges
10401033
RNG_HEADERS+= access.h
10411034
RNG_HEADERS+= all.h
10421035
RNG_HEADERS+= as_rvalue_view.h
1036+
RNG_HEADERS+= chunk_by_view.h
10431037
RNG_HEADERS+= common_view.h
10441038
RNG_HEADERS+= concepts.h
10451039
RNG_HEADERS+= container_compatible_range.h
@@ -1120,6 +1114,7 @@ INCSGROUPS+= THR
11201114
THRDIR= ${CXXINCLUDEDIR}/__thread
11211115
THR_HEADERS+= formatter.h
11221116
THR_HEADERS+= id.h
1117+
THR_HEADERS+= jthread.h
11231118
THR_HEADERS+= poll_with_backoff.h
11241119
THR_HEADERS+= this_thread.h
11251120
THR_HEADERS+= thread.h
@@ -1264,7 +1259,6 @@ TTR_HEADERS+= nat.h
12641259
TTR_HEADERS+= negation.h
12651260
TTR_HEADERS+= noexcept_move_assign_container.h
12661261
TTR_HEADERS+= operation_traits.h
1267-
TTR_HEADERS+= predicate_traits.h
12681262
TTR_HEADERS+= promote.h
12691263
TTR_HEADERS+= rank.h
12701264
TTR_HEADERS+= remove_all_extents.h
@@ -1290,10 +1284,12 @@ TTR+= ${HDRDIR}/__type_traits/${hdr}
12901284
INCSGROUPS+= UTL
12911285
UTLDIR= ${CXXINCLUDEDIR}/__utility
12921286
UTL_HEADERS+= as_const.h
1287+
UTL_HEADERS+= as_lvalue.h
12931288
UTL_HEADERS+= auto_cast.h
12941289
UTL_HEADERS+= cmp.h
12951290
UTL_HEADERS+= convert_to_integral.h
12961291
UTL_HEADERS+= declval.h
1292+
UTL_HEADERS+= empty.h
12971293
UTL_HEADERS+= exception_guard.h
12981294
UTL_HEADERS+= exchange.h
12991295
UTL_HEADERS+= forward.h
@@ -1302,12 +1298,13 @@ UTL_HEADERS+= in_place.h
13021298
UTL_HEADERS+= integer_sequence.h
13031299
UTL_HEADERS+= is_pointer_in_range.h
13041300
UTL_HEADERS+= move.h
1301+
UTL_HEADERS+= no_destroy.h
13051302
UTL_HEADERS+= pair.h
13061303
UTL_HEADERS+= piecewise_construct.h
13071304
UTL_HEADERS+= priority_tag.h
13081305
UTL_HEADERS+= rel_ops.h
1306+
UTL_HEADERS+= small_buffer.h
13091307
UTL_HEADERS+= swap.h
1310-
UTL_HEADERS+= terminate_on_exception.h
13111308
UTL_HEADERS+= to_underlying.h
13121309
UTL_HEADERS+= unreachable.h
13131310
.for hdr in ${UTL_HEADERS}
@@ -1325,26 +1322,33 @@ INCSGROUPS+= EXP
13251322
EXPDIR= ${CXXINCLUDEDIR}/experimental
13261323
EXP_HEADERS+= __config
13271324
EXP_HEADERS+= __memory
1328-
EXP_HEADERS+= deque
1329-
EXP_HEADERS+= forward_list
13301325
EXP_HEADERS+= iterator
1331-
EXP_HEADERS+= list
1332-
EXP_HEADERS+= map
1333-
EXP_HEADERS+= memory_resource
1326+
EXP_HEADERS+= memory
13341327
EXP_HEADERS+= propagate_const
1335-
EXP_HEADERS+= regex
1336-
EXP_HEADERS+= set
13371328
EXP_HEADERS+= simd
1338-
EXP_HEADERS+= string
13391329
EXP_HEADERS+= type_traits
1340-
EXP_HEADERS+= unordered_map
1341-
EXP_HEADERS+= unordered_set
13421330
EXP_HEADERS+= utility
1343-
EXP_HEADERS+= vector
13441331
.for hdr in ${EXP_HEADERS}
13451332
EXP+= ${HDRDIR}/experimental/${hdr}
13461333
.endfor
13471334

1335+
INCSGROUPS+= EXS
1336+
EXSDIR= ${CXXINCLUDEDIR}/experimental/__simd
1337+
EXS_HEADERS+= abi_tag.h
1338+
EXS_HEADERS+= aligned_tag.h
1339+
EXS_HEADERS+= declaration.h
1340+
EXS_HEADERS+= internal_declaration.h
1341+
EXS_HEADERS+= reference.h
1342+
EXS_HEADERS+= scalar.h
1343+
EXS_HEADERS+= simd.h
1344+
EXS_HEADERS+= simd_mask.h
1345+
EXS_HEADERS+= traits.h
1346+
EXS_HEADERS+= utility.h
1347+
EXS_HEADERS+= vec_ext.h
1348+
.for hdr in ${EXS_HEADERS}
1349+
EXS+= ${HDRDIR}/experimental/__simd/${hdr}
1350+
.endfor
1351+
13481352
INCSGROUPS+= EXT
13491353
EXTDIR= ${CXXINCLUDEDIR}/ext
13501354
EXT_HEADERS+= __hash

0 commit comments

Comments
 (0)