Skip to content

Commit 1fd2172

Browse files
MartinHusemannMartinHusemann
committed
Pull up following revision(s) (requested by nakayama in ticket #51):
 distrib/sets/lists/comp/mi: revision 1.2501 distrib/sets/lists/debug/shl.mi: revision 1.374 distrib/sets/lists/debug/ad.mips: revision 1.86 (all via patch) Mark old gcc=9 conditional entries as obsolete or just remove them.
1 parent 2331754 commit 1fd2172

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.2497.2.1 2025/10/01 14:46:24 martin Exp $
1+
# $NetBSD: mi,v 1.2497.2.2 2025/10/11 10:46:48 martin Exp $
22
#
33
# Note: don't delete entries from here - mark them as "obsolete" instead.
44
./etc/mtree/set.comp comp-sys-root
@@ -1501,8 +1501,7 @@
15011501
./usr/include/g++/ext/algorithm comp-cxx-include gcc,cxx,libstdcxx
15021502
./usr/include/g++/ext/aligned_buffer.h comp-cxx-include gcc,cxx,libstdcxx
15031503
./usr/include/g++/ext/alloc_traits.h comp-cxx-include gcc,cxx,libstdcxx
1504-
./usr/include/g++/ext/array_allocator.h comp-cxx-include gcc=10,obsolete
1505-
./usr/include/g++/ext/array_allocator.h comp-cxx-include gcc=9,gcc,cxx,libstdcxx
1504+
./usr/include/g++/ext/array_allocator.h comp-obsolete obsolete
15061505
./usr/include/g++/ext/atomicity.h comp-cxx-include gcc,cxx,libstdcxx
15071506
./usr/include/g++/ext/bitmap_allocator.h comp-cxx-include gcc,cxx,libstdcxx
15081507
./usr/include/g++/ext/cast.h comp-cxx-include gcc,cxx,libstdcxx
@@ -1526,7 +1525,6 @@
15261525
./usr/include/g++/ext/numeric_traits.h comp-cxx-include gcc,cxx,libstdcxx
15271526
./usr/include/g++/ext/opt_random.h comp-cxx-include gcc,cxx,libstdcxx,gcc=10
15281527
./usr/include/g++/ext/opt_random.h comp-cxx-include gcc,cxx,libstdcxx,gcc=12
1529-
./usr/include/g++/ext/opt_random.h comp-obsolete obsolete,gcc=9
15301528
./usr/include/g++/ext/pb_ds/assoc_container.hpp comp-cxx-include gcc,cxx,libstdcxx
15311529
./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp comp-cxx-include gcc,cxx,libstdcxx
15321530
./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp comp-cxx-include gcc,cxx,libstdcxx
@@ -2048,68 +2046,37 @@
20482046
./usr/include/g++/parsestream.h comp-obsolete obsolete
20492047
./usr/include/g++/pfstream.h comp-obsolete obsolete
20502048
./usr/include/g++/procbuf.h comp-obsolete obsolete
2051-
./usr/include/g++/profile/array comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2052-
./usr/include/g++/profile/array comp-cxx-include gcc=10,obsolete
2053-
./usr/include/g++/profile/base.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2054-
./usr/include/g++/profile/base.h comp-cxx-include gcc=10,obsolete
2055-
./usr/include/g++/profile/bitset comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2056-
./usr/include/g++/profile/bitset comp-cxx-include gcc=10,obsolete
2057-
./usr/include/g++/profile/deque comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2058-
./usr/include/g++/profile/deque comp-cxx-include gcc=10,obsolete
2059-
./usr/include/g++/profile/forward_list comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2060-
./usr/include/g++/profile/forward_list comp-cxx-include gcc=10,obsolete
2061-
./usr/include/g++/profile/impl/profiler.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2062-
./usr/include/g++/profile/impl/profiler.h comp-cxx-include gcc=10,obsolete
2063-
./usr/include/g++/profile/impl/profiler_algos.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2064-
./usr/include/g++/profile/impl/profiler_algos.h comp-cxx-include gcc=10,obsolete
2065-
./usr/include/g++/profile/impl/profiler_container_size.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2066-
./usr/include/g++/profile/impl/profiler_container_size.h comp-cxx-include gcc=10,obsolete
2067-
./usr/include/g++/profile/impl/profiler_hash_func.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2068-
./usr/include/g++/profile/impl/profiler_hash_func.h comp-cxx-include gcc=10,obsolete
2069-
./usr/include/g++/profile/impl/profiler_hashtable_size.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2070-
./usr/include/g++/profile/impl/profiler_hashtable_size.h comp-cxx-include gcc=10,obsolete
2071-
./usr/include/g++/profile/impl/profiler_list_to_slist.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2072-
./usr/include/g++/profile/impl/profiler_list_to_slist.h comp-cxx-include gcc=10,obsolete
2073-
./usr/include/g++/profile/impl/profiler_list_to_vector.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2074-
./usr/include/g++/profile/impl/profiler_list_to_vector.h comp-cxx-include gcc=10,obsolete
2075-
./usr/include/g++/profile/impl/profiler_map_to_unordered_map.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2076-
./usr/include/g++/profile/impl/profiler_map_to_unordered_map.h comp-cxx-include gcc=10,obsolete
2077-
./usr/include/g++/profile/impl/profiler_node.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2078-
./usr/include/g++/profile/impl/profiler_node.h comp-cxx-include gcc=10,obsolete
2079-
./usr/include/g++/profile/impl/profiler_state.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2080-
./usr/include/g++/profile/impl/profiler_state.h comp-cxx-include gcc=10,obsolete
2081-
./usr/include/g++/profile/impl/profiler_trace.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2082-
./usr/include/g++/profile/impl/profiler_trace.h comp-cxx-include gcc=10,obsolete
2083-
./usr/include/g++/profile/impl/profiler_vector_size.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2084-
./usr/include/g++/profile/impl/profiler_vector_size.h comp-cxx-include gcc=10,obsolete
2085-
./usr/include/g++/profile/impl/profiler_vector_to_list.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2086-
./usr/include/g++/profile/impl/profiler_vector_to_list.h comp-cxx-include gcc=10,obsolete
2087-
./usr/include/g++/profile/iterator_tracker.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2088-
./usr/include/g++/profile/iterator_tracker.h comp-cxx-include gcc=10,obsolete
2089-
./usr/include/g++/profile/list comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2090-
./usr/include/g++/profile/list comp-cxx-include gcc=10,obsolete
2091-
./usr/include/g++/profile/map comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2092-
./usr/include/g++/profile/map comp-cxx-include gcc=10,obsolete
2093-
./usr/include/g++/profile/map.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2094-
./usr/include/g++/profile/map.h comp-cxx-include gcc=10,obsolete
2095-
./usr/include/g++/profile/multimap.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2096-
./usr/include/g++/profile/multimap.h comp-cxx-include gcc=10,obsolete
2097-
./usr/include/g++/profile/multiset.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2098-
./usr/include/g++/profile/multiset.h comp-cxx-include gcc=10,obsolete
2099-
./usr/include/g++/profile/ordered_base.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2100-
./usr/include/g++/profile/ordered_base.h comp-cxx-include gcc=10,obsolete
2101-
./usr/include/g++/profile/set comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2102-
./usr/include/g++/profile/set comp-cxx-include gcc=10,obsolete
2103-
./usr/include/g++/profile/set.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2104-
./usr/include/g++/profile/set.h comp-cxx-include gcc=10,obsolete
2105-
./usr/include/g++/profile/unordered_base.h comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2106-
./usr/include/g++/profile/unordered_base.h comp-cxx-include gcc=10,obsolete
2107-
./usr/include/g++/profile/unordered_map comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2108-
./usr/include/g++/profile/unordered_map comp-cxx-include gcc=10,obsolete
2109-
./usr/include/g++/profile/unordered_set comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2110-
./usr/include/g++/profile/unordered_set comp-cxx-include gcc=10,obsolete
2111-
./usr/include/g++/profile/vector comp-cxx-include gcc,cxx,libstdcxx,gcc=9
2112-
./usr/include/g++/profile/vector comp-cxx-include gcc=10,obsolete
2049+
./usr/include/g++/profile/array comp-obsolete obsolete
2050+
./usr/include/g++/profile/base.h comp-obsolete obsolete
2051+
./usr/include/g++/profile/bitset comp-obsolete obsolete
2052+
./usr/include/g++/profile/deque comp-obsolete obsolete
2053+
./usr/include/g++/profile/forward_list comp-obsolete obsolete
2054+
./usr/include/g++/profile/impl/profiler.h comp-obsolete obsolete
2055+
./usr/include/g++/profile/impl/profiler_algos.h comp-obsolete obsolete
2056+
./usr/include/g++/profile/impl/profiler_container_size.h comp-obsolete obsolete
2057+
./usr/include/g++/profile/impl/profiler_hash_func.h comp-obsolete obsolete
2058+
./usr/include/g++/profile/impl/profiler_hashtable_size.h comp-obsolete obsolete
2059+
./usr/include/g++/profile/impl/profiler_list_to_slist.h comp-obsolete obsolete
2060+
./usr/include/g++/profile/impl/profiler_list_to_vector.h comp-obsolete obsolete
2061+
./usr/include/g++/profile/impl/profiler_map_to_unordered_map.h comp-obsolete obsolete
2062+
./usr/include/g++/profile/impl/profiler_node.h comp-obsolete obsolete
2063+
./usr/include/g++/profile/impl/profiler_state.h comp-obsolete obsolete
2064+
./usr/include/g++/profile/impl/profiler_trace.h comp-obsolete obsolete
2065+
./usr/include/g++/profile/impl/profiler_vector_size.h comp-obsolete obsolete
2066+
./usr/include/g++/profile/impl/profiler_vector_to_list.h comp-obsolete obsolete
2067+
./usr/include/g++/profile/iterator_tracker.h comp-obsolete obsolete
2068+
./usr/include/g++/profile/list comp-obsolete obsolete
2069+
./usr/include/g++/profile/map comp-obsolete obsolete
2070+
./usr/include/g++/profile/map.h comp-obsolete obsolete
2071+
./usr/include/g++/profile/multimap.h comp-obsolete obsolete
2072+
./usr/include/g++/profile/multiset.h comp-obsolete obsolete
2073+
./usr/include/g++/profile/ordered_base.h comp-obsolete obsolete
2074+
./usr/include/g++/profile/set comp-obsolete obsolete
2075+
./usr/include/g++/profile/set.h comp-obsolete obsolete
2076+
./usr/include/g++/profile/unordered_base.h comp-obsolete obsolete
2077+
./usr/include/g++/profile/unordered_map comp-obsolete obsolete
2078+
./usr/include/g++/profile/unordered_set comp-obsolete obsolete
2079+
./usr/include/g++/profile/vector comp-obsolete obsolete
21132080
./usr/include/g++/projectn.h comp-obsolete obsolete
21142081
./usr/include/g++/pstl/algorithm_fwd.h comp-cxx-include gcc,cxx,libstdcxx
21152082
./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.84 2024/07/11 20:41:07 riastradh Exp $
1+
# $NetBSD: ad.mips,v 1.84.2.1 2025/10/11 10:46:49 martin 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/lib/64/libc_fp_g.a comp-c-debuglib debuglib,softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el

‎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.367 2025/07/17 19:05:48 christos Exp $
1+
# $NetBSD: shl.mi,v 1.367.2.1 2025/10/11 10:46:49 martin 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
@@ -123,7 +123,6 @@
123123
./usr/libdata/debug/usr/lib/libgnuctf.so.1.0.debug comp-sys-debug debug,compatfile,binutils=239
124124
./usr/libdata/debug/usr/lib/libgnuctf.so.2.0.debug comp-sys-debug debug,compatfile,binutils=242
125125
./usr/libdata/debug/usr/lib/libgnumalloc.so.1.0.debug comp-sys-debug debug,compatfile
126-
./usr/libdata/debug/usr/lib/libgomp.so.2.0.debug comp-sys-debug debug,compatfile,gcc=9
127126
./usr/libdata/debug/usr/lib/libgomp.so.2.1.debug comp-sys-debug debug,compatfile,gcc=10
128127
./usr/libdata/debug/usr/lib/libgomp.so.2.2.debug comp-sys-debug debug,compatfile,gcc=12
129128
./usr/libdata/debug/usr/lib/libgssapi.so.12.0.debug comp-krb5-debug debug,compatfile,kerberos

0 commit comments

Comments
 (0)