Module Name: src
Committed By: jmcneill
Date: Sat Sep 26 17:49:51 UTC 2020
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/base: md.amd64 mi shl.mi
src/distrib/sets/lists/comp: md.amd64 mi
src/distrib/sets/lists/debug: md.amd64 mi module.md.amd64 module.mi
shl.mi
src/distrib/sets/lists/modules: md.amd64 mi
src/lib: Makefile
src/share/mk: bsd.own.mk
src/sys/modules: Makefile
src/usr.sbin/nvmmctl: Makefile
Log Message:
Add HAVE_NVMM and use it to control the build of NVMM related components.
Defined to "yes" on amd64, "no" everywhere else.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.192 -r1.193 src/distrib/sets/sets.subr
cvs rdiff -u -r1.282 -r1.283 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.1264 -r1.1265 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.905 -r1.906 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.282 -r1.283 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.2358 -r1.2359 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.111 -r1.112 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.338 -r1.339 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.264 -r1.265 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.141 -r1.142 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.284 -r1.285 src/lib/Makefile
cvs rdiff -u -r1.1221 -r1.1222 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.245 -r1.246 src/sys/modules/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/nvmmctl/Makefile
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/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.39 src/distrib/sets/mkvars.mk:1.40
--- src/distrib/sets/mkvars.mk:1.39 Sat Sep 12 15:25:41 2020
+++ src/distrib/sets/mkvars.mk Sat Sep 26 17:49:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.39 2020/09/12 15:25:41 jmcneill Exp $
+# $NetBSD: mkvars.mk,v 1.40 2020/09/26 17:49:49 jmcneill Exp $
MKEXTRAVARS= \
MACHINE \
@@ -10,6 +10,7 @@ MKEXTRAVARS= \
HAVE_XORG_SERVER_VER \
HAVE_XORG_GLAMOR \
HAVE_MESA_VER \
+ HAVE_NVMM \
HAVE_BINUTILS \
HAVE_LIBGCC_EH \
HAVE_OPENSSL \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.192 src/distrib/sets/sets.subr:1.193
--- src/distrib/sets/sets.subr:1.192 Sat Sep 12 15:25:41 2020
+++ src/distrib/sets/sets.subr Sat Sep 26 17:49:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.192 2020/09/12 15:25:41 jmcneill Exp $
+# $NetBSD: sets.subr,v 1.193 2020/09/26 17:49:49 jmcneill Exp $
#
#
@@ -20,8 +20,9 @@
# HAVE_BINUTILS
# HAVE_GCC
# HAVE_GDB
-# HAVE_SSP
+# HAVE_NVMM
# HAVE_OPENSSL
+# HAVE_SSP
# HAVE_UEFI
# TOOLCHAIN_MISSING
# OBJECT_FMT
@@ -191,7 +192,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.192 2020/09/12 15:25:41 jmcneill Exp $
+# # $NetBSD: sets.subr,v 1.193 2020/09/26 17:49:49 jmcneill Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -226,6 +227,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# gcc=<n> <n> = value of ${HAVE_GCC}
# gdb=<n> <n> = value of ${HAVE_GDB}
# mesa_ver=<n> <n> = value of ${HAVE_MESA_VER}
+# nvmm ${HAVE_NVMM} != no
# openssl=<n> <n> = value of ${HAVE_OPENSSL}
# uefi ${HAVE_UEFI} != no
# xorg_server_ver=<n> <n> = value of ${HAVE_XORG_SERVER_VER}
@@ -340,6 +342,9 @@ list_set_files()
if ("mesa_ver" in wanted) {
wanted["mesa_ver=" "'"${HAVE_MESA_VER}"'"] = 1
}
+ if ("nvmm" in wanted) {
+ wanted["nvmm=" "'"${HAVE_NVMM}"'"] = 1
+ }
if ("openssl" in wanted) {
wanted["openssl=" "'"${HAVE_OPENSSL}"'"] = 1
}
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.282 src/distrib/sets/lists/base/md.amd64:1.283
--- src/distrib/sets/lists/base/md.amd64:1.282 Sat Sep 12 15:25:41 2020
+++ src/distrib/sets/lists/base/md.amd64 Sat Sep 26 17:49:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.282 2020/09/12 15:25:41 jmcneill Exp $
+# $NetBSD: md.amd64,v 1.283 2020/09/26 17:49:49 jmcneill Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -10,9 +10,6 @@
./usr/lib/i386/libproc.so.1.0 base-compat-shlib compat,pic,dtrace
./usr/lib/i386/librtld_db.so.0 base-compat-shlib compat,pic,dtrace
./usr/lib/i386/librtld_db.so.0.0 base-compat-shlib compat,pic,dtrace
-./usr/lib/libnvmm.so base-sys-shlib pic
-./usr/lib/libnvmm.so.0 base-sys-shlib pic
-./usr/lib/libnvmm.so.0.1 base-sys-shlib pic
./usr/lib/libx86_64.so base-sys-shlib pic
./usr/lib/libx86_64.so.0 base-sys-shlib pic
./usr/lib/libx86_64.so.0.0 base-sys-shlib pic
@@ -68,4 +65,3 @@
./usr/mdec/prekern base-sysutil-bin
./usr/mdec/pxeboot_ia32.bin base-sysutil-bin
./usr/mdec/pxeboot_ia32_com0.bin base-obsolete obsolete
-./usr/sbin/nvmmctl base-sysutil-bin
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1264 src/distrib/sets/lists/base/mi:1.1265
--- src/distrib/sets/lists/base/mi:1.1264 Mon Sep 14 00:40:03 2020
+++ src/distrib/sets/lists/base/mi Sat Sep 26 17:49:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1264 2020/09/14 00:40:03 rin Exp $
+# $NetBSD: mi,v 1.1265 2020/09/26 17:49:49 jmcneill Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1923,6 +1923,7 @@
./usr/sbin/ntptime base-ntp-bin
./usr/sbin/ntptimeset base-obsolete obsolete
./usr/sbin/ntptrace base-ntp-bin
+./usr/sbin/nvmmctl base-sysutil-bin nvmm
./usr/sbin/omshell base-dhcpd-bin
./usr/sbin/opensnoop base-debug-bin dtrace
./usr/sbin/pac base-sysutil-bin
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.905 src/distrib/sets/lists/base/shl.mi:1.906
--- src/distrib/sets/lists/base/shl.mi:1.905 Tue Sep 15 07:00:03 2020
+++ src/distrib/sets/lists/base/shl.mi Sat Sep 26 17:49:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.905 2020/09/15 07:00:03 mrg Exp $
+# $NetBSD: shl.mi,v 1.906 2020/09/26 17:49:49 jmcneill Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -471,6 +471,9 @@
./usr/lib/libns.so base-bind-shlib compatfile
./usr/lib/libns.so.15 base-bind-shlib compatfile
./usr/lib/libns.so.15.0 base-bind-shlib compatfile
+./usr/lib/libnvmm.so base-sys-shlib nvmm,pic
+./usr/lib/libnvmm.so.0 base-sys-shlib nvmm,pic
+./usr/lib/libnvmm.so.0.1 base-sys-shlib nvmm,pic
./usr/lib/libnvpair.so base-zfs-shlib compatfile,zfs
./usr/lib/libnvpair.so.0 base-zfs-shlib compatfile,zfs
./usr/lib/libnvpair.so.0.0 base-zfs-shlib compatfile,zfs
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.282 src/distrib/sets/lists/comp/md.amd64:1.283
--- src/distrib/sets/lists/comp/md.amd64:1.282 Sun Sep 6 10:54:26 2020
+++ src/distrib/sets/lists/comp/md.amd64 Sat Sep 26 17:49:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.282 2020/09/06 10:54:26 mrg Exp $
+# $NetBSD: md.amd64,v 1.283 2020/09/26 17:49:49 jmcneill Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -495,11 +495,8 @@
./usr/include/clang-9.0/xsaveoptintrin.h comp-c-include llvm
./usr/include/clang-9.0/xsavesintrin.h comp-c-include llvm
./usr/include/clang-9.0/xtestintrin.h comp-c-include llvm
-./usr/include/dev/nvmm comp-c-include
-./usr/include/dev/nvmm/nvmm.h comp-c-include
-./usr/include/dev/nvmm/nvmm_ioctl.h comp-c-include
-./usr/include/dev/nvmm/x86 comp-c-include
-./usr/include/dev/nvmm/x86/nvmm_x86.h comp-c-include
+./usr/include/dev/nvmm/x86 comp-c-include nvmm
+./usr/include/dev/nvmm/x86/nvmm_x86.h comp-c-include nvmm
./usr/include/emmintrin.h comp-obsolete obsolete
./usr/include/g++/bits/i386 comp-c-include compat
./usr/include/g++/bits/i386/c++config.h comp-c-include gcc,compat
@@ -987,7 +984,6 @@
./usr/include/ieeefp.h comp-c-include
./usr/include/mm_malloc.h comp-obsolete obsolete
./usr/include/mmintrin.h comp-obsolete obsolete
-./usr/include/nvmm.h comp-c-include
./usr/include/pmmintrin.h comp-obsolete obsolete
./usr/include/x64_64 comp-obsolete obsolete
./usr/include/x64_64/ansi.h comp-obsolete obsolete
@@ -1200,9 +1196,6 @@
./usr/lib/i386/libi386.so comp-sys-shlib compat,pic
./usr/lib/i386/libi386_p.a comp-c-proflib compat,profile
./usr/lib/i386/libi386_pic.a comp-c-piclib compat,pic,picinstall
-./usr/lib/libnvmm.a comp-c-lib
-./usr/lib/libnvmm_p.a comp-c-proflib profile
-./usr/lib/libnvmm_pic.a comp-c-piclib pic,picinstall
./usr/lib/libx86_64.a comp-c-lib
./usr/lib/libx86_64_p.a comp-c-proflib profile
./usr/lib/libx86_64_pic.a comp-c-piclib pic,picinstall
@@ -1276,8 +1269,6 @@
./usr/libdata/ldscripts/i386nbsd.xn comp-obsolete obsolete
./usr/libdata/ldscripts/i386nbsd.xr comp-obsolete obsolete
./usr/libdata/ldscripts/i386nbsd.xu comp-obsolete obsolete
-./usr/libdata/lint/llib-lnvmm.ln comp-c-lintlib lint
-./usr/libdata/lint/llib-lx86_64.ln comp-c-lintlib lint
./usr/share/ldscripts/elf_i386.x comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xbn comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xc comp-obsolete obsolete
@@ -1309,6 +1300,3 @@
./usr/share/ldscripts/i386nbsd.xn comp-obsolete obsolete
./usr/share/ldscripts/i386nbsd.xr comp-obsolete obsolete
./usr/share/ldscripts/i386nbsd.xu comp-obsolete obsolete
-./usr/share/man/cat3/libnvmm.0 comp-c-catman .cat
-./usr/share/man/html3/libnvmm.html comp-c-htmlman html
-./usr/share/man/man3/libnvmm.3 comp-c-man .man
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2358 src/distrib/sets/lists/comp/mi:1.2359
--- src/distrib/sets/lists/comp/mi:1.2358 Thu Sep 24 14:14:18 2020
+++ src/distrib/sets/lists/comp/mi Sat Sep 26 17:49:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2358 2020/09/24 14:14:18 pgoyette Exp $
+# $NetBSD: mi,v 1.2359 2020/09/26 17:49:49 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -649,6 +649,9 @@
./usr/include/dev/mii/tlphyvar.h comp-obsolete obsolete
./usr/include/dev/mii/tqphyreg.h comp-obsolete obsolete
./usr/include/dev/mulaw.h comp-obsolete obsolete
+./usr/include/dev/nvmm comp-c-include nvmm
+./usr/include/dev/nvmm/nvmm.h comp-c-include nvmm
+./usr/include/dev/nvmm/nvmm_ioctl.h comp-c-include nvmm
./usr/include/dev/ofisa/ofisavar.h comp-obsolete obsolete
./usr/include/dev/ofw/ofw_pci.h comp-obsolete obsolete
./usr/include/dev/ofw/openfirm.h comp-obsolete obsolete
@@ -2662,6 +2665,7 @@
./usr/include/ntfs/ntfs_vfsops.h comp-obsolete obsolete
./usr/include/ntfs/ntfsmount.h comp-c-include
./usr/include/null.h comp-obsolete obsolete
+./usr/include/nvmm.h comp-c-include nvmm
./usr/include/objc/NXConstStr.h comp-c-include gcc
./usr/include/objc/Object.h comp-c-include gcc
./usr/include/objc/Protocol.h comp-c-include gcc
@@ -3655,6 +3659,9 @@
./usr/lib/libns_p.a comp-bind-proflib compatfile,profile
./usr/lib/libntp.a comp-obsolete obsolete
./usr/lib/libntp_p.a comp-obsolete obsolete
+./usr/lib/libnvmm.a comp-c-lib nvmm
+./usr/lib/libnvmm_p.a comp-c-proflib nvmm,profile
+./usr/lib/libnvmm_pic.a comp-c-piclib nvmm,pic,picinstall
./usr/lib/libnvpair.a comp-zfs-lib compatfile,zfs
./usr/lib/libnvpair_p.a comp-zfs-proflib compatfile,zfs,profile
./usr/lib/libobjc.a comp-objc-lib compatfile,gcc
@@ -4071,6 +4078,7 @@
./usr/libdata/lint/llib-lnpf.ln comp-npf-lintlib lint,npf
./usr/libdata/lint/llib-lns.ln comp-bind-lintlib lint
./usr/libdata/lint/llib-lntp.ln comp-obsolete obsolete
+./usr/libdata/lint/llib-lnvmm.ln comp-c-lintlib nvmm,lint
./usr/libdata/lint/llib-lopenpgpsdk.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lossaudio.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lp2k.ln comp-puffs-lintlib lint,rump
@@ -8522,6 +8530,7 @@
./usr/share/man/cat3/libnetpgp.0 comp-c-catman .cat
./usr/share/man/cat3/libnetpgpverify.0 comp-c-catman .cat
./usr/share/man/cat3/libnpf.0 comp-npf-catman npf,.cat
+./usr/share/man/cat3/libnvmm.0 comp-c-catman nvmm,.cat
./usr/share/man/cat3/libperfuse.0 comp-perfuse-catman .cat
./usr/share/man/cat3/libquota.0 comp-c-catman .cat
./usr/share/man/cat3/libradius.0 comp-c-catman .cat
@@ -16752,6 +16761,7 @@
./usr/share/man/html3/libnetpgp.html comp-c-htmlman html
./usr/share/man/html3/libnetpgpverify.html comp-c-htmlman html
./usr/share/man/html3/libnpf.html comp-npf-htmlman npf,html
+./usr/share/man/html3/libnvmm.html comp-c-htmlman nvmm,html
./usr/share/man/html3/libperfuse.html comp-perfuse-htmlman html
./usr/share/man/html3/libquota.html comp-c-htmlman html
./usr/share/man/html3/libradius.html comp-c-htmlman html
@@ -24962,6 +24972,7 @@
./usr/share/man/man3/libnetpgp.3 comp-c-man .man
./usr/share/man/man3/libnetpgpverify.3 comp-c-man .man
./usr/share/man/man3/libnpf.3 comp-npf-man npf,.man
+./usr/share/man/man3/libnvmm.3 comp-c-man nvmm,.man
./usr/share/man/man3/libperfuse.3 comp-perfuse-man .man
./usr/share/man/man3/libquota.3 comp-c-man .man
./usr/share/man/man3/libradius.3 comp-c-man .man
Index: src/distrib/sets/lists/debug/md.amd64
diff -u src/distrib/sets/lists/debug/md.amd64:1.111 src/distrib/sets/lists/debug/md.amd64:1.112
--- src/distrib/sets/lists/debug/md.amd64:1.111 Sat Sep 12 15:25:42 2020
+++ src/distrib/sets/lists/debug/md.amd64 Sat Sep 26 17:49:50 2020
@@ -1,8 +1,7 @@
-# $NetBSD: md.amd64,v 1.111 2020/09/12 15:25:42 jmcneill Exp $
+# $NetBSD: md.amd64,v 1.112 2020/09/26 17:49:50 jmcneill Exp $
./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx
./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat
./usr/lib/i386/libiberty_g.a comp-obsolete obsolete
-./usr/lib/libnvmm_g.a comp-c-debuglib debuglib
./usr/lib/libx86_64_g.a comp-c-debuglib debuglib
./usr/libdata/debug/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
@@ -11,11 +10,9 @@
./usr/libdata/debug/usr/lib/i386/libpam.so.4.1.debug comp-compat-shlib compat,pic,debug,pam
./usr/libdata/debug/usr/lib/i386/libproc.so.1.0.debug comp-compat-shlib compat,pic,debug,dtrace
./usr/libdata/debug/usr/lib/i386/librtld_db.so.0.0.debug comp-compat-shlib compat,pic,debug,dtrace
-./usr/libdata/debug/usr/lib/libnvmm.so.0.1.debug comp-sys-shlib pic,debug
./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug comp-sys-shlib pic,debug
./usr/libdata/debug/usr/libexec/ld.elf_so-i386 comp-obsolete obsolete
./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/sbin/nvmmctl.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait3.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait4.debug tests-obsolete obsolete
@@ -23,6 +20,6 @@
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug debug,atf,compat
-./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debug tests-lib-debug debug,atf,nvmm
+./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug debug,atf,nvmm
./usr/libdata/debug/usr/tests/modules/t_x86_pte.debug tests-sys-debug debug,atf,rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.338 src/distrib/sets/lists/debug/mi:1.339
--- src/distrib/sets/lists/debug/mi:1.338 Tue Sep 22 01:09:32 2020
+++ src/distrib/sets/lists/debug/mi Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.338 2020/09/22 01:09:32 kamil Exp $
+# $NetBSD: mi,v 1.339 2020/09/26 17:49:50 jmcneill Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -115,6 +115,7 @@
./usr/lib/libnetpgpverify_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libnpf_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libns_g.a comp-c-debuglib debuglib,compatfile
+./usr/lib/libnvmm_g.a comp-c-debuglib debuglib,nvmm
./usr/lib/libnvpair_g.a comp-c-debuglib debuglib,zfs,compatfile
./usr/lib/libobjc_g.a comp-c-debuglib debuglib,gcc,compatfile
./usr/lib/libopcodes_g.a comp-c-debuglib debuglib,compatfile,binutils
@@ -1205,6 +1206,7 @@
./usr/libdata/debug/usr/sbin/ntpdc.debug comp-ntp-debug debug
./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug debug
./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug debug
+./usr/libdata/debug/usr/sbin/nvmmctl.debug comp-sysutil-debug debug,nvmm
./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug
./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/paxctl.debug comp-sysutil-debug debug
Index: src/distrib/sets/lists/debug/module.md.amd64
diff -u src/distrib/sets/lists/debug/module.md.amd64:1.2 src/distrib/sets/lists/debug/module.md.amd64:1.3
--- src/distrib/sets/lists/debug/module.md.amd64:1.2 Tue Sep 8 14:57:32 2020
+++ src/distrib/sets/lists/debug/module.md.amd64 Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.2 2020/09/08 14:57:32 martin Exp $
+# $NetBSD: module.md.amd64,v 1.3 2020/09/26 17:49:50 jmcneill Exp $
./usr/libdata/debug/@MODULEDIR@/acpiacad modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/acpibat modules-base-kernel kmod,debug
@@ -173,8 +173,6 @@
./usr/libdata/debug/@MODULEDIR@/lm_wbsio/lm_wbsio.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/mt2131 modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/mt2131/mt2131.kmod.debug modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/nvmm modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/nvmm/nvmm.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/nxt2k modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/nxt2k/nxt2k.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/odcm modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.5 src/distrib/sets/lists/debug/module.mi:1.6
--- src/distrib/sets/lists/debug/module.mi:1.5 Fri May 1 22:21:11 2020
+++ src/distrib/sets/lists/debug/module.mi Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.5 2020/05/01 22:21:11 christos Exp $
+# $NetBSD: module.mi,v 1.6 2020/09/26 17:49:50 jmcneill Exp $
./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug modules-base-kernel kmod,debug
@@ -278,6 +278,8 @@
./usr/libdata/debug/@MODULEDIR@/ntfs/ntfs.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/null modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/null/null.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/nvmm modules-base-kernel kmod,nvmm,debug
+./usr/libdata/debug/@MODULEDIR@/nvmm/nvmm.kmod.debug modules-base-kernel kmod,nvmm,debug
./usr/libdata/debug/@MODULEDIR@/onewire modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/onewire/onewire.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/opencrypto modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.264 src/distrib/sets/lists/debug/shl.mi:1.265
--- src/distrib/sets/lists/debug/shl.mi:1.264 Tue Sep 15 07:00:04 2020
+++ src/distrib/sets/lists/debug/shl.mi Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.264 2020/09/15 07:00:04 mrg Exp $
+# $NetBSD: shl.mi,v 1.265 2020/09/26 17:49:50 jmcneill Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
@@ -175,6 +175,7 @@
./usr/libdata/debug/usr/lib/libnetpgpverify.so.5.0.debug comp-crypto-debug debug,compatfile
./usr/libdata/debug/usr/lib/libnpf.so.0.1.debug comp-npf-debug debug,compatfile,npf
./usr/libdata/debug/usr/lib/libns.so.15.0.debug comp-bind-debug debug,compatfile
+./usr/libdata/debug/usr/lib/libnvmm.so.0.1.debug comp-sys-shlib nvmm,pic,debug
./usr/libdata/debug/usr/lib/libnvpair.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/libobjc.so.4.0.debug comp-sys-debug debug,compatfile,gcc
./usr/libdata/debug/usr/lib/libopcodes.so.10.0.debug comp-c-debug debug,compatfile,binutils=234
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.89 src/distrib/sets/lists/modules/md.amd64:1.90
--- src/distrib/sets/lists/modules/md.amd64:1.89 Tue Sep 8 10:05:47 2020
+++ src/distrib/sets/lists/modules/md.amd64 Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.89 2020/09/08 10:05:47 yamaguchi Exp $
+# $NetBSD: md.amd64,v 1.90 2020/09/26 17:49:50 jmcneill Exp $
#
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
@@ -184,8 +184,6 @@
./@MODULEDIR@/mt2131/mt2131.kmod modules-base-kernel kmod
./@MODULEDIR@/nvme base-obsolete obsolete
./@MODULEDIR@/nvme/nvme.kmod base-obsolete obsolete
-./@MODULEDIR@/nvmm modules-base-kernel kmod
-./@MODULEDIR@/nvmm/nvmm.kmod modules-base-kernel kmod
./@MODULEDIR@/nxt2k modules-base-kernel kmod
./@MODULEDIR@/nxt2k/nxt2k.kmod modules-base-kernel kmod
./@MODULEDIR@/odcm modules-base-kernel kmod
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.141 src/distrib/sets/lists/modules/mi:1.142
--- src/distrib/sets/lists/modules/mi:1.141 Tue Sep 8 14:55:44 2020
+++ src/distrib/sets/lists/modules/mi Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.141 2020/09/08 14:55:44 martin Exp $
+# $NetBSD: mi,v 1.142 2020/09/26 17:49:50 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -337,6 +337,8 @@
./@MODULEDIR@/ntfs/ntfs.kmod modules-base-kernel kmod
./@MODULEDIR@/null modules-base-kernel kmod
./@MODULEDIR@/null/null.kmod modules-base-kernel kmod
+./@MODULEDIR@/nvmm modules-base-kernel kmod,nvmm
+./@MODULEDIR@/nvmm/nvmm.kmod modules-base-kernel kmod,nvmm
./@MODULEDIR@/onewire modules-base-kernel kmod
./@MODULEDIR@/onewire/onewire.kmod modules-base-kernel kmod
./@MODULEDIR@/opencrypto modules-base-kernel kmod
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.284 src/lib/Makefile:1.285
--- src/lib/Makefile:1.284 Mon Jun 15 01:57:31 2020
+++ src/lib/Makefile Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.284 2020/06/15 01:57:31 christos Exp $
+# $NetBSD: Makefile,v 1.285 2020/09/26 17:49:50 jmcneill Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -50,7 +50,7 @@ SUBDIR+= librumpclient
SUBDIR+= libskey
.endif
-.if ${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386"
+.if ${HAVE_NVMM:Uno} == "yes" && !defined(MLIBDIR)
SUBDIR+= libnvmm
.endif
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1221 src/share/mk/bsd.own.mk:1.1222
--- src/share/mk/bsd.own.mk:1.1221 Wed Sep 23 23:39:18 2020
+++ src/share/mk/bsd.own.mk Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1221 2020/09/23 23:39:18 kamil Exp $
+# $NetBSD: bsd.own.mk,v 1.1222 2020/09/26 17:49:50 jmcneill Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -158,6 +158,15 @@ HAVE_UEFI= yes
HAVE_UEFI= no
.endif
+#
+# Does the platform support NVMM?
+#
+.if ${MACHINE_ARCH} == "x86_64"
+HAVE_NVMM= yes
+.else
+HAVE_NVMM= no
+.endif
+
.if !empty(MACHINE_ARCH:Mearm*)
_LIBC_COMPILER_RT.${MACHINE_ARCH}= yes
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.245 src/sys/modules/Makefile:1.246
--- src/sys/modules/Makefile:1.245 Tue Sep 8 10:05:47 2020
+++ src/sys/modules/Makefile Sat Sep 26 17:49:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2020/09/08 10:05:47 yamaguchi Exp $
+# $NetBSD: Makefile,v 1.246 2020/09/26 17:49:50 jmcneill Exp $
.include <bsd.own.mk>
@@ -225,7 +225,7 @@ SUBDIR+= tprof_x86
SUBDIR+= vmt
.endif
-.if ${MACHINE_ARCH} == "x86_64"
+.if ${HAVE_NVMM:Uno} == "yes"
SUBDIR+= nvmm
.endif
Index: src/usr.sbin/nvmmctl/Makefile
diff -u src/usr.sbin/nvmmctl/Makefile:1.2 src/usr.sbin/nvmmctl/Makefile:1.3
--- src/usr.sbin/nvmmctl/Makefile:1.2 Tue Oct 29 08:13:16 2019
+++ src/usr.sbin/nvmmctl/Makefile Sat Sep 26 17:49:50 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2019/10/29 08:13:16 maxv Exp $
+# $NetBSD: Makefile,v 1.3 2020/09/26 17:49:50 jmcneill Exp $
.include <bsd.own.mk>
MAN= nvmmctl.8
-.if (${MACHINE_ARCH} == "x86_64")
+.if ${HAVE_NVMM:Uno} == "yes"
USE_FORT?=yes # setgid
PROG=nvmmctl
SRCS=nvmmctl.c
