Rename sljitarch.h to sljit_machdep.h. trunk
authoralnsn <alnsn@NetBSD.org>
Wed, 23 Jul 2014 18:19:43 +0000
branchtrunk
changeset 228687 75ba46328fca
parent 228686 d5fde9bbf81e
child 228688 aa5dd78900c7
Rename sljitarch.h to sljit_machdep.h.
distrib/sets/lists/comp/ad.arm
distrib/sets/lists/comp/ad.mips
distrib/sets/lists/comp/ad.powerpc
distrib/sets/lists/comp/md.amd64
distrib/sets/lists/comp/md.amigappc
distrib/sets/lists/comp/md.bebox
distrib/sets/lists/comp/md.cobalt
distrib/sets/lists/comp/md.evbmips
distrib/sets/lists/comp/md.evbppc
distrib/sets/lists/comp/md.ews4800mips
distrib/sets/lists/comp/md.hpcmips
distrib/sets/lists/comp/md.i386
distrib/sets/lists/comp/md.ibmnws
distrib/sets/lists/comp/md.macppc
distrib/sets/lists/comp/md.mvmeppc
distrib/sets/lists/comp/md.newsmips
distrib/sets/lists/comp/md.ofppc
distrib/sets/lists/comp/md.pmax
distrib/sets/lists/comp/md.prep
distrib/sets/lists/comp/md.rs6000
distrib/sets/lists/comp/md.sandpoint
distrib/sets/lists/comp/md.sbmips
distrib/sets/lists/comp/md.sgimips
distrib/sets/lists/comp/md.sparc
distrib/sets/lists/comp/md.sparc64
sys/arch/amd64/include/Makefile
sys/arch/amd64/include/sljit_machdep.h
sys/arch/amd64/include/sljitarch.h
sys/arch/amigappc/include/Makefile
sys/arch/amigappc/include/sljit_machdep.h
sys/arch/amigappc/include/sljitarch.h
sys/arch/arm/include/Makefile
sys/arch/arm/include/sljit_machdep.h
sys/arch/arm/include/sljitarch.h
sys/arch/bebox/include/Makefile
sys/arch/bebox/include/sljit_machdep.h
sys/arch/bebox/include/sljitarch.h
sys/arch/cobalt/include/Makefile
sys/arch/cobalt/include/sljit_machdep.h
sys/arch/cobalt/include/sljitarch.h
sys/arch/evbarm/include/Makefile
sys/arch/evbarm/include/sljit_machdep.h
sys/arch/evbarm/include/sljitarch.h
sys/arch/evbmips/include/Makefile
sys/arch/evbmips/include/sljit_machdep.h
sys/arch/evbmips/include/sljitarch.h
sys/arch/evbppc/include/Makefile
sys/arch/evbppc/include/sljit_machdep.h
sys/arch/evbppc/include/sljitarch.h
sys/arch/ews4800mips/include/Makefile
sys/arch/ews4800mips/include/sljit_machdep.h
sys/arch/ews4800mips/include/sljitarch.h
sys/arch/hpcarm/include/Makefile
sys/arch/hpcarm/include/sljit_machdep.h
sys/arch/hpcarm/include/sljitarch.h
sys/arch/hpcmips/include/Makefile
sys/arch/hpcmips/include/sljit_machdep.h
sys/arch/hpcmips/include/sljitarch.h
sys/arch/i386/include/Makefile
sys/arch/i386/include/sljit_machdep.h
sys/arch/i386/include/sljitarch.h
sys/arch/ibmnws/include/Makefile
sys/arch/ibmnws/include/sljit_machdep.h
sys/arch/ibmnws/include/sljitarch.h
sys/arch/iyonix/include/Makefile
sys/arch/iyonix/include/sljit_machdep.h
sys/arch/iyonix/include/sljitarch.h
sys/arch/macppc/include/Makefile
sys/arch/macppc/include/sljit_machdep.h
sys/arch/macppc/include/sljitarch.h
sys/arch/mips/include/Makefile
sys/arch/mips/include/sljit_machdep.h
sys/arch/mips/include/sljitarch.h
sys/arch/mvmeppc/include/Makefile
sys/arch/mvmeppc/include/sljit_machdep.h
sys/arch/mvmeppc/include/sljitarch.h
sys/arch/newsmips/include/Makefile
sys/arch/newsmips/include/sljit_machdep.h
sys/arch/newsmips/include/sljitarch.h
sys/arch/ofppc/include/Makefile
sys/arch/ofppc/include/sljit_machdep.h
sys/arch/ofppc/include/sljitarch.h
sys/arch/pmax/include/Makefile
sys/arch/pmax/include/sljit_machdep.h
sys/arch/pmax/include/sljitarch.h
sys/arch/powerpc/include/Makefile
sys/arch/powerpc/include/sljit_machdep.h
sys/arch/powerpc/include/sljitarch.h
sys/arch/prep/include/Makefile
sys/arch/prep/include/sljit_machdep.h
sys/arch/prep/include/sljitarch.h
sys/arch/rs6000/include/Makefile
sys/arch/rs6000/include/sljit_machdep.h
sys/arch/rs6000/include/sljitarch.h
sys/arch/sandpoint/include/Makefile
sys/arch/sandpoint/include/sljit_machdep.h
sys/arch/sandpoint/include/sljitarch.h
sys/arch/sbmips/include/Makefile
sys/arch/sbmips/include/sljit_machdep.h
sys/arch/sbmips/include/sljitarch.h
sys/arch/sgimips/include/Makefile
sys/arch/sgimips/include/sljit_machdep.h
sys/arch/sgimips/include/sljitarch.h
sys/arch/sparc/include/Makefile
sys/arch/sparc/include/sljit_machdep.h
sys/arch/sparc/include/sljitarch.h
sys/arch/sparc64/include/Makefile
sys/arch/sparc64/include/sljit_machdep.h
sys/arch/sparc64/include/sljitarch.h
sys/arch/zaurus/include/Makefile
sys/arch/zaurus/include/sljit_machdep.h
sys/arch/zaurus/include/sljitarch.h
sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
--- a/distrib/sets/lists/comp/ad.arm	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/ad.arm	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.57 2014/07/08 05:55:33 spz Exp $
+# $NetBSD: ad.arm,v 1.58 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/acorn26				comp-c-include
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
 ./usr/include/acorn26/aout_machdep.h		comp-obsolete		obsolete
@@ -172,7 +172,8 @@
 ./usr/include/arm/rwlock.h			comp-c-include
 ./usr/include/arm/setjmp.h			comp-c-include
 ./usr/include/arm/signal.h			comp-c-include
-./usr/include/arm/sljitarch.h			comp-c-include
+./usr/include/arm/sljitarch.h			comp-obsolete		obsolete
+./usr/include/arm/sljit_machdep.h		comp-c-include
 ./usr/include/arm/stdarg.h			comp-obsolete		obsolete
 ./usr/include/arm/swi.h				comp-c-include
 ./usr/include/arm/sysarch.h			comp-c-include
@@ -379,7 +380,8 @@
 ./usr/include/evbarm/rwlock.h			comp-obsolete		obsolete
 ./usr/include/evbarm/setjmp.h			comp-obsolete		obsolete
 ./usr/include/evbarm/signal.h			comp-obsolete		obsolete
