[src/trunk]: src/distrib/sets/lists Choose the right compat sets for the plat...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/69164869e2c6
branches:  trunk
changeset: 961948:69164869e2c6
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 25 22:30:29 2021 +0000

description:
Choose the right compat sets for the platform:
mipsn64 -> o32 n32
mips64 -> o32 64

diffstat:

 distrib/sets/lists/base/ad.mips  |  17 +++++++++++------
 distrib/sets/lists/comp/ad.mips  |  11 +++++++----
 distrib/sets/lists/debug/ad.mips |  14 +++++++++-----
 3 files changed, 27 insertions(+), 15 deletions(-)

diffs (97 lines):

diff -r 2a292d0191ad -r 69164869e2c6 distrib/sets/lists/base/ad.mips
--- a/distrib/sets/lists/base/ad.mips   Sun Apr 25 22:29:22 2021 +0000
+++ b/distrib/sets/lists/base/ad.mips   Sun Apr 25 22:30:29 2021 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: ad.mips,v 1.82 2021/04/12 02:08:59 mrg Exp $
+# $NetBSD: ad.mips,v 1.83 2021/04/25 22:30:29 christos Exp $
 ./lib/libc_fp.so                               base-sys-shlib          dynamicroot,softfloat,arch64
 ./lib/libc_fp.so.0                             base-sys-shlib          dynamicroot,softfloat,arch64
 ./lib/libc_fp.so.0.0                           base-sys-shlib          dynamicroot,softfloat,arch64
-./libexec/ld.elf_so-64                         base-compat-shlib       compat,pic,arch64
+./libexec/ld.elf_so-64                         base-compat-shlib       compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
+./libexec/ld.elf_so-n32                                base-compat-shlib       compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
 ./libexec/ld.elf_so-o32                                base-compat-shlib       compat,pic,arch64
-./usr/lib/64/libc_fp.so                                base-compat-shlib       compat,pic,arch64
-./usr/lib/64/libc_fp.so.0                      base-compat-shlib       compat,pic,arch64
-./usr/lib/64/libc_fp.so.0.0                    base-compat-shlib       compat,pic,arch64
+./usr/lib/64/libc_fp.so                                base-compat-shlib       compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
+./usr/lib/64/libc_fp.so.0                      base-compat-shlib       compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
+./usr/lib/64/libc_fp.so.0.0                    base-compat-shlib       compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
 ./usr/lib/libc_fp.so                           base-sys-shlib          softfloat,arch64
 ./usr/lib/libc_fp.so.0                         base-sys-shlib          softfloat,arch64
 ./usr/lib/libc_fp.so.0.0                       base-sys-shlib          softfloat,arch64
@@ -17,6 +18,10 @@
 ./usr/lib/o32/libgomp.so.2.0                   base-compat-shlib       compat,pic,arch64,gcc=9
 ./usr/lib/o32/libgomp.so.2.0                   base-compat-shlib       compat,pic,arch64,gcc=10,obsolete
 ./usr/lib/o32/libgomp.so.2.1                   base-compat-shlib       compat,pic,arch64,gcc=10
-./usr/libexec/ld.elf_so-64                     base-compat-shlib       compat,pic,arch64
+./usr/lib/n32/libc_fp.so                       base-compat-shlib       compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
+./usr/lib/n32/libc_fp.so.0                     base-compat-shlib       compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
+./usr/lib/n32/libc_fp.so.0.0                   base-compat-shlib       compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
+./usr/libexec/ld.elf_so-64                     base-compat-shlib       compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
+./usr/libexec/ld.elf_so-n32                    base-compat-shlib       compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
 ./usr/libexec/ld.elf_so-o32                    base-sysutil-bin        compat,pic,arch64
 ./usr/lkm/ldscript                             base-obsolete           obsolete
diff -r 2a292d0191ad -r 69164869e2c6 distrib/sets/lists/comp/ad.mips
--- a/distrib/sets/lists/comp/ad.mips   Sun Apr 25 22:29:22 2021 +0000
+++ b/distrib/sets/lists/comp/ad.mips   Sun Apr 25 22:30:29 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.88 2021/04/12 02:08:59 mrg Exp $
+# $NetBSD: ad.mips,v 1.89 2021/04/25 22:30:29 christos Exp $
 -./usr/lib/64/libgomp.a
 -./usr/lib/64/libgomp.so
 -./usr/lib/64/libgomp.so.1
@@ -104,15 +104,18 @@
 ./usr/include/mips/varargs.h                   comp-obsolete           obsolete
 ./usr/include/mips/vmparam.h                   comp-c-include
 ./usr/include/mips/wchar_limits.h              comp-c-include
-./usr/lib/64/libc_fp.a                         comp-c-lib              softfloat,compat,arch64
-./usr/lib/64/libc_fp_p.a                       comp-c-lib              profile,softfloat,compat,arch64
-./usr/lib/64/libc_fp_pic.a                     comp-c-piclib           softfloat,picinstall,compat,arch64
+./usr/lib/64/libc_fp.a                         comp-c-lib              softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el
+./usr/lib/64/libc_fp_p.a                       comp-c-lib              profile,softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el
+./usr/lib/64/libc_fp_pic.a                     comp-c-piclib           softfloat,picinstall,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el
 ./usr/lib/libc_fp.a                            comp-c-lib              softfloat,arch64
 ./usr/lib/libc_fp_p.a                          comp-c-lib              profile,softfloat,arch64
 ./usr/lib/libc_fp_pic.a                                comp-c-piclib           softfloat,picinstall,arch64
 ./usr/lib/o32/libc_fp.a                                comp-c-lib              softfloat,compat,arch64
 ./usr/lib/o32/libc_fp_p.a                      comp-c-lib              profile,softfloat,compat,arch64
 ./usr/lib/o32/libc_fp_pic.a                    comp-c-piclib           softfloat,picinstall,compat,arch64
