[src/trunk]: src Build bpfjit on i386.

[alnsn <alnsn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b22914cc5118
branches:  trunk
changeset: 782324:b22914cc5118
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Sun Oct 28 16:25:02 2012 +0000

description:
Build bpfjit on i386.

diffstat:

 distrib/sets/lists/modules/md.i386 |   6 +++++-
 sys/arch/i386/conf/files.i386      |   8 +++++++-
 sys/arch/i386/include/sljitarch.h  |  34 ++++++++++++++++++++++++++++++++++
 sys/modules/Makefile               |   5 +++--
 4 files changed, 49 insertions(+), 4 deletions(-)

diffs (106 lines):

diff -r d52ba9c21abb -r b22914cc5118 distrib/sets/lists/modules/md.i386
--- a/distrib/sets/lists/modules/md.i386        Sun Oct 28 09:41:12 2012 +0000
+++ b/distrib/sets/lists/modules/md.i386        Sun Oct 28 16:25:02 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.40 2012/08/06 10:44:08 martin Exp $
+# $NetBSD: md.i386,v 1.41 2012/10/28 16:25:02 alnsn Exp $
 ./@MODULEDIR@/acpiacad                         base-kernel-modules     kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod           base-kernel-modules     kmod
 ./@MODULEDIR@/acpibat                          base-kernel-modules     kmod
@@ -41,6 +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@/compat_freebsd                   base-kernel-modules     kmod
 ./@MODULEDIR@/compat_freebsd/compat_freebsd.kmod       base-kernel-modules     kmod
 ./@MODULEDIR@/compat_ibcs2                     base-kernel-modules     kmod
@@ -117,6 +119,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@/r128drm                          base-kernel-modules     kmod
 ./@MODULEDIR@/r128drm/r128drm.kmod             base-kernel-modules     kmod
 ./@MODULEDIR@/radeondrm                                base-kernel-modules     kmod
diff -r d52ba9c21abb -r b22914cc5118 sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386     Sun Oct 28 09:41:12 2012 +0000
+++ b/sys/arch/i386/conf/files.i386     Sun Oct 28 16:25:02 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i386,v 1.367 2012/10/03 18:58:31 dsl Exp $
+#      $NetBSD: files.i386,v 1.368 2012/10/28 16:25:03 alnsn Exp $
 #
 # new style config file for i386 architecture
 #
@@ -93,6 +93,12 @@
 file   crypto/blowfish/arch/i386/bf_cbc.S      blowfish & !i386_cpu
 
 #
+# Stack-less Just-In-Time compiler
+#
+
+include        "external/bsd/sljit/conf/files.sljit"
+
+#
 # Machine-independent SCSI drivers
 #
 
diff -r d52ba9c21abb -r b22914cc5118 sys/arch/i386/include/sljitarch.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/include/sljitarch.h Sun Oct 28 16:25:02 2012 +0000
@@ -0,0 +1,34 @@
+/*     $NetBSD: sljitarch.h,v 1.1 2012/10/28 16:25:03 alnsn Exp $      */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef I386_SLJITARCH_H
+#define I386_SLJITARCH_H
+
+#define SLJIT_CONFIG_X86_32 1
+
+#endif
diff -r d52ba9c21abb -r b22914cc5118 sys/modules/Makefile
--- a/sys/modules/Makefile      Sun Oct 28 09:41:12 2012 +0000
+++ b/sys/modules/Makefile      Sun Oct 28 16:25:02 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.113 2012/10/27 22:36:13 alnsn Exp $
+#      $NetBSD: Makefile,v 1.114 2012/10/28 16:25:03 alnsn Exp $
 
 .include <bsd.own.mk>
 
@@ -121,7 +121,8 @@
 SUBDIR+=       vmt
 .endif
 
-.if ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=       bpfjit
 SUBDIR+=       sljit
 .endif