-./usr/include/evbarm/sljitarch.h		comp-c-include
+./usr/include/evbarm/sljitarch.h		comp-obsolete		obsolete
+./usr/include/evbarm/sljit_machdep.h		comp-c-include
 ./usr/include/evbarm/stdarg.h			comp-obsolete		obsolete
 ./usr/include/evbarm/sysarch.h			comp-obsolete		obsolete
 ./usr/include/evbarm/trap.h			comp-obsolete		obsolete
@@ -437,7 +439,8 @@
 ./usr/include/hpcarm/rwlock.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/setjmp.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/signal.h			comp-obsolete		obsolete
-./usr/include/hpcarm/sljitarch.h		comp-c-include
+./usr/include/hpcarm/sljitarch.h		comp-obsolete		obsolete
+./usr/include/hpcarm/sljit_machdep.h		comp-c-include
 ./usr/include/hpcarm/stdarg.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/sysarch.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/trap.h			comp-obsolete		obsolete
@@ -489,7 +492,8 @@
 ./usr/include/iyonix/rwlock.h			comp-obsolete		obsolete
 ./usr/include/iyonix/setjmp.h			comp-obsolete		obsolete
 ./usr/include/iyonix/signal.h			comp-obsolete		obsolete
-./usr/include/iyonix/sljitarch.h		comp-c-include
+./usr/include/iyonix/sljitarch.h		comp-obsolete		obsolete
+./usr/include/iyonix/sljit_machdep.h		comp-c-include
 ./usr/include/iyonix/stdarg.h			comp-obsolete		obsolete
 ./usr/include/iyonix/sysarch.h			comp-obsolete		obsolete
 ./usr/include/iyonix/trap.h			comp-obsolete		obsolete
@@ -640,7 +644,8 @@
 ./usr/include/zaurus/rwlock.h			comp-obsolete		obsolete
 ./usr/include/zaurus/setjmp.h			comp-obsolete		obsolete
 ./usr/include/zaurus/signal.h			comp-obsolete		obsolete
-./usr/include/zaurus/sljitarch.h		comp-c-include
+./usr/include/zaurus/sljitarch.h		comp-obsolete		obsolete
+./usr/include/zaurus/sljit_machdep.h		comp-c-include
 ./usr/include/zaurus/stdarg.h			comp-obsolete		obsolete
 ./usr/include/zaurus/sysarch.h			comp-obsolete		obsolete
 ./usr/include/zaurus/trap.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/ad.mips	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/ad.mips	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.49 2014/07/08 05:55:33 spz Exp $
+# $NetBSD: ad.mips,v 1.50 2014/07/23 18:19:43 alnsn Exp $
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/g++/bits/mips32			comp-c-include		arch64
@@ -62,7 +62,8 @@
 ./usr/include/mips/rwlock.h			comp-c-include
 ./usr/include/mips/setjmp.h			comp-c-include
 ./usr/include/mips/signal.h			comp-c-include
-./usr/include/mips/sljitarch.h			comp-c-include
+./usr/include/mips/sljitarch.h			comp-obsolete		obsolete
+./usr/include/mips/sljit_machdep.h		comp-c-include
 ./usr/include/mips/stdarg.h			comp-obsolete		obsolete
 ./usr/include/mips/sysarch.h			comp-c-include
 ./usr/include/mips/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/ad.powerpc	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/ad.powerpc	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.70 2014/07/08 05:55:33 spz Exp $
+# $NetBSD: ad.powerpc,v 1.71 2014/07/23 18:19:43 alnsn Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb
 ./usr/include/altivec.h				comp-obsolete		obsolete
@@ -100,7 +100,8 @@
 ./usr/include/powerpc/rwlock.h			comp-c-include
 ./usr/include/powerpc/setjmp.h			comp-c-include
 ./usr/include/powerpc/signal.h			comp-c-include
-./usr/include/powerpc/sljitarch.h		comp-c-include
+./usr/include/powerpc/sljitarch.h		comp-obsolete		obsolete
+./usr/include/powerpc/sljit_machdep.h		comp-c-include
 ./usr/include/powerpc/spr.h			comp-c-include
 ./usr/include/powerpc/stdarg.h			comp-obsolete		obsolete
 ./usr/include/powerpc/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.amd64	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.222 2014/07/08 05:55:34 spz Exp $
+# $NetBSD: md.amd64,v 1.223 2014/07/23 18:19:43 alnsn Exp $
 
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
@@ -58,7 +58,8 @@
 ./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
+./usr/include/amd64/sljitarch.h			comp-obsolete		obsolete
+./usr/include/amd64/sljit_machdep.h		comp-c-include
 ./usr/include/amd64/specialreg.h		comp-c-include
 ./usr/include/amd64/stdarg.h			comp-obsolete		obsolete
 ./usr/include/amd64/sysarch.h			comp-c-include
@@ -270,7 +271,8 @@
 ./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
+./usr/include/i386/sljitarch.h			comp-obsolete		obsolete
+./usr/include/i386/sljit_machdep.h		comp-c-include
 ./usr/include/i386/specialreg.h			comp-c-include
 ./usr/include/i386/spkr.h			comp-c-include
 ./usr/include/i386/stdarg.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.amigappc	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.amigappc	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amigappc,v 1.11 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.amigappc,v 1.12 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/amigappc				comp-c-include
 ./usr/include/amigappc/_G_config.h		comp-obsolete		obsolete
 ./usr/include/amigappc/ansi.h			comp-c-include
@@ -50,7 +50,8 @@
 ./usr/include/amigappc/rwlock.h			comp-c-include
 ./usr/include/amigappc/setjmp.h			comp-c-include
 ./usr/include/amigappc/signal.h			comp-c-include
-./usr/include/amigappc/sljitarch.h		comp-c-include
+./usr/include/amigappc/sljitarch.h		comp-obsolete		obsolete
+./usr/include/amigappc/sljit_machdep.h		comp-c-include
 ./usr/include/amigappc/spr.h			comp-obsolete		obsolete
 ./usr/include/amigappc/stdarg.h			comp-obsolete		obsolete
 ./usr/include/amigappc/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.bebox	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.bebox	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.37 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.bebox,v 1.38 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/bebox				comp-c-include
 ./usr/include/bebox/_G_config.h			comp-obsolete		obsolete
 ./usr/include/bebox/ansi.h			comp-c-include
@@ -56,7 +56,8 @@
 ./usr/include/bebox/rwlock.h			comp-c-include
 ./usr/include/bebox/setjmp.h			comp-c-include
 ./usr/include/bebox/signal.h			comp-c-include
-./usr/include/bebox/sljitarch.h			comp-c-include
+./usr/include/bebox/sljitarch.h			comp-obsolete		obsolete
+./usr/include/bebox/sljit_machdep.h		comp-c-include
 ./usr/include/bebox/spkr.h			comp-c-include
 ./usr/include/bebox/spr.h			comp-obsolete		obsolete
 ./usr/include/bebox/stdarg.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.cobalt	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.cobalt	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.cobalt,v 1.25 2014/07/22 20:19:57 alnsn Exp $
