Module Name: src
Committed By: alnsn
Date: Mon Nov 5 00:57:42 UTC 2012
Modified Files:
src/distrib/sets: mkvars.mk
src/distrib/sets/lists/comp: md.amd64 md.i386
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/lib: Makefile
src/share/mk: bsd.own.mk
src/sys/arch/amd64/include: Makefile
src/sys/arch/i386/include: Makefile
src/tests/lib: Makefile
Log Message:
Build sljit test when MKSLJIT != no and set MKSLJIT to yes on amd64 and i386.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.178 -r1.179 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.128 -r1.129 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.497 -r1.498 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.84 -r1.85 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.192 -r1.193 src/lib/Makefile
cvs rdiff -u -r1.708 -r1.709 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/include/Makefile
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/i386/include/Makefile
cvs rdiff -u -r1.20 -r1.21 src/tests/lib/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.6 src/distrib/sets/mkvars.mk:1.7
--- src/distrib/sets/mkvars.mk:1.6 Wed Nov 2 14:42:43 2011
+++ src/distrib/sets/mkvars.mk Mon Nov 5 00:57:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.6 2011/11/02 14:42:43 he Exp $
+# $NetBSD: mkvars.mk,v 1.7 2012/11/05 00:57:39 alnsn Exp $
MKEXTRAVARS= \
MACHINE \
@@ -16,6 +16,7 @@ MKEXTRAVARS= \
MKCOMPATMODULES \
MKDYNAMICROOT \
MKMANPAGES \
+ MKSLJIT \
MKXORG \
X11FLAVOR \
USE_INET6 \
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.178 src/distrib/sets/lists/comp/md.amd64:1.179
--- src/distrib/sets/lists/comp/md.amd64:1.178 Sun Oct 28 17:07:44 2012
+++ src/distrib/sets/lists/comp/md.amd64 Mon Nov 5 00:57:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.178 2012/10/28 17:07:44 joerg Exp $
+# $NetBSD: md.amd64,v 1.179 2012/11/05 00:57:40 alnsn Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -57,6 +57,7 @@
./usr/include/amd64/segments.h comp-c-include
./usr/include/amd64/setjmp.h comp-c-include
./usr/include/amd64/signal.h comp-c-include
+./usr/include/amd64/sljitarch.h comp-c-include sljit
./usr/include/amd64/specialreg.h comp-c-include
./usr/include/amd64/stdarg.h comp-obsolete obsolete
./usr/include/amd64/sysarch.h comp-c-include
@@ -202,6 +203,7 @@
./usr/include/i386/segments.h comp-c-include
./usr/include/i386/setjmp.h comp-c-include
./usr/include/i386/signal.h comp-c-include
+./usr/include/i386/sljitarch.h comp-c-include sljit
./usr/include/i386/specialreg.h comp-c-include
./usr/include/i386/spkr.h comp-c-include
./usr/include/i386/stdarg.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.128 src/distrib/sets/lists/comp/md.i386:1.129
--- src/distrib/sets/lists/comp/md.i386:1.128 Sun Oct 28 17:07:44 2012
+++ src/distrib/sets/lists/comp/md.i386 Mon Nov 5 00:57:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.128 2012/10/28 17:07:44 joerg Exp $
+# $NetBSD: md.i386,v 1.129 2012/11/05 00:57:40 alnsn Exp $
./usr/include/clang-3.0/avxintrin.h comp-obsolete obsolete
./usr/include/clang-3.0/avx2intrin.h comp-obsolete obsolete
./usr/include/clang-3.0/bmi2intrin.h comp-obsolete obsolete
@@ -142,6 +142,7 @@
./usr/include/i386/segments.h comp-c-include
./usr/include/i386/setjmp.h comp-c-include
./usr/include/i386/signal.h comp-c-include
+./usr/include/i386/sljitarch.h comp-c-include sljit
./usr/include/i386/specialreg.h comp-c-include
./usr/include/i386/spkr.h comp-c-include
./usr/include/i386/stdarg.h comp-obsolete obsolete
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.497 src/distrib/sets/lists/tests/mi:1.498
--- src/distrib/sets/lists/tests/mi:1.497 Sat Nov 3 05:19:49 2012
+++ src/distrib/sets/lists/tests/mi Mon Nov 5 00:57:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.497 2012/11/03 05:19:49 pgoyette Exp $
+# $NetBSD: mi,v 1.498 2012/11/05 00:57:40 alnsn Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2753,6 +2753,10 @@
./usr/tests/lib/libskey tests-lib-tests atf
./usr/tests/lib/libskey/Atffile tests-lib-tests atf,skey
./usr/tests/lib/libskey/t_algorithms tests-lib-tests atf,skey
+./usr/tests/lib/libsljit tests-lib-tests atf,sljit
+./usr/tests/lib/libsljit/Atffile tests-lib-tests atf,sljit
+./usr/tests/lib/libsljit/h_sljit tests-lib-tests atf,sljit
+./usr/tests/lib/libsljit/t_sljit tests-lib-tests atf,sljit
./usr/tests/lib/libtre tests-lib-tests atf
./usr/tests/lib/libtre/Atffile tests-lib-tests atf
./usr/tests/lib/libtre/h_regex_att tests-obsolete obsolete
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.84 src/etc/mtree/NetBSD.dist.tests:1.85
--- src/etc/mtree/NetBSD.dist.tests:1.84 Wed Sep 12 14:07:10 2012
+++ src/etc/mtree/NetBSD.dist.tests Mon Nov 5 00:57:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.84 2012/09/12 14:07:10 martin Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.85 2012/11/05 00:57:41 alnsn Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -233,6 +233,7 @@
./usr/tests/lib/librumpclient
./usr/tests/lib/librumphijack
./usr/tests/lib/libskey
+./usr/tests/lib/libsljit
./usr/tests/lib/libtre
./usr/tests/lib/libtre/data
./usr/tests/lib/libutil
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.192 src/lib/Makefile:1.193
--- src/lib/Makefile:1.192 Sun Nov 4 19:48:08 2012
+++ src/lib/Makefile Mon Nov 5 00:57:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.192 2012/11/04 19:48:08 christos Exp $
+# $NetBSD: Makefile,v 1.193 2012/11/05 00:57:41 alnsn Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -191,6 +191,10 @@ SUBDIR+= libpam # depends on heimdal
SUBDIR+= ../crypto/external/bsd/libsaslc # depends on heimdal, openssl
.endif
+.if ${MKSLJIT} != "no"
+SUBDIR+= ../external/bsd/sljit/lib
+.endif
+
SUBDIR+= ../external/bsd/mdocml/lib
.if (${MKRUMP} != "no")
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.708 src/share/mk/bsd.own.mk:1.709
--- src/share/mk/bsd.own.mk:1.708 Sun Nov 4 16:27:28 2012
+++ src/share/mk/bsd.own.mk Mon Nov 5 00:57:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.708 2012/11/04 16:27:28 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.709 2012/11/05 00:57:41 alnsn Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -802,6 +802,14 @@ MKSOFTFLOAT?= yes
SOFTFLOAT_BITS= 32
.endif
+.if ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_ARCH} == "x86_64"
+MKSLJIT?= yes
+.else
+# Don't let this build where it really isn't supported.
+MKSLJIT:= no
+.endif
+
#
# MK* backward compatibility.
#
Index: src/sys/arch/amd64/include/Makefile
diff -u src/sys/arch/amd64/include/Makefile:1.14 src/sys/arch/amd64/include/Makefile:1.15
--- src/sys/arch/amd64/include/Makefile:1.14 Wed Aug 8 18:37:52 2012
+++ src/sys/arch/amd64/include/Makefile Mon Nov 5 00:57:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/08/08 18:37:52 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2012/11/05 00:57:41 alnsn Exp $
INCSDIR= /usr/include/amd64
@@ -20,7 +20,7 @@ INCS= ansi.h aout_machdep.h asm.h \
param.h pcb.h pci_machdep.h pio.h pmap.h pmc.h proc.h \
profile.h psl.h pte.h ptrace.h \
reg.h rwlock.h \
- segments.h setjmp.h signal.h specialreg.h sysarch.h \
+ segments.h setjmp.h signal.h sljitarch.h specialreg.h sysarch.h \
trap.h tss.h types.h \
userret.h \
vmparam.h \
Index: src/sys/arch/i386/include/Makefile
diff -u src/sys/arch/i386/include/Makefile:1.40 src/sys/arch/i386/include/Makefile:1.41
--- src/sys/arch/i386/include/Makefile:1.40 Wed Aug 8 18:37:52 2012
+++ src/sys/arch/i386/include/Makefile Mon Nov 5 00:57:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2012/08/08 18:37:52 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2012/11/05 00:57:42 alnsn Exp $
INCSDIR= /usr/include/i386
@@ -20,7 +20,7 @@ INCS= ansi.h aout_machdep.h apmvar.h asm
param.h pcb.h pio.h pmap.h pmc.h proc.h profile.h psl.h \
pte.h ptrace.h \
reg.h rwlock.h \
- segments.h setjmp.h signal.h specialreg.h spkr.h \
+ segments.h setjmp.h signal.h sljitarch.h specialreg.h spkr.h \
svr4_machdep.h sysarch.h \
trap.h tss.h types.h \
vm86.h vmparam.h \
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.20 src/tests/lib/Makefile:1.21
--- src/tests/lib/Makefile:1.20 Wed Aug 8 13:57:06 2012
+++ src/tests/lib/Makefile Mon Nov 5 00:57:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/08/08 13:57:06 christos Exp $
+# $NetBSD: Makefile,v 1.21 2012/11/05 00:57:42 alnsn Exp $
.include <bsd.own.mk>
@@ -18,6 +18,10 @@ TESTS_SUBDIRS+= libdes
TESTS_SUBDIRS+= libskey
.endif
+.if ${MKSLJIT} != "no"
+TESTS_SUBDIRS+= libsljit
+.endif
+
TESTSDIR= ${TESTSBASE}/lib
.include <bsd.test.mk>
