Skip to content

Commit 6275fc5

Browse files
nakayamanakayama
authored andcommitted
Mark old gcc=9 conditional entries as obsolete or just remove them.
XXX pullup netbsd-11
1 parent 429c16a commit 6275fc5

3 files changed

Lines changed: 35 additions & 70 deletions

File tree

distrib/sets/lists/comp/mi

Lines changed: 33 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: mi,v 1.2500 2025/09/17 23:44:27 mrg Exp $
1+
# $NetBSD: mi,v 1.2501 2025/10/11 07:16:00 nakayama Exp $
22
#
33
# Note: don't delete entries from here - mark them as "obsolete" instead.
44
./etc/mtree/set.comp comp-sys-root
@@ -1596,8 +1596,7 @@
15961596
./usr/include/g++/ext/algorithm comp-cxx-include gcc,cxx,libstdcxx
15971597
./usr/include/g++/ext/aligned_buffer.h comp-cxx-include gcc,cxx,libstdcxx
15981598
./usr/include/g++/ext/alloc_traits.h comp-cxx-include gcc,cxx,libstdcxx
1599-
./usr/include/g++/ext/array_allocator.h comp-cxx-include gcc=10,obsolete
1600-
./usr/include/g++/ext/array_allocator.h comp-cxx-include gcc=9,gcc,cxx,libstdcxx
1599+
./usr/include/g++/ext/array_allocator.h comp-obsolete obsolete
16011600
./usr/include/g++/ext/atomicity.h comp-cxx-include gcc,cxx,libstdcxx
16021601
./usr/include/g++/ext/bitmap_allocator.h comp-cxx-include gcc,cxx,libstdcxx
16031602
./usr/include/g++/ext/cast.h comp-cxx-include gcc,cxx,libstdcxx
@@ -1622,7 +1621,6 @@
16221621
./usr/include/g++/ext/opt_random.h comp-cxx-include gcc,cxx,libstdcxx,gcc=10
16231622
./usr/include/g++/ext/opt_random.h comp-cxx-include gcc,cxx,libstdcxx,gcc=12
16241623
./usr/include/g++/ext/opt_random.h comp-cxx-include gcc,cxx,libstdcxx,gcc=14
1625-
./usr/include/g++/ext/opt_random.h comp-obsolete obsolete,gcc=9
16261624
./usr/include/g++/ext/pb_ds/assoc_container.hpp comp-cxx-include gcc,cxx,libstdcxx
16271625
./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp comp-cxx-include gcc,cxx,libstdcxx
16281626
./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp comp-cxx-include gcc,cxx,libstdcxx
@@ -2149,68 +2147,37 @@
21492147
./usr/include/g++/pfstream.h comp-obsolete obsolete
21502148
./usr/include/g++/print comp-cxx-include gcc,cxx,libstdcxx,gcc=14
21512149
./usr/include/g++/procbuf.h comp-obsolete obsolete
2152-
./usr/include/g++/profile/array comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2153-
./usr/include/g++/profile/array comp-cxx-include gcc=10,obsolete
2154-
./usr/include/g++/profile/base.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2155-
./usr/include/g++/profile/base.h comp-cxx-include gcc=10,obsolete
2156-
./usr/include/g++/profile/bitset comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2157-
./usr/include/g++/profile/bitset comp-cxx-include gcc=10,obsolete
2158-
./usr/include/g++/profile/deque comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2159-
./usr/include/g++/profile/deque comp-cxx-include gcc=10,obsolete
2160-
./usr/include/g++/profile/forward_list comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2161-
./usr/include/g++/profile/forward_list comp-cxx-include gcc=10,obsolete
2162-
./usr/include/g++/profile/impl/profiler.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2163-
./usr/include/g++/profile/impl/profiler.h comp-cxx-include gcc=10,obsolete
2164-
./usr/include/g++/profile/impl/profiler_algos.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2165-
./usr/include/g++/profile/impl/profiler_algos.h comp-cxx-include gcc=10,obsolete
2166-
./usr/include/g++/profile/impl/profiler_container_size.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2167-
./usr/include/g++/profile/impl/profiler_container_size.h comp-cxx-include gcc=10,obsolete
2168-
./usr/include/g++/profile/impl/profiler_hash_func.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2169-
./usr/include/g++/profile/impl/profiler_hash_func.h comp-cxx-include gcc=10,obsolete
2170-
./usr/include/g++/profile/impl/profiler_hashtable_size.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2171-
./usr/include/g++/profile/impl/profiler_hashtable_size.h comp-cxx-include gcc=10,obsolete
2172-
./usr/include/g++/profile/impl/profiler_list_to_slist.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2173-
./usr/include/g++/profile/impl/profiler_list_to_slist.h comp-cxx-include gcc=10,obsolete
2174-
./usr/include/g++/profile/impl/profiler_list_to_vector.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2175-
./usr/include/g++/profile/impl/profiler_list_to_vector.h comp-cxx-include gcc=10,obsolete
2176-
./usr/include/g++/profile/impl/profiler_map_to_unordered_map.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2177-
./usr/include/g++/profile/impl/profiler_map_to_unordered_map.h comp-cxx-include gcc=10,obsolete
2178-
./usr/include/g++/profile/impl/profiler_node.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2179-
./usr/include/g++/profile/impl/profiler_node.h comp-cxx-include gcc=10,obsolete
2180-
./usr/include/g++/profile/impl/profiler_state.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2181-
./usr/include/g++/profile/impl/profiler_state.h comp-cxx-include gcc=10,obsolete
2182-
./usr/include/g++/profile/impl/profiler_trace.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2183-
./usr/include/g++/profile/impl/profiler_trace.h comp-cxx-include gcc=10,obsolete
2184-
./usr/include/g++/profile/impl/profiler_vector_size.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2185-
./usr/include/g++/profile/impl/profiler_vector_size.h comp-cxx-include gcc=10,obsolete
2186-
./usr/include/g++/profile/impl/profiler_vector_to_list.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2187-
./usr/include/g++/profile/impl/profiler_vector_to_list.h comp-cxx-include gcc=10,obsolete
2188-
./usr/include/g++/profile/iterator_tracker.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2189-
./usr/include/g++/profile/iterator_tracker.h comp-cxx-include gcc=10,obsolete
2190-
./usr/include/g++/profile/list comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2191-
./usr/include/g++/profile/list comp-cxx-include gcc=10,obsolete
2192-
./usr/include/g++/profile/map comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2193-
./usr/include/g++/profile/map comp-cxx-include gcc=10,obsolete
2194-
./usr/include/g++/profile/map.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2195-
./usr/include/g++/profile/map.h comp-cxx-include gcc=10,obsolete
2196-
./usr/include/g++/profile/multimap.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2197-
./usr/include/g++/profile/multimap.h comp-cxx-include gcc=10,obsolete
2198-
./usr/include/g++/profile/multiset.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2199-
./usr/include/g++/profile/multiset.h comp-cxx-include gcc=10,obsolete
2200-
./usr/include/g++/profile/ordered_base.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2201-
./usr/include/g++/profile/ordered_base.h comp-cxx-include gcc=10,obsolete
2202-
./usr/include/g++/profile/set comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2203-
./usr/include/g++/profile/set comp-cxx-include gcc=10,obsolete
2204-
./usr/include/g++/profile/set.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2205-
./usr/include/g++/profile/set.h comp-cxx-include gcc=10,obsolete
2206-
./usr/include/g++/profile/unordered_base.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2207-
./usr/include/g++/profile/unordered_base.h comp-cxx-include gcc=10,obsolete
2208-
./usr/include/g++/profile/unordered_map comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2209-
./usr/include/g++/profile/unordered_map comp-cxx-include gcc=10,obsolete
2210-
./usr/include/g++/profile/unordered_set comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2211-
./usr/include/g++/profile/unordered_set comp-cxx-include gcc=10,obsolete
2212-
./usr/include/g++/profile/vector comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2213-
./usr/include/g++/profile/vector comp-cxx-include gcc=10,obsolete
2150+
./usr/include/g++/profile/array comp-obsolete obsolete
2151+
./usr/include/g++/profile/base.h comp-obsolete obsolete
2152+
./usr/include/g++/profile/bitset comp-obsolete obsolete
2153+
./usr/include/g++/profile/deque comp-obsolete obsolete
2154+
./usr/include/g++/profile/forward_list comp-obsolete obsolete
2155+
./usr/include/g++/profile/impl/profiler.h comp-obsolete obsolete
2156+
./usr/include/g++/profile/impl/profiler_algos.h comp-obsolete obsolete
2157+
./usr/include/g++/profile/impl/profiler_container_size.h comp-obsolete obsolete
2158+
./usr/include/g++/profile/impl/profiler_hash_func.h comp-obsolete obsolete
2159+
./usr/include/g++/profile/impl/profiler_hashtable_size.h comp-obsolete obsolete
2160+
./usr/include/g++/profile/impl/profiler_list_to_slist.h comp-obsolete obsolete
2161+
./usr/include/g++/profile/impl/profiler_list_to_vector.h comp-obsolete obsolete
2162+
./usr/include/g++/profile/impl/profiler_map_to_unordered_map.h comp-obsolete obsolete
2163+
./usr/include/g++/profile/impl/profiler_node.h comp-obsolete obsolete
2164+
./usr/include/g++/profile/impl/profiler_state.h comp-obsolete obsolete
2165+
./usr/include/g++/profile/impl/profiler_trace.h comp-obsolete obsolete
2166+
./usr/include/g++/profile/impl/profiler_vector_size.h comp-obsolete obsolete
2167+
./usr/include/g++/profile/impl/profiler_vector_to_list.h comp-obsolete obsolete
2168+
./usr/include/g++/profile/iterator_tracker.h comp-obsolete obsolete
2169+
./usr/include/g++/profile/list comp-obsolete obsolete
2170+
./usr/include/g++/profile/map comp-obsolete obsolete
2171+
./usr/include/g++/profile/map.h comp-obsolete obsolete
2172+
./usr/include/g++/profile/multimap.h comp-obsolete obsolete
2173+
./usr/include/g++/profile/multiset.h comp-obsolete obsolete
2174+
./usr/include/g++/profile/ordered_base.h comp-obsolete obsolete
2175+
./usr/include/g++/profile/set comp-obsolete obsolete
2176+
./usr/include/g++/profile/set.h comp-obsolete obsolete
2177+
./usr/include/g++/profile/unordered_base.h comp-obsolete obsolete
2178+
./usr/include/g++/profile/unordered_map comp-obsolete obsolete
2179+
./usr/include/g++/profile/unordered_set comp-obsolete obsolete
2180+
./usr/include/g++/profile/vector comp-obsolete obsolete
22142181
./usr/include/g++/projectn.h comp-obsolete obsolete
22152182
./usr/include/g++/pstl/algorithm_fwd.h comp-cxx-include gcc,cxx,libstdcxx
22162183
./usr/include/g++/pstl/algorithm_impl.h comp-cxx-include gcc,cxx,libstdcxx