+# $NetBSD: md.cobalt,v 1.26 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/cobalt				comp-c-include
 ./usr/include/cobalt/_G_config.h		comp-obsolete		obsolete
 ./usr/include/cobalt/ansi.h			comp-c-include
@@ -52,7 +52,8 @@
 ./usr/include/cobalt/rwlock.h			comp-c-include
 ./usr/include/cobalt/setjmp.h			comp-c-include
 ./usr/include/cobalt/signal.h			comp-c-include
-./usr/include/cobalt/sljitarch.h		comp-c-include
+./usr/include/cobalt/sljitarch.h		comp-obsolete		obsolete
+./usr/include/cobalt/sljit_machdep.h		comp-c-include
 ./usr/include/cobalt/stdarg.h			comp-obsolete		obsolete
 ./usr/include/cobalt/trap.h			comp-c-include
 ./usr/include/cobalt/types.h			comp-c-include
--- a/distrib/sets/lists/comp/md.evbmips	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.evbmips	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbmips,v 1.17 2012/11/24 14:00:35 alnsn Exp $
+# $NetBSD: md.evbmips,v 1.18 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/evbmips				comp-c-include
 ./usr/include/evbmips/_G_config.h		comp-obsolete		obsolete
 ./usr/include/evbmips/ansi.h			comp-c-include
@@ -52,7 +52,8 @@
 ./usr/include/evbmips/rwlock.h			comp-c-include
 ./usr/include/evbmips/setjmp.h			comp-c-include
 ./usr/include/evbmips/signal.h			comp-c-include
-./usr/include/evbmips/sljitarch.h		comp-c-include
+./usr/include/evbmips/sljitarch.h		comp-obsolete		obsolete
+./usr/include/evbmips/sljit_machdep.h		comp-c-include
 ./usr/include/evbmips/stdarg.h			comp-obsolete		obsolete
 ./usr/include/evbmips/trap.h			comp-c-include
 ./usr/include/evbmips/types.h			comp-c-include
--- a/distrib/sets/lists/comp/md.evbppc	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.evbppc	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbppc,v 1.13 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.evbppc,v 1.14 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/evbppc				comp-c-include
 ./usr/include/evbppc/_G_config.h		comp-obsolete		obsolete
 ./usr/include/evbppc/ansi.h			comp-c-include
@@ -48,7 +48,8 @@
 ./usr/include/evbppc/rwlock.h			comp-c-include
 ./usr/include/evbppc/setjmp.h			comp-c-include
 ./usr/include/evbppc/signal.h			comp-c-include
-./usr/include/evbppc/sljitarch.h		comp-c-include
+./usr/include/evbppc/sljitarch.h		comp-obsolete		obsolete
+./usr/include/evbppc/sljit_machdep.h		comp-c-include
 ./usr/include/evbppc/spr.h			comp-obsolete		obsolete
 ./usr/include/evbppc/stdarg.h			comp-obsolete		obsolete
 ./usr/include/evbppc/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.ews4800mips	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.ews4800mips	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.ews4800mips,v 1.7 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: md.ews4800mips,v 1.8 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ews4800mips			comp-c-include
 ./usr/include/ews4800mips/ansi.h		comp-c-include
 ./usr/include/ews4800mips/aout_machdep.h	comp-c-include
@@ -47,7 +47,8 @@
 ./usr/include/ews4800mips/rwlock.h		comp-c-include
 ./usr/include/ews4800mips/setjmp.h		comp-c-include
 ./usr/include/ews4800mips/signal.h		comp-c-include
-./usr/include/ews4800mips/sljitarch.h		comp-c-include
+./usr/include/ews4800mips/sljitarch.h		comp-obsolete		obsolete
+./usr/include/ews4800mips/sljit_machdep.h	comp-c-include
 ./usr/include/ews4800mips/stdarg.h		comp-obsolete		obsolete
 ./usr/include/ews4800mips/trap.h		comp-c-include
 ./usr/include/ews4800mips/types.h		comp-c-include
--- a/distrib/sets/lists/comp/md.hpcmips	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.hpcmips	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcmips,v 1.31 2013/01/16 16:01:06 christos Exp $
+# $NetBSD: md.hpcmips,v 1.32 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/dev/hpc/hpcfbio.h			comp-c-include
 ./usr/include/hpcmips				comp-c-include
 ./usr/include/hpcmips/_G_config.h		comp-obsolete		obsolete
@@ -54,7 +54,8 @@
 ./usr/include/hpcmips/rwlock.h			comp-c-include
 ./usr/include/hpcmips/setjmp.h			comp-c-include
 ./usr/include/hpcmips/signal.h			comp-c-include
-./usr/include/hpcmips/sljitarch.h		comp-c-include
+./usr/include/hpcmips/sljitarch.h		comp-obsolete		obsolete
+./usr/include/hpcmips/sljit_machdep.h		comp-c-include
 ./usr/include/hpcmips/stdarg.h			comp-obsolete		obsolete
 ./usr/include/hpcmips/sysconf.h			comp-c-include
 ./usr/include/hpcmips/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.i386	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.i386	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.147 2014/07/05 20:17:51 joerg Exp $
+# $NetBSD: md.i386,v 1.148 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -204,7 +204,8 @@
 ./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
+./usr/include/i386/sljitarch.h			comp-obsolete		obsolete
+./usr/include/i386/sljit_machdep.h		comp-c-include
 ./usr/include/i386/specialreg.h			comp-c-include
 ./usr/include/i386/spkr.h			comp-c-include
 ./usr/include/i386/stdarg.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.ibmnws	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.ibmnws	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.ibmnws,v 1.11 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.ibmnws,v 1.12 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ibmnws				comp-c-include
 ./usr/include/ibmnws/_G_config.h		comp-obsolete		obsolete
 ./usr/include/ibmnws/ansi.h			comp-c-include
@@ -51,7 +51,8 @@
 ./usr/include/ibmnws/rwlock.h			comp-c-include
 ./usr/include/ibmnws/setjmp.h			comp-c-include
 ./usr/include/ibmnws/signal.h			comp-c-include
-./usr/include/ibmnws/sljitarch.h		comp-c-include
+./usr/include/ibmnws/sljitarch.h		comp-obsolete		obsolete
+./usr/include/ibmnws/sljit_machdep.h		comp-c-include
 ./usr/include/ibmnws/spr.h			comp-obsolete		obsolete
 ./usr/include/ibmnws/stdarg.h			comp-obsolete		obsolete
 ./usr/include/ibmnws/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.macppc	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.macppc	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.38 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.macppc,v 1.39 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/macppc				comp-c-include
 ./usr/include/macppc/_G_config.h		comp-obsolete		obsolete
@@ -56,7 +56,8 @@
 ./usr/include/macppc/rwlock.h			comp-c-include
 ./usr/include/macppc/setjmp.h			comp-c-include
 ./usr/include/macppc/signal.h			comp-c-include
-./usr/include/macppc/sljitarch.h		comp-c-include
+./usr/include/macppc/sljitarch.h		comp-obsolete		obsolete
+./usr/include/macppc/sljit_machdep.h		comp-c-include
 ./usr/include/macppc/spr.h			comp-obsolete		obsolete
 ./usr/include/macppc/stdarg.h			comp-obsolete		obsolete
 ./usr/include/macppc/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.mvmeppc	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.mvmeppc	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.mvmeppc,v 1.15 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.mvmeppc,v 1.16 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/mvmeppc				comp-c-include
 ./usr/include/mvmeppc/_G_config.h		comp-obsolete		obsolete
