[src/trunk]: src Build sljit test when MKSLJIT != no and set MKSLJIT to yes o...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Build sljit test when MKSLJIT != no and set MKSLJIT to yes o...
From: alnsn <alnsn%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 23:51:25 +0000
details:   https://anonhg.NetBSD.org/src/rev/b51e921664f3
branches:  trunk
changeset: 782526:b51e921664f3
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Mon Nov 05 00:57:39 2012 +0000

description:
Build sljit test when MKSLJIT != no and set MKSLJIT to yes on amd64 and i386.

diffstat:

 distrib/sets/lists/comp/md.amd64 |   4 +++-
 distrib/sets/lists/comp/md.i386  |   3 ++-
 distrib/sets/lists/tests/mi      |   6 +++++-
 distrib/sets/mkvars.mk           |   3 ++-
 etc/mtree/NetBSD.dist.tests      |   3 ++-
 lib/Makefile                     |   6 +++++-
 share/mk/bsd.own.mk              |  10 +++++++++-
 sys/arch/amd64/include/Makefile  |   4 ++--
 sys/arch/i386/include/Makefile   |   4 ++--
 tests/lib/Makefile               |   6 +++++-
 10 files changed, 37 insertions(+), 12 deletions(-)

diffs (196 lines):

diff -r 856a8443f6ac -r b51e921664f3 distrib/sets/lists/comp/md.amd64
--- a/distrib/sets/lists/comp/md.amd64  Mon Nov 05 00:34:28 2012 +0000
+++ b/distrib/sets/lists/comp/md.amd64  Mon Nov 05 00:57:39 2012 +0000
@@ -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
diff -r 856a8443f6ac -r b51e921664f3 distrib/sets/lists/comp/md.i386
--- a/distrib/sets/lists/comp/md.i386   Mon Nov 05 00:34:28 2012 +0000
+++ b/distrib/sets/lists/comp/md.i386   Mon Nov 05 00:57:39 2012 +0000
@@ -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
diff -r 856a8443f6ac -r b51e921664f3 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Mon Nov 05 00:34:28 2012 +0000
+++ b/distrib/sets/lists/tests/mi       Mon Nov 05 00:57:39 2012 +0000
@@ -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
diff -r 856a8443f6ac -r b51e921664f3 distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk    Mon Nov 05 00:34:28 2012 +0000
+++ b/distrib/sets/mkvars.mk    Mon Nov 05 00:57:39 2012 +0000
@@ -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 @@
        MKCOMPATMODULES \
        MKDYNAMICROOT \
        MKMANPAGES \
+       MKSLJIT \
        MKXORG \
        X11FLAVOR \
        USE_INET6 \
diff -r 856a8443f6ac -r b51e921664f3 etc/mtree/NetBSD.dist.tests
--- a/etc/mtree/NetBSD.dist.tests       Mon Nov 05 00:34:28 2012 +0000
+++ b/etc/mtree/NetBSD.dist.tests       Mon Nov 05 00:57:39 2012 +0000
@@ -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
diff -r 856a8443f6ac -r b51e921664f3 lib/Makefile
--- a/lib/Makefile      Mon Nov 05 00:34:28 2012 +0000
+++ b/lib/Makefile      Mon Nov 05 00:57:39 2012 +0000
@@ -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+=       ../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")
diff -r 856a8443f6ac -r b51e921664f3 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Mon Nov 05 00:34:28 2012 +0000
+++ b/share/mk/bsd.own.mk       Mon Nov 05 00:57:39 2012 +0000
@@ -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 @@
 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.
 #
diff -r 856a8443f6ac -r b51e921664f3 sys/arch/amd64/include/Makefile
--- a/sys/arch/amd64/include/Makefile   Mon Nov 05 00:34:28 2012 +0000
+++ b/sys/arch/amd64/include/Makefile   Mon Nov 05 00:57:39 2012 +0000
@@ -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 @@
        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 \
diff -r 856a8443f6ac -r b51e921664f3 sys/arch/i386/include/Makefile
--- a/sys/arch/i386/include/Makefile    Mon Nov 05 00:34:28 2012 +0000
+++ b/sys/arch/i386/include/Makefile    Mon Nov 05 00:57:39 2012 +0000
@@ -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 @@
        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 \
diff -r 856a8443f6ac -r b51e921664f3 tests/lib/Makefile
--- a/tests/lib/Makefile        Mon Nov 05 00:34:28 2012 +0000
+++ b/tests/lib/Makefile        Mon Nov 05 00:57:39 2012 +0000
@@ -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+= libskey
 .endif
 
+.if ${MKSLJIT} != "no"
+TESTS_SUBDIRS+=        libsljit
+.endif
+
 TESTSDIR=      ${TESTSBASE}/lib
 
 .include <bsd.test.mk>
Prev by Date: [src/trunk]: src/tests/lib/libsljit Add userspace libsljit test. Not hooked i...
Next by Date: [src/trunk]: src/distrib/utils/sysinst/arch/i386 add missing include file.
Previous by Thread: [src/trunk]: src/tests/lib/libsljit Add userspace libsljit test. Not hooked i...
Next by Thread: [src/trunk]: src/distrib/utils/sysinst/arch/i386 add missing include file.
Indexes:
Home | Main Index | Thread Index | Old Index