Module Name: src
Committed By: alnsn
Date: Sun Nov 17 18:58:28 UTC 2013
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386 md.sparc
src/sys/modules: Makefile
Log Message:
Build and install sljit.kmod and bpfjit.kmod iff ${MKSLJIT} != "no".
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/modules/md.sparc
cvs rdiff -u -r1.125 -r1.126 src/sys/modules/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/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.37 src/distrib/sets/lists/modules/md.amd64:1.38
--- src/distrib/sets/lists/modules/md.amd64:1.37 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/modules/md.amd64 Sun Nov 17 18:58:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.37 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: md.amd64,v 1.38 2013/11/17 18:58:28 alnsn Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -39,8 +39,8 @@
./@MODULEDIR@/auvitek/auvitek.kmod base-kernel-modules kmod
./@MODULEDIR@/azalia base-kernel-modules kmod
./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
-./@MODULEDIR@/bpfjit base-kernel-modules kmod
-./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod
+./@MODULEDIR@/bpfjit base-kernel-modules kmod,sljit
+./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod,sljit
./@MODULEDIR@/compat_linux base-kernel-modules kmod
./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_linux32 base-kernel-modules kmod
@@ -107,8 +107,8 @@
./@MODULEDIR@/powernow/powernow.kmod base-kernel-modules kmod
./@MODULEDIR@/pwdog base-kernel-modules kmod
./@MODULEDIR@/pwdog/pwdog.kmod base-kernel-modules kmod
-./@MODULEDIR@/sljit base-kernel-modules kmod
-./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod
+./@MODULEDIR@/sljit base-kernel-modules kmod,sljit
+./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod,sljit
./@MODULEDIR@/syscallemu base-kernel-modules kmod
./@MODULEDIR@/syscallemu/syscallemu.kmod base-kernel-modules kmod
./@MODULEDIR@/thinkpad base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.42 src/distrib/sets/lists/modules/md.i386:1.43
--- src/distrib/sets/lists/modules/md.i386:1.42 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/modules/md.i386 Sun Nov 17 18:58:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.42 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: md.i386,v 1.43 2013/11/17 18:58:28 alnsn Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -41,8 +41,8 @@
./@MODULEDIR@/auvitek/auvitek.kmod base-kernel-modules kmod
./@MODULEDIR@/azalia base-kernel-modules kmod
./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
-./@MODULEDIR@/bpfjit base-kernel-modules kmod
-./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod
+./@MODULEDIR@/bpfjit base-kernel-modules kmod,sljit
+./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod,sljit
./@MODULEDIR@/compat_freebsd base-kernel-modules kmod
./@MODULEDIR@/compat_freebsd/compat_freebsd.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_ibcs2 base-kernel-modules kmod
@@ -127,8 +127,8 @@
./@MODULEDIR@/savagedrm/savagedrm.kmod base-kernel-modules kmod
./@MODULEDIR@/sisdrm base-kernel-modules kmod
./@MODULEDIR@/sisdrm/sisdrm.kmod base-kernel-modules kmod
-./@MODULEDIR@/sljit base-kernel-modules kmod
-./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod
+./@MODULEDIR@/sljit base-kernel-modules kmod,sljit
+./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod,sljit
./@MODULEDIR@/syscallemu base-kernel-modules kmod
./@MODULEDIR@/syscallemu/syscallemu.kmod base-kernel-modules kmod
./@MODULEDIR@/tdfxdrm base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.sparc
diff -u src/distrib/sets/lists/modules/md.sparc:1.2 src/distrib/sets/lists/modules/md.sparc:1.3
--- src/distrib/sets/lists/modules/md.sparc:1.2 Tue Nov 6 07:59:09 2012
+++ src/distrib/sets/lists/modules/md.sparc Sun Nov 17 18:58:28 2013
@@ -1,7 +1,7 @@
-# $NetBSD: md.sparc,v 1.2 2012/11/06 07:59:09 alnsn Exp $
-./@MODULEDIR@/bpfjit base-kernel-modules kmod
-./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod
+# $NetBSD: md.sparc,v 1.3 2013/11/17 18:58:28 alnsn Exp $
+./@MODULEDIR@/bpfjit base-kernel-modules kmod,sljit
+./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod,sljit
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
-./@MODULEDIR@/sljit base-kernel-modules kmod
-./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod
+./@MODULEDIR@/sljit base-kernel-modules kmod,sljit
+./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod,sljit
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.125 src/sys/modules/Makefile:1.126
--- src/sys/modules/Makefile:1.125 Sun Nov 17 17:16:24 2013
+++ src/sys/modules/Makefile Sun Nov 17 18:58:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2013/11/17 17:16:24 bad Exp $
+# $NetBSD: Makefile,v 1.126 2013/11/17 18:58:28 alnsn Exp $
.include <bsd.own.mk>
@@ -129,12 +129,15 @@ SUBDIR+= tprof_amdpmi
SUBDIR+= vmt
.endif
+.if ${MKSLJIT} != "no"
+# No modules for arm, mips and powerpc yet.
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "sparc"
SUBDIR+= bpfjit
SUBDIR+= sljit
.endif
+.endif
#
# ACPI modules