@@ -52,7 +52,8 @@
 ./usr/include/mvmeppc/rwlock.h			comp-c-include
 ./usr/include/mvmeppc/setjmp.h			comp-c-include
 ./usr/include/mvmeppc/signal.h			comp-c-include
-./usr/include/mvmeppc/sljitarch.h		comp-c-include
+./usr/include/mvmeppc/sljitarch.h		comp-obsolete		obsolete
+./usr/include/mvmeppc/sljit_machdep.h		comp-c-include
 ./usr/include/mvmeppc/spr.h			comp-obsolete		obsolete
 ./usr/include/mvmeppc/stdarg.h			comp-obsolete		obsolete
 ./usr/include/mvmeppc/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.newsmips	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.newsmips	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.newsmips,v 1.30 2012/11/25 21:55:50 alnsn Exp $
+# $NetBSD: md.newsmips,v 1.31 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/newsmips				comp-c-include
 ./usr/include/newsmips/_G_config.h		comp-obsolete		obsolete
@@ -57,7 +57,8 @@
 ./usr/include/newsmips/rwlock.h			comp-c-include
 ./usr/include/newsmips/setjmp.h			comp-c-include
 ./usr/include/newsmips/signal.h			comp-c-include
-./usr/include/newsmips/sljitarch.h		comp-c-include
+./usr/include/newsmips/sljitarch.h		comp-obsolete		obsolete
+./usr/include/newsmips/sljit_machdep.h		comp-c-include
 ./usr/include/newsmips/stdarg.h			comp-obsolete		obsolete
 ./usr/include/newsmips/trap.h			comp-c-include
 ./usr/include/newsmips/types.h			comp-c-include
--- a/distrib/sets/lists/comp/md.ofppc	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.ofppc	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.15 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.ofppc,v 1.16 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/ofppc				comp-c-include
 ./usr/include/ofppc/_G_config.h			comp-obsolete		obsolete
@@ -47,7 +47,8 @@
 ./usr/include/ofppc/rwlock.h			comp-c-include
 ./usr/include/ofppc/setjmp.h			comp-c-include
 ./usr/include/ofppc/signal.h			comp-c-include
-./usr/include/ofppc/sljitarch.h			comp-c-include
+./usr/include/ofppc/sljitarch.h			comp-obsolete		obsolete
+./usr/include/ofppc/sljit_machdep.h		comp-c-include
 ./usr/include/ofppc/spr.h			comp-obsolete		obsolete
 ./usr/include/ofppc/stdarg.h			comp-obsolete		obsolete
 ./usr/include/ofppc/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.pmax	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.pmax	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.pmax,v 1.64 2014/07/22 20:19:57 alnsn Exp $
+# $NetBSD: md.pmax,v 1.65 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/pmax				comp-c-include
 ./usr/include/pmax/_G_config.h			comp-obsolete		obsolete
@@ -58,7 +58,8 @@
 ./usr/include/pmax/rwlock.h			comp-c-include
 ./usr/include/pmax/setjmp.h			comp-c-include
 ./usr/include/pmax/signal.h			comp-c-include
-./usr/include/pmax/sljitarch.h			comp-c-include
+./usr/include/pmax/sljitarch.h			comp-obsolete		obsolete
+./usr/include/pmax/sljit_machdep.h		comp-c-include
 ./usr/include/pmax/stdarg.h			comp-obsolete		obsolete
 ./usr/include/pmax/tc_machdep.h			comp-c-include
 ./usr/include/pmax/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.prep	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.prep	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.29 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.prep,v 1.30 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/prep				comp-c-include
 ./usr/include/prep/_G_config.h			comp-obsolete		obsolete
@@ -54,7 +54,8 @@
 ./usr/include/prep/rwlock.h			comp-c-include
 ./usr/include/prep/setjmp.h			comp-c-include
 ./usr/include/prep/signal.h			comp-c-include
-./usr/include/prep/sljitarch.h			comp-c-include
+./usr/include/prep/sljitarch.h			comp-obsolete		obsolete
+./usr/include/prep/sljit_machdep.h		comp-c-include
 ./usr/include/prep/spkr.h			comp-c-include
 ./usr/include/prep/spr.h			comp-obsolete		obsolete
 ./usr/include/prep/stdarg.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.rs6000	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.rs6000	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.rs6000,v 1.7 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.rs6000,v 1.8 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/rs6000				comp-c-include
 ./usr/include/rs6000/ansi.h			comp-c-include
@@ -44,7 +44,8 @@
 ./usr/include/rs6000/rwlock.h			comp-c-include
 ./usr/include/rs6000/setjmp.h			comp-c-include
 ./usr/include/rs6000/signal.h			comp-c-include
-./usr/include/rs6000/sljitarch.h		comp-c-include
+./usr/include/rs6000/sljitarch.h		comp-obsolete		obsolete
+./usr/include/rs6000/sljit_machdep.h		comp-c-include
 ./usr/include/rs6000/spr.h			comp-obsolete		obsolete
 ./usr/include/rs6000/stdarg.h			comp-obsolete		obsolete
 ./usr/include/rs6000/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.sandpoint	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.sandpoint	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sandpoint,v 1.17 2013/11/17 14:34:11 alnsn Exp $
+# $NetBSD: md.sandpoint,v 1.18 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sandpoint				comp-c-include
 ./usr/include/sandpoint/_G_config.h		comp-obsolete		obsolete
@@ -53,7 +53,8 @@
 ./usr/include/sandpoint/rwlock.h		comp-c-include
 ./usr/include/sandpoint/setjmp.h		comp-c-include
 ./usr/include/sandpoint/signal.h		comp-c-include
-./usr/include/sandpoint/sljitarch.h		comp-c-include
+./usr/include/sandpoint/sljitarch.h		comp-obsolete		obsolete
+./usr/include/sandpoint/sljit_machdep.h		comp-c-include
 ./usr/include/sandpoint/spr.h			comp-obsolete		obsolete
 ./usr/include/sandpoint/stdarg.h		comp-obsolete		obsolete
 ./usr/include/sandpoint/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.sbmips	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.sbmips	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sbmips,v 1.15 2012/11/25 21:55:50 alnsn Exp $
+# $NetBSD: md.sbmips,v 1.16 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sbmips				comp-c-include
 ./usr/include/sbmips/_G_config.h		comp-obsolete		obsolete
@@ -48,7 +48,8 @@
 ./usr/include/sbmips/rwlock.h			comp-c-include
 ./usr/include/sbmips/setjmp.h			comp-c-include
 ./usr/include/sbmips/signal.h			comp-c-include
-./usr/include/sbmips/sljitarch.h		comp-c-include
+./usr/include/sbmips/sljitarch.h		comp-obsolete		obsolete
+./usr/include/sbmips/sljit_machdep.h		comp-c-include
 ./usr/include/sbmips/stdarg.h			comp-obsolete		obsolete
 ./usr/include/sbmips/trap.h			comp-c-include
 ./usr/include/sbmips/types.h			comp-c-include
