Module Name: src
Committed By: alnsn
Date: Sat Oct 13 19:38:24 UTC 2012
Modified Files:
src/sys/external/bsd/sljit/dist/sljit_src: sljitConfig.h
sljitNativeX86_common.c
Added Files:
src/sys/external/bsd/sljit/conf: files.sljit
Log Message:
Fix compilation.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/sljit/conf/files.sljit
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.3 src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.4
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.3 Mon Oct 8 22:39:15 2012
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h Sat Oct 13 19:38:24 2012
@@ -87,6 +87,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
#include <sys/malloc.h>
+#include <sys/param.h>
#endif
/* --------------------------------------------------------------------- */
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c:1.1.1.1 src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c:1.2
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c:1.1.1.1 Sat Oct 6 18:24:24 2012
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c Sat Oct 13 19:38:24 2012
@@ -24,7 +24,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-SLJIT_API_FUNC_ATTRIBUTE SLJIT_CONST char* sljit_get_platform_name()
+SLJIT_API_FUNC_ATTRIBUTE SLJIT_CONST char* sljit_get_platform_name(void)
{
return "x86" SLJIT_CPUINFO;
}
@@ -2021,7 +2021,7 @@ SLJIT_API_FUNC_ATTRIBUTE int sljit_emit_
static sljit_i sse2_data[3 + 4 + 4];
static sljit_i *sse2_buffer;
-static void init_compiler()
+static void init_compiler(void)
{
sse2_buffer = (sljit_i*)(((sljit_uw)sse2_data + 15) & ~0xf);
sse2_buffer[0] = 0;
Added files:
Index: src/sys/external/bsd/sljit/conf/files.sljit
diff -u /dev/null src/sys/external/bsd/sljit/conf/files.sljit:1.1
--- /dev/null Sat Oct 13 19:38:24 2012
+++ src/sys/external/bsd/sljit/conf/files.sljit Sat Oct 13 19:38:24 2012
@@ -0,0 +1,7 @@
+# $NetBSD: files.sljit,v 1.1 2012/10/13 19:38:24 alnsn Exp $
+
+defflag SLJIT
+
+makeoptions sljit CPPFLAGS+="-I$S/external/bsd/sljit/dist/sljit_src"
+
+file external/bsd/sljit/dist/sljit_src/sljitLir.c sljit