Module Name: src
Committed By: alnsn
Date: Sat Nov 16 13:01:38 UTC 2013
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/sys/rump/kern: Makefile.rumpkerncomp
Log Message:
Build and install sljit and bpfjit rump components iff ${MKSLJIT} != "no".
To generate a diff of this commit:
cvs rdiff -u -r1.680 -r1.681 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1860 -r1.1861 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.257 -r1.258 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/kern/Makefile.rumpkerncomp
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/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.680 src/distrib/sets/lists/base/shl.mi:1.681
--- src/distrib/sets/lists/base/shl.mi:1.680 Sat Nov 16 01:39:17 2013
+++ src/distrib/sets/lists/base/shl.mi Sat Nov 16 13:01:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.680 2013/11/16 01:39:17 rmind Exp $
+# $NetBSD: shl.mi,v 1.681 2013/11/16 13:01:38 alnsn Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -637,9 +637,9 @@
./usr/lib/librumpkern_ksem.so base-obsolete obsolete
./usr/lib/librumpkern_ksem.so.0 base-obsolete obsolete
./usr/lib/librumpkern_ksem.so.0.0 base-obsolete obsolete
-./usr/lib/librumpkern_sljit.so base-rump-shlib rump
-./usr/lib/librumpkern_sljit.so.0 base-rump-shlib rump
-./usr/lib/librumpkern_sljit.so.0.0 base-rump-shlib rump
+./usr/lib/librumpkern_sljit.so base-rump-shlib sljit,rump
+./usr/lib/librumpkern_sljit.so.0 base-rump-shlib sljit,rump
+./usr/lib/librumpkern_sljit.so.0.0 base-rump-shlib sljit,rump
./usr/lib/librumpkern_solaris.so base-rump-shlib zfs,rump
./usr/lib/librumpkern_solaris.so.0 base-rump-shlib zfs,rump
./usr/lib/librumpkern_solaris.so.0.0 base-rump-shlib zfs,rump
@@ -655,9 +655,9 @@
./usr/lib/librumpnet_agr.so base-rump-shlib rump
./usr/lib/librumpnet_agr.so.0 base-rump-shlib rump
./usr/lib/librumpnet_agr.so.0.0 base-rump-shlib rump
-./usr/lib/librumpnet_bpfjit.so base-rump-shlib rump
-./usr/lib/librumpnet_bpfjit.so.0 base-rump-shlib rump
-./usr/lib/librumpnet_bpfjit.so.0.0 base-rump-shlib rump
+./usr/lib/librumpnet_bpfjit.so base-rump-shlib sljit,rump
+./usr/lib/librumpnet_bpfjit.so.0 base-rump-shlib sljit,rump
+./usr/lib/librumpnet_bpfjit.so.0.0 base-rump-shlib sljit,rump
./usr/lib/librumpnet_bridge.so base-rump-shlib rump
./usr/lib/librumpnet_bridge.so.0 base-rump-shlib rump
./usr/lib/librumpnet_bridge.so.0.0 base-rump-shlib rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1860 src/distrib/sets/lists/comp/mi:1.1861
--- src/distrib/sets/lists/comp/mi:1.1860 Sat Nov 16 01:39:17 2013
+++ src/distrib/sets/lists/comp/mi Sat Nov 16 13:01:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1860 2013/11/16 01:39:17 rmind Exp $
+# $NetBSD: mi,v 1.1861 2013/11/16 13:01:38 alnsn Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3834,8 +3834,8 @@
./usr/lib/librumpkern_crypto_p.a comp-c-proflib profile,rump
./usr/lib/librumpkern_ksem.a comp-obsolete obsolete
./usr/lib/librumpkern_ksem_p.a comp-obsolete obsolete
-./usr/lib/librumpkern_sljit.a comp-c-lib rump
-./usr/lib/librumpkern_sljit_p.a comp-c-proflib profile,rump
+./usr/lib/librumpkern_sljit.a comp-c-lib sljit,rump
+./usr/lib/librumpkern_sljit_p.a comp-c-proflib profile,sljit,rump
./usr/lib/librumpkern_solaris.a comp-c-lib zfs,rump
./usr/lib/librumpkern_solaris_p.a comp-c-proflib profile,zfs,rump
./usr/lib/librumpkern_tty.a comp-c-lib rump
@@ -3845,8 +3845,8 @@
./usr/lib/librumpnet.a comp-c-lib rump
./usr/lib/librumpnet_agr.a comp-c-lib rump
./usr/lib/librumpnet_agr_p.a comp-c-proflib profile,rump
-./usr/lib/librumpnet_bpfjit.a comp-c-lib rump
-./usr/lib/librumpnet_bpfjit_p.a comp-c-proflib profile,rump
+./usr/lib/librumpnet_bpfjit.a comp-c-lib sljit,rump
+./usr/lib/librumpnet_bpfjit_p.a comp-c-proflib profile,sljit,rump
./usr/lib/librumpnet_bridge.a comp-c-lib rump
./usr/lib/librumpnet_bridge_p.a comp-c-proflib profile,rump
./usr/lib/librumpnet_local.a comp-c-lib rump
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.257 src/distrib/sets/lists/comp/shl.mi:1.258
--- src/distrib/sets/lists/comp/shl.mi:1.257 Sat Nov 16 01:39:18 2013
+++ src/distrib/sets/lists/comp/shl.mi Sat Nov 16 13:01:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.257 2013/11/16 01:39:18 rmind Exp $
+# $NetBSD: shl.mi,v 1.258 2013/11/16 13:01:38 alnsn Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -203,12 +203,12 @@
./usr/lib/librumphijack_pic.a comp-c-piclib rump
./usr/lib/librumpkern_crypto_pic.a comp-c-piclib rump
./usr/lib/librumpkern_ksem_pic.a comp-obsolete obsolete
-./usr/lib/librumpkern_sljit_pic.a comp-c-piclib rump
+./usr/lib/librumpkern_sljit_pic.a comp-c-piclib sljit,rump
./usr/lib/librumpkern_solaris_pic.a comp-c-piclib zfs,rump
./usr/lib/librumpkern_tty_pic.a comp-c-piclib rump
./usr/lib/librumpkern_z_pic.a comp-c-piclib rump
./usr/lib/librumpnet_agr_pic.a comp-c-piclib rump
-./usr/lib/librumpnet_bpfjit_pic.a comp-c-piclib rump
+./usr/lib/librumpnet_bpfjit_pic.a comp-c-piclib sljit,rump
./usr/lib/librumpnet_bridge_pic.a comp-c-piclib rump
./usr/lib/librumpnet_local_pic.a comp-c-piclib rump
./usr/lib/librumpnet_net80211_pic.a comp-c-piclib rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.42 src/distrib/sets/lists/debug/mi:1.43
--- src/distrib/sets/lists/debug/mi:1.42 Sat Nov 16 01:39:18 2013
+++ src/distrib/sets/lists/debug/mi Sat Nov 16 13:01:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.42 2013/11/16 01:39:18 rmind Exp $
+# $NetBSD: mi,v 1.43 2013/11/16 13:01:38 alnsn Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib
@@ -191,12 +191,12 @@
./usr/lib/librumphijack_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpkern_crypto_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpkern_ksem_g.a comp-obsolete obsolete
-./usr/lib/librumpkern_sljit_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpkern_sljit_g.a comp-c-debuglib debuglib,sljit,rump
./usr/lib/librumpkern_solaris_g.a comp-c-debuglib debuglib,zfs,rump
./usr/lib/librumpkern_tty_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpkern_z_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_agr_g.a comp-c-debuglib debuglib,rump
-./usr/lib/librumpnet_bpfjit_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpnet_bpfjit_g.a comp-c-debuglib debuglib,sljit,rump
./usr/lib/librumpnet_bridge_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_local_g.a comp-c-debuglib debuglib,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.41 src/distrib/sets/lists/debug/shl.mi:1.42
--- src/distrib/sets/lists/debug/shl.mi:1.41 Sat Nov 16 01:39:18 2013
+++ src/distrib/sets/lists/debug/shl.mi Sat Nov 16 13:01:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.41 2013/11/16 01:39:18 rmind Exp $
+# $NetBSD: shl.mi,v 1.42 2013/11/16 13:01:38 alnsn Exp $
./usr/libdata/debug/lib/libc.so.12.187.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypto.so.8.1.debug comp-sys-debug debug
@@ -213,13 +213,13 @@
./usr/libdata/debug/usr/lib/librumphijack.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpkern_crypto.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpkern_ksem.so.0.0.debug comp-obsolete obsolete,rump
-./usr/libdata/debug/usr/lib/librumpkern_sljit.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpkern_sljit.so.0.0.debug comp-rump-debug debug,sljit,rump
./usr/libdata/debug/usr/lib/librumpkern_solaris.so.0.0.debug comp-rump-debug debug,zfs,rump
./usr/libdata/debug/usr/lib/librumpkern_tty.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpkern_z.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_agr.so.0.0.debug comp-rump-debug debug,rump
-./usr/libdata/debug/usr/lib/librumpnet_bpfjit.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpnet_bpfjit.so.0.0.debug comp-rump-debug debug,sljit,rump
./usr/libdata/debug/usr/lib/librumpnet_bridge.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_local.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_net.so.0.0.debug comp-rump-debug debug,rump
Index: src/sys/rump/kern/Makefile.rumpkerncomp
diff -u src/sys/rump/kern/Makefile.rumpkerncomp:1.7 src/sys/rump/kern/Makefile.rumpkerncomp:1.8
--- src/sys/rump/kern/Makefile.rumpkerncomp:1.7 Sat Nov 16 10:34:47 2013
+++ src/sys/rump/kern/Makefile.rumpkerncomp Sat Nov 16 13:01:38 2013
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile.rumpkerncomp,v 1.7 2013/11/16 10:34:47 martin Exp $
+# $NetBSD: Makefile.rumpkerncomp,v 1.8 2013/11/16 13:01:38 alnsn Exp $
#
.include <bsd.own.mk>
RUMPKERNCOMPS= crypto tty z
-.if ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_ARCH} == "x86_64" || \
- ${MACHINE_ARCH} == "sparc"
+.if ${MKSLJIT} != "no"
RUMPKERNCOMPS+= sljit
.endif