--- a/distrib/sets/lists/comp/md.sgimips	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.sgimips	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.19 2013/01/16 16:01:06 christos Exp $
+# $NetBSD: md.sgimips,v 1.20 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/dev/crmfbreg.h			comp-c-include
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sgimips				comp-c-include
@@ -53,7 +53,8 @@
 ./usr/include/sgimips/rwlock.h			comp-c-include
 ./usr/include/sgimips/setjmp.h			comp-c-include
 ./usr/include/sgimips/signal.h			comp-c-include
-./usr/include/sgimips/sljitarch.h		comp-c-include
+./usr/include/sgimips/sljitarch.h		comp-obsolete		obsolete
+./usr/include/sgimips/sljit_machdep.h		comp-c-include
 ./usr/include/sgimips/stdarg.h			comp-obsolete		obsolete
 ./usr/include/sgimips/trap.h			comp-c-include
 ./usr/include/sgimips/types.h			comp-c-include
--- a/distrib/sets/lists/comp/md.sparc	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.sparc	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.83 2014/02/01 17:01:35 nakayama Exp $
+# $NetBSD: md.sparc,v 1.84 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/visintrin.h		comp-c-include		gcccmds,gcc=48
@@ -59,7 +59,8 @@
 ./usr/include/sparc/rwlock.h			comp-c-include
 ./usr/include/sparc/setjmp.h			comp-c-include
 ./usr/include/sparc/signal.h			comp-c-include
-./usr/include/sparc/sljitarch.h			comp-c-include
+./usr/include/sparc/sljitarch.h			comp-obsolete		obsolete
+./usr/include/sparc/sljit_machdep.h		comp-c-include
 ./usr/include/sparc/stdarg.h			comp-obsolete		obsolete
 ./usr/include/sparc/sxreg.h			comp-c-include
 ./usr/include/sparc/tctrl.h			comp-c-include
@@ -131,7 +132,8 @@
 ./usr/include/sparc64/rwlock.h			comp-c-include
 ./usr/include/sparc64/setjmp.h			comp-c-include
 ./usr/include/sparc64/signal.h			comp-c-include
-./usr/include/sparc64/sljitarch.h		comp-c-include
+./usr/include/sparc64/sljitarch.h		comp-obsolete		obsolete
+./usr/include/sparc64/sljit_machdep.h		comp-c-include
 ./usr/include/sparc64/stdarg.h			comp-obsolete		obsolete
 ./usr/include/sparc64/svr4_machdep.h		comp-c-include
 ./usr/include/sparc64/trap.h			comp-c-include
--- a/distrib/sets/lists/comp/md.sparc64	Wed Jul 23 18:05:44 2014 +0000
+++ b/distrib/sets/lists/comp/md.sparc64	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.185 2014/07/08 05:55:34 spz Exp $
+# $NetBSD: md.sparc64,v 1.186 2014/07/23 18:19:43 alnsn Exp $
 ./usr/include/g++/bits/sparc			comp-c-include		compat
 ./usr/include/g++/bits/sparc/c++config.h	comp-c-include		gcc=48,compat
 ./usr/include/g++/bits/sparc64			comp-c-include		compat
@@ -63,7 +63,8 @@
 ./usr/include/sparc/rwlock.h			comp-c-include
 ./usr/include/sparc/setjmp.h			comp-c-include
 ./usr/include/sparc/signal.h			comp-c-include
-./usr/include/sparc/sljitarch.h			comp-c-include
+./usr/include/sparc/sljitarch.h			comp-obsolete		obsolete
+./usr/include/sparc/sljit_machdep.h		comp-c-include
 ./usr/include/sparc/stdarg.h			comp-obsolete		obsolete
 ./usr/include/sparc/tctrl.h			comp-c-include
 ./usr/include/sparc/trap.h			comp-c-include
@@ -134,7 +135,8 @@
 ./usr/include/sparc64/rwlock.h			comp-c-include
 ./usr/include/sparc64/setjmp.h			comp-c-include
 ./usr/include/sparc64/signal.h			comp-c-include
-./usr/include/sparc64/sljitarch.h		comp-c-include
+./usr/include/sparc64/sljitarch.h		comp-obsolete		obsolete
+./usr/include/sparc64/sljit_machdep.h		comp-c-include
 ./usr/include/sparc64/stdarg.h			comp-obsolete		obsolete
 ./usr/include/sparc64/svr4_machdep.h		comp-c-include
 ./usr/include/sparc64/trap.h			comp-c-include
--- a/sys/arch/amd64/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/amd64/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2014/02/18 22:05:56 dsl Exp $
+#	$NetBSD: Makefile,v 1.18 2014/07/23 18:19:43 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 sljitarch.h specialreg.h sysarch.h \
+	segments.h setjmp.h signal.h sljit_machdep.h specialreg.h sysarch.h \
 	trap.h tss.h types.h \
 	userret.h \
 	vmparam.h \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amd64/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,36 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2012-2013 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 _AMD64_SLJITARCH_H