+./usr/lib/n32/libc_fp.a                                comp-c-lib              softfloat,compat,arch64,!machine_arch=mips64eb,!machine_arch=mips64el
+./usr/lib/n32/libc_fp_p.a                      comp-c-lib              profile,softfloat,compat,arch64,!machine_arch=mips64eb,!machine_arch=mips64el
+./usr/lib/n32/libc_fp_pic.a                    comp-c-piclib           softfloat,picinstall,compat,arch64,!machine_arch=mips64eb,!machine_arch=mips64el
 ./usr/libdata/ldscripts/elf32btsmip.x          comp-util-bin           binutils,arch64
 ./usr/libdata/ldscripts/elf32btsmip.xbn                comp-util-bin           binutils,arch64
 ./usr/libdata/ldscripts/elf32btsmip.xc         comp-util-bin           binutils,arch64
diff -r 2a292d0191ad -r 69164869e2c6 distrib/sets/lists/debug/ad.mips
--- a/distrib/sets/lists/debug/ad.mips  Sun Apr 25 22:29:22 2021 +0000
+++ b/distrib/sets/lists/debug/ad.mips  Sun Apr 25 22:30:29 2021 +0000
@@ -1,19 +1,23 @@
-# $NetBSD: ad.mips,v 1.79 2021/04/12 02:09:00 mrg Exp $
+# $NetBSD: ad.mips,v 1.80 2021/04/25 22:30:30 christos Exp $
 -./usr/lib/64/libgomp_g.a                              comp-c-debuglib         debuglib,compat,arch64
 -./usr/libdata/debug/usr/lib/64/libgomp.so.1.3.debug   comp-c-debug            obsolete
 -./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug   comp-c-debug            debug,compatfile,gcc=9
 -./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug   comp-c-debug            debug,compatfile,gcc=10,obsolete
 -./usr/libdata/debug/usr/lib/64/libgomp.so.2.1.debug   comp-c-debug            debug,compatfile,gcc=10
-./usr/lib/64/libc_fp_g.a                               comp-c-debuglib         debuglib,softfloat,compat,arch64
+./usr/lib/64/libc_fp_g.a                               comp-c-debuglib         debuglib,softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el
 ./usr/lib/libc_fp_g.a                                  comp-c-debuglib         debuglib,softfloat,arch64
 ./usr/lib/o32/libc_fp_g.a                              comp-c-debuglib         debuglib,softfloat,compat,arch64
+./usr/lib/n32/libc_fp_g.a                              comp-c-debuglib         debuglib,softfloat,compat,arch64,!machine_arch=mips64eb,!machine_arch=mips64el
 ./usr/libdata/debug/lib/libc_fp.so.0.0.debug           comp-c-debug            debug,softfloat,arch64
-./usr/libdata/debug/libexec/ld.elf_so-64.debug         comp-sys-debug          debug,compat,arch64,dynamicroot
+./usr/libdata/debug/libexec/ld.elf_so-64.debug         comp-sys-debug          debug,compat,arch64,dynamicroot,!machine_arch=mipsn64eb,!machine_arch=mipsn64el
+./usr/libdata/debug/libexec/ld.elf_so-n32.debug                comp-sys-debug          debug,compat,arch64,dynamicroot,!machine_arch=mips64eb,!machine_arch=mips64el
 ./usr/libdata/debug/libexec/ld.elf_so-o32.debug                comp-sys-debug          debug,compat,arch64,dynamicroot
 ./usr/libdata/debug/usr/bin/elf2aout.debug             comp-obsolete           obsolete
 ./usr/libdata/debug/usr/bin/elf2ecoff.debug            comp-sysutil-debug      debug
-./usr/libdata/debug/usr/lib/64/libc_fp.so.0.0.debug    comp-c-debug            debug,softfloat,compat,arch64
+./usr/libdata/debug/usr/lib/64/libc_fp.so.0.0.debug    comp-c-debug            debug,softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el
 ./usr/libdata/debug/usr/lib/libc_fp.so.0.0.debug       comp-c-debug            debug,softfloat,arch64
 ./usr/libdata/debug/usr/lib/o32/libc_fp.so.0.0.debug   comp-c-debug            debug,softfloat,compat,arch64
-./usr/libdata/debug/usr/libexec/ld.elf_so-64.debug     comp-sys-debug          debug,compat,arch64
+./usr/libdata/debug/usr/lib/n32/libc_fp.so.0.0.debug   comp-c-debug            debug,softfloat,compat,arch64,!machine_arch=mips64eb,!machine_arch=mips64el
+./usr/libdata/debug/usr/libexec/ld.elf_so-64.debug     comp-sys-debug          debug,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el
+./usr/libdata/debug/usr/libexec/ld.elf_so-n32.debug    comp-sys-debug          debug,compat,arch64,!machine_arch=mips64eb,!machine_arch=mips64el
 ./usr/libdata/debug/usr/libexec/ld.elf_so-o32.debug    comp-sys-debug          debug,compat,arch64