Module Name: src
Committed By: riastradh
Date: Wed Jun 5 14:16:31 UTC 2024
Modified Files:
src/distrib/sets/lists/base32: ad.aarch64
src/distrib/sets/lists/debug32: ad.aarch64
Log Message:
Fix some more aarch64 compat set list issues.
- libc_vfp, which implements the arm32 softfloat ABI in terms of CPU
hardfloat instructions instead of emulation through CPU integer
instructions, is always built for eabi, never built for eabihf.
=> aarch64 doesn't have a softfloat ABI, so making it conditional
on softfloat doesn't make sense.
=> eabi is always a softfloat ABI, so this is always built for
compat eabi.
=> eabihf is always a hardfloat ABI, so this is never built for
compat eabihf.
- libc++ needs to be there but conditional on libcxx.
- libproc needs to be there but conditional on dtrace.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/ad.aarch64
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug32/ad.aarch64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base32/ad.aarch64
diff -u src/distrib/sets/lists/base32/ad.aarch64:1.5 src/distrib/sets/lists/base32/ad.aarch64:1.6
--- src/distrib/sets/lists/base32/ad.aarch64:1.5 Mon Jun 3 18:47:23 2024
+++ src/distrib/sets/lists/base32/ad.aarch64 Wed Jun 5 14:16:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.5 2024/06/03 18:47:23 riastradh Exp $
+# $NetBSD: ad.aarch64,v 1.6 2024/06/05 14:16:31 riastradh Exp $
./lib/eabi base-compat-shlib compat
./lib/eabi/npf base-compat-shlib compat,npf
./lib/eabi/npf/ext_log.so base-compat-shlib compat,npf
@@ -143,9 +143,9 @@
./usr/lib/eabi/libc.so base-compat-shlib compat
./usr/lib/eabi/libc.so.12 base-compat-shlib compat
./usr/lib/eabi/libc.so.12.221 base-compat-shlib compat
-./usr/lib/eabi/libc_vfp.so base-compat-shlib compat,softfloat
-./usr/lib/eabi/libc_vfp.so.0 base-compat-shlib compat,softfloat
-./usr/lib/eabi/libc_vfp.so.0.0 base-compat-shlib compat,softfloat
+./usr/lib/eabi/libc_vfp.so base-compat-shlib compat
+./usr/lib/eabi/libc_vfp.so.0 base-compat-shlib compat
+./usr/lib/eabi/libc_vfp.so.0.0 base-compat-shlib compat
./usr/lib/eabi/libcbor.so base-compat-shlib compat
./usr/lib/eabi/libcbor.so.0 base-compat-shlib compat
./usr/lib/eabi/libcbor.so.0.5 base-compat-shlib compat
@@ -657,9 +657,6 @@
./usr/lib/eabihf/libc.so base-compat-shlib compat
./usr/lib/eabihf/libc.so.12 base-compat-shlib compat
./usr/lib/eabihf/libc.so.12.221 base-compat-shlib compat
-./usr/lib/eabihf/libc_vfp.so base-compat-shlib compat,softfloat
-./usr/lib/eabihf/libc_vfp.so.0 base-compat-shlib compat,softfloat
-./usr/lib/eabihf/libc_vfp.so.0.0 base-compat-shlib compat,softfloat
./usr/lib/eabihf/libcbor.so base-compat-shlib compat
./usr/lib/eabihf/libcbor.so.0 base-compat-shlib compat
./usr/lib/eabihf/libcbor.so.0.5 base-compat-shlib compat
Index: src/distrib/sets/lists/debug32/ad.aarch64
diff -u src/distrib/sets/lists/debug32/ad.aarch64:1.6 src/distrib/sets/lists/debug32/ad.aarch64:1.7
--- src/distrib/sets/lists/debug32/ad.aarch64:1.6 Mon Jun 3 18:47:23 2024
+++ src/distrib/sets/lists/debug32/ad.aarch64 Wed Jun 5 14:16:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.6 2024/06/03 18:47:23 riastradh Exp $
+# $NetBSD: ad.aarch64,v 1.7 2024/06/05 14:16:31 riastradh Exp $
./usr/lib/eabi/i18n/libBIG5_g.a comp-c-debuglib debuglib,compat
./usr/lib/eabi/i18n/libDECHanyu_g.a comp-c-debuglib debuglib,compat
./usr/lib/eabi/i18n/libEUCTW_g.a comp-c-debuglib debuglib,compat
@@ -371,8 +371,9 @@
./usr/libdata/debug/usr/lib/eabi/libbozohttpd.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libbsdmalloc.so.0.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libbz2.so.1.1.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/eabi/libc++.so.1.0.debug comp-sys-debug debug,libcxx
./usr/libdata/debug/usr/lib/eabi/libc.so.12.221.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/eabi/libc_vfp.so.0.0.debug comp-sys-debug debug,compat,softfloat
+./usr/libdata/debug/usr/lib/eabi/libc_vfp.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libcbor.so.0.5.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libcom_err.so.8.0.debug comp-sys-debug debug,compat,kerberos
./usr/libdata/debug/usr/lib/eabi/libcrypt.so.1.0.debug comp-sys-debug debug,compat
@@ -447,6 +448,7 @@
./usr/libdata/debug/usr/lib/eabi/libperfuse.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libposix.so.0.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libppath.so.0.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/eabi/libproc.so.1.0.debug comp-sys-debug debug,compat,dtrace
./usr/libdata/debug/usr/lib/eabi/libprop.so.1.2.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libpthread.so.1.4.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libpuffs.so.2.0.debug comp-sys-debug debug,compat
@@ -550,8 +552,8 @@
./usr/libdata/debug/usr/lib/eabihf/libbozohttpd.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libbsdmalloc.so.0.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libbz2.so.1.1.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/eabihf/libc++.so.1.0.debug comp-sys-debug debug,libcxx
./usr/libdata/debug/usr/lib/eabihf/libc.so.12.221.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/eabihf/libc_vfp.so.0.0.debug comp-sys-debug debug,compat,softfloat
./usr/libdata/debug/usr/lib/eabihf/libcbor.so.0.5.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libcom_err.so.8.0.debug comp-sys-debug debug,compat,kerberos
./usr/libdata/debug/usr/lib/eabihf/libcrypt.so.1.0.debug comp-sys-debug debug,compat
@@ -626,6 +628,7 @@
./usr/libdata/debug/usr/lib/eabihf/libperfuse.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libposix.so.0.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libppath.so.0.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/eabihf/libproc.so.1.0.debug comp-sys-debug debug,compat,dtrace
./usr/libdata/debug/usr/lib/eabihf/libprop.so.1.2.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libpthread.so.1.4.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libpuffs.so.2.0.debug comp-sys-debug debug,compat