+#define _AMD64_SLJITARCH_H
+
+#define SLJIT_CONFIG_X86_64 1
+
+#define SLJIT_CACHE_FLUSH(from, to)
+
+#endif
--- a/sys/arch/amd64/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.2 2013/11/17 12:01:58 alnsn Exp $	*/
-
-/*-
- * Copyright (c) 2012-2013 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 _AMD64_SLJITARCH_H
-#define _AMD64_SLJITARCH_H
-
-#define SLJIT_CONFIG_X86_64 1
-
-#define SLJIT_CACHE_FLUSH(from, to)
-
-#endif
--- a/sys/arch/amigappc/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/amigappc/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.24 2013/11/17 14:34:11 alnsn Exp $
+#	$NetBSD: Makefile,v 1.25 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR= /usr/include/amigappc
 
 INCS=	disklabel.h \
 	intr.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	vmparam.h
 
 .include "../../powerpc/include/Makefile"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amigappc/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/amigappc/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:11 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/arm/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/arm/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.48 2014/06/17 06:36:39 alnsn Exp $
+#	$NetBSD: Makefile,v 1.49 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR= /usr/include/arm
 
@@ -17,7 +17,7 @@
 	param.h pcb.h pmc.h proc.h profile.h rwlock.h \
 	ptrace.h \
 	reg.h rwlock.h \
-	setjmp.h signal.h sljitarch.h swi.h sysarch.h \
+	setjmp.h signal.h sljit_machdep.h swi.h sysarch.h \
 	trap.h types.h \
 	vfpreg.h vmparam.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,59 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2014 Alexander Nasonov.
+ * 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 _ARM_SLJITARCH_H
+#define _ARM_SLJITARCH_H
+
+#include <sys/cdefs.h>
+
+#ifdef _KERNEL
+#include <machine/types.h>
+#include <arm/cpufunc.h>
+#else
+#include <stddef.h>
+#include <stdint.h>
+#include <arm/sysarch.h>
+#endif
+
+#if defined(_ARM_ARCH_T2)
+#define SLJIT_CONFIG_ARM_THUMB2 1
+#elif defined(_ARM_ARCH_7)
+#define SLJIT_CONFIG_ARM_V7 1
+#else
+#define SLJIT_CONFIG_ARM_V5 1
+#endif
+
+#ifdef _KERNEL
+#define SLJIT_CACHE_FLUSH(from, to) \
+	cpu_icache_sync_range((vaddr_t)(from), (vsize_t)((to) - (from)))
+#else
+#define SLJIT_CACHE_FLUSH(from, to) \
+	(void)arm_sync_icache((uintptr_t)(from), (size_t)((to) - (from)))
+#endif
+
+#endif
--- a/sys/arch/arm/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.2 2014/07/22 20:16:39 alnsn Exp $	*/
-
-/*-
- * Copyright (c) 2014 Alexander Nasonov.
- * 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 _ARM_SLJITARCH_H
-#define _ARM_SLJITARCH_H
-
-#include <sys/cdefs.h>
-
-#ifdef _KERNEL
-#include <machine/types.h>
-#include <arm/cpufunc.h>
-#else
-#include <stddef.h>
-#include <stdint.h>
-#include <arm/sysarch.h>
-#endif
-
-#if defined(_ARM_ARCH_T2)
-#define SLJIT_CONFIG_ARM_THUMB2 1
-#elif defined(_ARM_ARCH_7)
-#define SLJIT_CONFIG_ARM_V7 1
-#else
-#define SLJIT_CONFIG_ARM_V5 1
-#endif
-
-#ifdef _KERNEL
-#define SLJIT_CACHE_FLUSH(from, to) \
-	cpu_icache_sync_range((vaddr_t)(from), (vsize_t)((to) - (from)))
-#else
-#define SLJIT_CACHE_FLUSH(from, to) \
-	(void)arm_sync_icache((uintptr_t)(from), (size_t)((to) - (from)))
-#endif
-
-#endif
--- a/sys/arch/bebox/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/bebox/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.24 2013/11/17 14:34:11 alnsn Exp $
+#	$NetBSD: Makefile,v 1.25 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR= /usr/include/bebox
 
 INCS=   bootinfo.h \
 	disklabel.h \
 	intr.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	spkr.h \
 	vmparam.h
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/bebox/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/bebox/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:11 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/cobalt/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/cobalt/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2014/07/22 20:19:57 alnsn Exp $
+#	$NetBSD: Makefile,v 1.22 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR= /usr/include/cobalt
 
@@ -17,7 +17,7 @@
 	nvram.h \
 	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	trap.h types.h \
 	vmparam.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/cobalt/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+#include <mips/sljit_machdep.h>
--- a/sys/arch/cobalt/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2014/07/22 20:19:57 alnsn Exp $	*/
-
-#include <mips/sljitarch.h>
--- a/sys/arch/evbarm/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/evbarm/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.21 2014/06/17 06:36:40 alnsn Exp $
+#	$NetBSD: Makefile,v 1.22 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR=	/usr/include/evbarm
 
-INCS=		sljitarch.h
+INCS=		sljit_machdep.h
 
 .include "../../arm/include/Makefile.common"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+#include <arm/sljit_machdep.h>
--- a/sys/arch/evbarm/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:40 alnsn Exp $	*/
-
-#include <arm/sljitarch.h>
--- a/sys/arch/evbmips/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/evbmips/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2012/11/24 14:00:36 alnsn Exp $
+#	$NetBSD: Makefile,v 1.16 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR=/usr/include/evbmips
 
@@ -16,7 +16,7 @@
 	param.h pcb.h \
 	pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	trap.h types.h \
 	vmparam.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbmips/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+#include <mips/sljit_machdep.h>
--- a/sys/arch/evbmips/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.2 2012/11/25 21:55:50 alnsn Exp $	*/
-
-#include <mips/sljitarch.h>
--- a/sys/arch/evbppc/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/evbppc/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.6 2013/11/17 14:34:11 alnsn Exp $
+#	$NetBSD: Makefile,v 1.7 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR= /usr/include/evbppc
 
 INCS=	disklabel.h \
 	intr.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	vmparam.h 
 
 .include "../../powerpc/include/Makefile"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbppc/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/evbppc/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:11 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/ews4800mips/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/ews4800mips/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2012/11/25 21:55:50 alnsn Exp $
+#	$NetBSD: Makefile,v 1.7 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR= /usr/include/ews4800mips
 
@@ -16,7 +16,7 @@
 	param.h pcb.h pdinfo.h pmap.h pmc.h proc.h profile.h psl.h pte.h \
 	ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	trap.h types.h \
 	vmparam.h vtoc.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/ews4800mips/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+#include <mips/sljit_machdep.h>
--- a/sys/arch/ews4800mips/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2012/11/25 21:55:50 alnsn Exp $	*/
-
-#include <mips/sljitarch.h>
--- a/sys/arch/hpcarm/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/hpcarm/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.30 2014/06/17 06:36:40 alnsn Exp $
+#	$NetBSD: Makefile,v 1.31 2014/07/23 18:19:43 alnsn Exp $
 
 INCSDIR=	/usr/include/hpcarm
-INCS=		sljitarch.h
+INCS=		sljit_machdep.h
 
 .include "../../arm/include/Makefile.common"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpcarm/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+
+#include <arm/sljit_machdep.h>
--- a/sys/arch/hpcarm/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:40 alnsn Exp $	*/
-
-#include <arm/sljitarch.h>
--- a/sys/arch/hpcmips/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/hpcmips/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2012/11/25 21:55:51 alnsn Exp $
+#	$NetBSD: Makefile,v 1.24 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/hpcmips
 
@@ -16,7 +16,7 @@
 	math.h mcontext.h mips_opcode.h mutex.h \
 	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h sysconf.h \
+	setjmp.h signal.h sljit_machdep.h sysconf.h \
 	trap.h types.h \
 	vmparam.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpcmips/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+#include <mips/sljit_machdep.h>
--- a/sys/arch/hpcmips/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2012/11/25 21:55:51 alnsn Exp $	*/
-
-#include <mips/sljitarch.h>
--- a/sys/arch/i386/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/i386/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.42 2014/02/12 23:24:09 dsl Exp $
+#	$NetBSD: Makefile,v 1.43 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/i386
 
@@ -19,7 +19,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 sljitarch.h specialreg.h spkr.h \
+	segments.h setjmp.h signal.h sljit_machdep.h specialreg.h spkr.h \
 	svr4_machdep.h sysarch.h \
 	trap.h tss.h types.h \
 	vm86.h vmparam.h \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,40 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2012-2013 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
+
+/* No call attributes. */
+#define SLJIT_CALL
+#define SLJIT_X86_32_FASTCALL 0
+
+#define SLJIT_CACHE_FLUSH(from, to)
+
+#endif
--- a/sys/arch/i386/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.3 2013/11/17 12:01:58 alnsn Exp $	*/
-
-/*-
- * Copyright (c) 2012-2013 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
-
-/* No call attributes. */
-#define SLJIT_CALL
-#define SLJIT_X86_32_FASTCALL 0
-
-#define SLJIT_CACHE_FLUSH(from, to)
-
-#endif
--- a/sys/arch/ibmnws/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/ibmnws/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 2013/11/17 14:34:11 alnsn Exp $
+#	$NetBSD: Makefile,v 1.6 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/ibmnws
 
 INCS=   disklabel.h \
 	intr.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	vmparam.h
 
 .include "../../powerpc/include/Makefile"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/ibmnws/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/ibmnws/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:11 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/iyonix/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/iyonix/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.10 2014/06/17 06:36:40 alnsn Exp $