distrib/sets/lists/debug/ad.mips

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# $NetBSD: ad.mips,v 1.85 2025/09/19 19:33:14 mrg Exp $
1+
# $NetBSD: ad.mips,v 1.86 2025/10/11 07:16:01 nakayama Exp $
22
#
33
-./usr/lib/64/libgomp_g.a comp-c-debuglib debuglib,compat,arch64
4-
-./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug comp-c-debug debug,compatfile,gcc=9
54
-./usr/libdata/debug/usr/lib/64/libgomp.so.2.1.debug comp-c-debug debug,compatfile,gcc=10
65
-./usr/libdata/debug/usr/lib/64/libgomp.so.2.2.debug comp-c-debug debug,compatfile,gcc=12
76
-./usr/libdata/debug/usr/lib/64/libgomp.so.2.3.debug comp-c-debug debug,compatfile,gcc=14

distrib/sets/lists/debug/shl.mi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: shl.mi,v 1.373 2025/10/06 13:16:43 riastradh Exp $
1+
# $NetBSD: shl.mi,v 1.374 2025/10/11 07:16:01 nakayama Exp $
22
#
33
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
44
./usr/lib/libgcc_eh_g.a comp-c-debuglib debuglib,compatfile,gcc
@@ -126,7 +126,6 @@
126126
./usr/libdata/debug/usr/lib/libgnuctf.so.2.0.debug comp-sys-debug debug,compatfile,binutils=242
127127
./usr/libdata/debug/usr/lib/libgnuctf.so.3.0.debug comp-sys-debug debug,compatfile,binutils=245
128128
./usr/libdata/debug/usr/lib/libgnumalloc.so.1.0.debug comp-sys-debug debug,compatfile
129-
./usr/libdata/debug/usr/lib/libgomp.so.2.0.debug comp-sys-debug debug,compatfile,gcc=9
130129
./usr/libdata/debug/usr/lib/libgomp.so.2.1.debug comp-sys-debug debug,compatfile,gcc=10
131130
./usr/libdata/debug/usr/lib/libgomp.so.2.2.debug comp-sys-debug debug,compatfile,gcc=12
132131
./usr/libdata/debug/usr/lib/libgomp.so.2.3.debug comp-sys-debug debug,compatfile,gcc=14

0 commit comments

Comments
 (0)