Module Name: src
Committed By: alnsn
Date: Sun Oct 28 16:25:03 UTC 2012
Modified Files:
src/distrib/sets/lists/modules: md.i386
src/sys/arch/i386/conf: files.i386
src/sys/modules: Makefile
Added Files:
src/sys/arch/i386/include: sljitarch.h
Log Message:
Build bpfjit on i386.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.367 -r1.368 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/include/sljitarch.h
cvs rdiff -u -r1.113 -r1.114 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.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.40 src/distrib/sets/lists/modules/md.i386:1.41
--- src/distrib/sets/lists/modules/md.i386:1.40 Mon Aug 6 10:44:08 2012
+++ src/distrib/sets/lists/modules/md.i386 Sun Oct 28 16:25:02 2012
@@ -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
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.367 src/sys/arch/i386/conf/files.i386:1.368
--- src/sys/arch/i386/conf/files.i386:1.367 Wed Oct 3 18:58:31 2012
+++ src/sys/arch/i386/conf/files.i386 Sun Oct 28 16:25:03 2012
@@ -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_enc.S
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
#
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.113 src/sys/modules/Makefile:1.114
--- src/sys/modules/Makefile:1.113 Sat Oct 27 22:36:13 2012
+++ src/sys/modules/Makefile Sun Oct 28 16:25:03 2012
@@ -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+= tprof_amdpmi
SUBDIR+= vmt
.endif
-.if ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_ARCH} == "x86_64"
SUBDIR+= bpfjit
SUBDIR+= sljit
.endif
Added files:
Index: src/sys/arch/i386/include/sljitarch.h
diff -u /dev/null src/sys/arch/i386/include/sljitarch.h:1.1
--- /dev/null Sun Oct 28 16:25:03 2012
+++ src/sys/arch/i386/include/sljitarch.h Sun Oct 28 16:25:03 2012
@@ -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