+#	$NetBSD: Makefile,v 1.11 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR=	/usr/include/iyonix
-INCS=		sljitarch.h
+INCS=		sljit_machdep.h
 
 .include "../../arm/include/Makefile.common"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/iyonix/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+#include <arm/sljit_machdep.h>
--- a/sys/arch/iyonix/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:40 alnsn Exp $	*/
-
-#include <arm/sljitarch.h>
--- a/sys/arch/macppc/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/macppc/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2013/11/17 14:34:12 alnsn Exp $
+#	$NetBSD: Makefile,v 1.21 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/macppc
 
@@ -9,7 +9,7 @@
 	grfioctl.h \
 	intr.h \
 	keyboard.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	vmparam.h
 
 .include "../../powerpc/include/Makefile"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/macppc/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/macppc/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:12 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/mips/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/mips/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2012/11/25 21:55:51 alnsn Exp $
+#	$NetBSD: Makefile,v 1.32 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/mips
 
@@ -14,7 +14,7 @@
 	mips1_pte.h mips3_pte.h mips_opcode.h mips_param.h mutex.h \
 	pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h sysarch.h \
+	setjmp.h signal.h sljit_machdep.h sysarch.h \
 	trap.h types.h \
 	vmparam.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mips/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,52 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2012,2014 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 _MIPS_SLJITARCH_H
+#define _MIPS_SLJITARCH_H
+
+#ifdef _LP64
+#define SLJIT_CONFIG_MIPS_64 1
+#else
+#define SLJIT_CONFIG_MIPS_32 1
+#endif
+
+#include <sys/types.h>
+
+#ifdef _KERNEL
+#include <mips/cache.h>
+
+#define SLJIT_CACHE_FLUSH(from, to) mips_icache_sync_range( \
+	(vaddr_t)(from), (vsize_t)((const char *)(to) - (const char *)(from)))
+#else
+#include <mips/cachectl.h>
+
+#define SLJIT_CACHE_FLUSH(from, to) \
+	(void)_cacheflush((void*)(from), (size_t)((to) - (from)), ICACHE)
+#endif
+
+#endif
--- a/sys/arch/mips/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.4 2014/07/22 19:54:55 alnsn Exp $	*/
-
-/*-
- * Copyright (c) 2012,2014 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 _MIPS_SLJITARCH_H
-#define _MIPS_SLJITARCH_H
-
-#ifdef _LP64
-#define SLJIT_CONFIG_MIPS_64 1
-#else
-#define SLJIT_CONFIG_MIPS_32 1
-#endif
-
-#include <sys/types.h>
-
-#ifdef _KERNEL
-#include <mips/cache.h>
-
-#define SLJIT_CACHE_FLUSH(from, to) mips_icache_sync_range( \
-	(vaddr_t)(from), (vsize_t)((const char *)(to) - (const char *)(from)))
-#else
-#include <mips/cachectl.h>
-
-#define SLJIT_CACHE_FLUSH(from, to) \
-	(void)_cacheflush((void*)(from), (size_t)((to) - (from)), ICACHE)
-#endif
-
-#endif
--- a/sys/arch/mvmeppc/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/mvmeppc/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.8 2013/11/17 14:34:12 alnsn Exp $
+#	$NetBSD: Makefile,v 1.9 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/mvmeppc
 
 INCS=   bootinfo.h \
 	disklabel.h \
 	intr.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	vmparam.h
 
 .include "../../powerpc/include/Makefile"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mvmeppc/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/mvmeppc/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:12 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/newsmips/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/newsmips/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.35 2012/11/25 21:55:51 alnsn Exp $
+#	$NetBSD: Makefile,v 1.36 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/newsmips
 
@@ -16,7 +16,7 @@
 	machConst.h math.h mcontext.h mips_opcode.h mutex.h \
 	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	trap.h types.h \
 	vmparam.h \
 	wchar_limits.h wsconsio.h \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/newsmips/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+#include <mips/sljit_machdep.h>
--- a/sys/arch/newsmips/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2012/11/25 21:55:51 alnsn Exp $	*/
-
-#include <mips/sljitarch.h>
--- a/sys/arch/ofppc/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/ofppc/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.20 2013/11/17 14:34:12 alnsn Exp $
+#	$NetBSD: Makefile,v 1.21 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/ofppc
 
 INCS=	disklabel.h \
 	intr.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	vmparam.h
 
 .include "../../powerpc/include/Makefile"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/ofppc/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/ofppc/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:12 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/pmax/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/pmax/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36 2014/07/22 20:19:57 alnsn Exp $
+#	$NetBSD: Makefile,v 1.37 2014/07/23 18:19:44 alnsn Exp $
 
 INCSDIR= /usr/include/pmax
 
@@ -17,7 +17,7 @@
 	param.h pcb.h pmap.h pmc.h \
 	proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	tc_machdep.h trap.h types.h \
 	vmparam.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/pmax/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:44 alnsn Exp $	*/
+
+#include <mips/sljit_machdep.h>
--- a/sys/arch/pmax/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2014/07/22 20:19:57 alnsn Exp $	*/
-
-#include <mips/sljitarch.h>
--- a/sys/arch/powerpc/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/powerpc/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.39 2013/11/17 14:34:12 alnsn Exp $
+#	$NetBSD: Makefile,v 1.40 2014/07/23 18:19:45 alnsn Exp $
 
 .if !defined(INCSDIR)
 INCSDIR?= /usr/include/powerpc
@@ -17,7 +17,7 @@
 	math.h mcontext.h mutex.h \
 	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	trap.h types.h \
 	vmparam.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/powerpc/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,44 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2013 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 _POWERPC_SLJITARCH_H
+#define _POWERPC_SLJITARCH_H
+
+#include <sys/types.h>
+#include <machine/cpu.h>
+
+#if defined(_LP64)
+#define SLJIT_CONFIG_PPC_64 1
+#else
+#define SLJIT_CONFIG_PPC_32 1
+#endif
+
+#define SLJIT_CACHE_FLUSH(from, to) \
+	__syncicache((void *)(from), (size_t)((to) - (from)))
+
+#endif
--- a/sys/arch/powerpc/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.3 2014/07/22 20:38:55 alnsn Exp $	*/
-
-/*-
- * Copyright (c) 2013 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 _POWERPC_SLJITARCH_H
-#define _POWERPC_SLJITARCH_H
-
-#include <sys/types.h>
-#include <machine/cpu.h>
-
-#if defined(_LP64)
-#define SLJIT_CONFIG_PPC_64 1
-#else
-#define SLJIT_CONFIG_PPC_32 1
-#endif
-
-#define SLJIT_CACHE_FLUSH(from, to) \
-	__syncicache((void *)(from), (size_t)((to) - (from)))
-
-#endif
--- a/sys/arch/prep/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/prep/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2013/11/17 14:34:12 alnsn Exp $
+#	$NetBSD: Makefile,v 1.21 2014/07/23 18:19:45 alnsn Exp $
 
 INCSDIR= /usr/include/prep
 
@@ -6,7 +6,7 @@
 	disklabel.h \
 	intr.h \
 	nvram.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	spkr.h \
 	vmparam.h
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/prep/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/prep/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:12 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/rs6000/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/rs6000/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.2 2013/11/17 14:34:12 alnsn Exp $
+#	$NetBSD: Makefile,v 1.3 2014/07/23 18:19:45 alnsn Exp $
 
 INCSDIR= /usr/include/rs6000
 
 INCS=   bootinfo.h \
 	disklabel.h \
 	intr.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	vmparam.h
 
 .include "../../powerpc/include/Makefile"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/rs6000/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/rs6000/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:12 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/sandpoint/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/sandpoint/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.18 2013/11/17 14:34:12 alnsn Exp $
+#	$NetBSD: Makefile,v 1.19 2014/07/23 18:19:45 alnsn Exp $
 
 INCSDIR= /usr/include/sandpoint
 
 INCS=	bootinfo.h \
 	disklabel.h \
 	intr.h \
-	sljitarch.h \
+	sljit_machdep.h \
 	vmparam.h
 
 .include "../../powerpc/include/Makefile"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sandpoint/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+#include <powerpc/sljit_machdep.h>
--- a/sys/arch/sandpoint/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:12 alnsn Exp $	*/
-
-#include <powerpc/sljitarch.h>
--- a/sys/arch/sbmips/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/sbmips/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/11/25 21:55:51 alnsn Exp $
+# $NetBSD: Makefile,v 1.15 2014/07/23 18:19:45 alnsn Exp $
 
 INCSDIR= /usr/include/sbmips
 
@@ -18,7 +18,7 @@
 	math.h mcontext.h mips_opcode.h mutex.h \
 	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	trap.h types.h \
 	vmparam.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sbmips/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+#include <mips/sljit_machdep.h>
--- a/sys/arch/sbmips/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2012/11/25 21:55:51 alnsn Exp $	*/
-
-#include <mips/sljitarch.h>
--- a/sys/arch/sgimips/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/sgimips/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2012/11/25 21:55:51 alnsn Exp $
+#	$NetBSD: Makefile,v 1.23 2014/07/23 18:19:45 alnsn Exp $
 
 INCSDIR= /usr/include/sgimips
 
@@ -17,7 +17,7 @@
 	param.h pci_machdep.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h \
 	ptrace.h \
 	reg.h regdef.h regnum.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	trap.h types.h \
 	vmparam.h \
 	wchar_limits.h \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sgimips/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+#include <mips/sljit_machdep.h>
--- a/sys/arch/sgimips/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2012/11/25 21:55:51 alnsn Exp $	*/
-
-#include <mips/sljitarch.h>
--- a/sys/arch/sparc/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/sparc/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2012/11/05 23:08:59 alnsn Exp $
+#	$NetBSD: Makefile,v 1.33 2014/07/23 18:19:45 alnsn Exp $
 
 INCSDIR= /usr/include/sparc
 
@@ -16,7 +16,7 @@
 	oldmon.h openpromio.h \
 	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h reloc.h rwlock.h \
-	setjmp.h signal.h sljitarch.h \
+	setjmp.h signal.h sljit_machdep.h \
 	tctrl.h trap.h types.h \
 	vmparam.h vuid_event.h \
 	wchar_limits.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sparc/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,39 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2012-2013 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 _SPARC_SLJITARCH_H
+#define _SPARC_SLJITARCH_H
+
+#ifndef _LP64
+#define SLJIT_CONFIG_SPARC_32 1
+#endif
+
+#define SLJIT_CACHE_FLUSH(from, to) \
+	sparc_cache_flush((sljit_ins *)(from), (sljit_ins *)(to))
+
+#endif
--- a/sys/arch/sparc/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.3 2014/07/22 20:41:37 alnsn Exp $	*/
-
-/*-
- * Copyright (c) 2012-2013 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 _SPARC_SLJITARCH_H
-#define _SPARC_SLJITARCH_H
-
-#ifndef _LP64
-#define SLJIT_CONFIG_SPARC_32 1
-#endif
-
-#define SLJIT_CACHE_FLUSH(from, to) \
-	sparc_cache_flush((sljit_ins *)(from), (sljit_ins *)(to))
-
-#endif
--- a/sys/arch/sparc64/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/sparc64/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2014/02/01 17:01:35 nakayama Exp $
+#	$NetBSD: Makefile,v 1.30 2014/07/23 18:19:45 alnsn Exp $
 
 INCSDIR= /usr/include/sparc64
 
@@ -17,7 +17,7 @@
 	oldmon.h openpromio.h \
 	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h reloc.h remote-sl.h rwlock.h \
-	setjmp.h signal.h sljitarch.h svr4_machdep.h \
+	setjmp.h signal.h sljit_machdep.h svr4_machdep.h \
 	trap.h types.h \
 	vmparam.h vuid_event.h \
 	wchar_limits.h \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sparc64/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,6 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+/* Only 32-bit SPARCs are supported. */
+#ifndef __arch64__
+#include <sparc/sljit_machdep.h>
+#endif
--- a/sys/arch/sparc64/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2014/02/01 17:01:35 nakayama Exp $	*/
-
-/* Only 32-bit SPARCs are supported. */
-#ifndef __arch64__
-#include <sparc/sljitarch.h>
-#endif
--- a/sys/arch/zaurus/include/Makefile	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/arch/zaurus/include/Makefile	Wed Jul 23 18:19:43 2014 +0000
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.10 2014/06/17 06:36:40 alnsn Exp $
+#	$NetBSD: Makefile,v 1.11 2014/07/23 18:19:45 alnsn Exp $
 
 INCSDIR=	/usr/include/zaurus
-INCS=		sljitarch.h
+INCS=		sljit_machdep.h
 
 .include "../../arm/include/Makefile.common"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/zaurus/include/sljit_machdep.h	Wed Jul 23 18:19:43 2014 +0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:45 alnsn Exp $	*/
+
+#include <arm/sljit_machdep.h>
--- a/sys/arch/zaurus/include/sljitarch.h	Wed Jul 23 18:05:44 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*	$NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:40 alnsn Exp $	*/
-
-#include <arm/sljitarch.h>
--- a/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h	Wed Jul 23 18:05:44 2014 +0000
+++ b/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h	Wed Jul 23 18:19:43 2014 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sljitConfig.h,v 1.11 2014/07/18 19:38:02 alnsn Exp $	*/
+/*	$NetBSD: sljitConfig.h,v 1.12 2014/07/23 18:19:45 alnsn Exp $	*/
 
 /*
  *    Stack-less Just-In-Time compiler
@@ -57,7 +57,7 @@
 /* #define SLJIT_CONFIG_AUTO 1 */
 /* #define SLJIT_CONFIG_UNSUPPORTED 1 */
 
-#include <machine/sljitarch.h>
+#include <machine/sljit_machdep.h>
 
 #if defined(_KERNEL) && !defined(SLJIT_MALLOC)
 #define SLJIT_MALLOC(size) malloc((size), M_TEMP, M_WAITOK)