From ebe88f34cb1823dd2d8f0f7428ce69c7a983397a Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sat, 8 Aug 2015 08:04:41 +0200
Subject: [PATCH] fix library mkfiles for objtype=spim

---
 .hgignore                  |  8 ++++----
 sys/src/libc/spim/mkfile   | 41 ++++++++++++++++++++++++++++++++++++++
 sys/src/libmp/spim/mkfile  | 19 ++++++++++++++++++
 sys/src/libsec/mkfile      |  2 +-
 sys/src/libsec/spim/mkfile | 18 +++++++++++++++++
 sys/src/libthread/mkfile   |  3 +++
 sys/src/mkfile.proto       |  4 ++--
 7 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 sys/src/libc/spim/mkfile
 create mode 100644 sys/src/libmp/spim/mkfile
 create mode 100644 sys/src/libsec/spim/mkfile

diff --git a/.hgignore b/.hgignore
index e4048b9cc..b7323f9db 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,11 +1,11 @@
 syntax: regexp
-^(386|68000|68020|alpha|amd64|arm|mips|power|power64|sparc|sparc64)/(bin|lib)(/|$)
-^(acme|sys/src)/(.*/)?[125678vqki]\..*$
-^(acme|sys/src)/.*\.[ao]?[125678vqki]?$
+^(386|68000|68020|alpha|amd64|arm|mips|power|power64|sparc|sparc64|spim)/(bin|lib)(/|$)
+^(acme|sys/src)/(.*/)?[0125678vqki]\..*$
+^(acme|sys/src)/.*\.[ao]?[0125678vqki]?$
 ^(dev|fd|net.*|srv|shr|env|root|proc|boot|mnt|n|bin|usr|cfg|cron|mail|tmp)(/|$)
 ^386/(9(pc|boot).*|pbs|mbr|init)
 ^amd64/(9pc64|init)
-^acme/bin/(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)(/|$)
+^acme/bin/(386|68000|68020|alpha|amd64|arm|mips|power|power64|sparc|sparc64|spim)(/|$)
 ^adm/(cache|keys|netkeys|secstore|users|whois|timezone/local)(/|$)
 ^lib/(ndb|audio|firmware)(/|$)
 ^lib/rfc/(drafts|index|rfc.*)(/|$)
diff --git a/sys/src/libc/spim/mkfile b/sys/src/libc/spim/mkfile
new file mode 100644
index 000000000..2afa2a78d
--- /dev/null
+++ b/sys/src/libc/spim/mkfile
@@ -0,0 +1,41 @@
+objtype=spim
+</$objtype/mkfile
+
+LIB=/$objtype/lib/libc.a
+SFILES=\
+	argv0.s\
+	atom.s\
+	getcallerpc.s\
+	getfcr.s\
+	main9.s\
+	main9p.s\
+	memccpy.s\
+	memchr.s\
+	memcmp.s\
+	memmove.s\
+	memset.s\
+	setjmp.s\
+	strchr.s\
+	strcmp.s\
+	strcpy.s\
+	tas.s\
+	vlop.s\
+
+CFILES=\
+	cycles.c\
+	lock.c\
+	notejmp.c\
+	sqrt.c\
+	vlrt.c\
+
+HFILES=/sys/include/libc.h
+
+OFILES=${CFILES:%.c=%.$O} ${SFILES:%.s=%.$O}
+
+%.$O:	../mips/%.c
+	$CC -I../mips $CFLAGS ../mips/$stem.c
+
+%.$O:	../mips/%.s
+	$AS -I../mips $AFLAGS ../mips/$stem.s
+
+</sys/src/cmd/mksyslib
diff --git a/sys/src/libmp/spim/mkfile b/sys/src/libmp/spim/mkfile
new file mode 100644
index 000000000..1e887ee11
--- /dev/null
+++ b/sys/src/libmp/spim/mkfile
@@ -0,0 +1,19 @@
+objtype=spim
+</mips/mkfile
+
+LIB=/$objtype/lib/libmp.a
+SFILES=\
+	mpvecadd.s\
+	mpvecsub.s\
+	mpvecdigmuladd.s\
+	mpvecdigmulsub.s\
+#	mpdigdiv.s\
+
+HFILES=/$objtype/include/u.h /sys/include/mp.h ../port/dat.h
+
+OFILES=${SFILES:%.s=%.$O}
+
+%.$O:	../mips/%.s
+	$AS -I../mips $AFLAGS ../mips/$stem.s
+
+</sys/src/cmd/mksyslib
diff --git a/sys/src/libsec/mkfile b/sys/src/libsec/mkfile
index e9d5e3353..17bdf915d 100644
--- a/sys/src/libsec/mkfile
+++ b/sys/src/libsec/mkfile
@@ -34,7 +34,7 @@ installall:V:
 
 everything:V:
 	rm -f */*.[012456789kqv]
-	for(objtype in 386)@{
+	for(objtype in $CPUS)@{
 		echo $objtype
 		mk $MKFLAGS install
 	}
diff --git a/sys/src/libsec/spim/mkfile b/sys/src/libsec/spim/mkfile
new file mode 100644
index 000000000..7a240ce66
--- /dev/null
+++ b/sys/src/libsec/spim/mkfile
@@ -0,0 +1,18 @@
+objtype=spim
+</$objtype/mkfile
+
+LIB=/$objtype/lib/libsec.a
+FILES=\
+	md5block\
+	sha1block\
+
+HFILES=/sys/include/libsec.h
+
+SFILES=${FILES:%=%.s}
+
+OFILES=${FILES:%=%.$O}
+
+%.$O:	../mips/%.s
+	$AS -I../mips $AFLAGS ../mips/$stem.s
+
+</sys/src/cmd/mksyslib
diff --git a/sys/src/libthread/mkfile b/sys/src/libthread/mkfile
index 2869eedbe..3f1dde736 100644
--- a/sys/src/libthread/mkfile
+++ b/sys/src/libthread/mkfile
@@ -72,6 +72,9 @@ UPDATE=mkfile\
 	$CFILES\
 	$SFILES\
 
+spim.$O:	mips.c
+	$CC $CFLAGS -o $target mips.c
+
 all:V:	$LIB sched.acid channel.acid
 
 </sys/src/cmd/mksyslib
diff --git a/sys/src/mkfile.proto b/sys/src/mkfile.proto
index 947e5fe3f..59b2693af 100644
--- a/sys/src/mkfile.proto
+++ b/sys/src/mkfile.proto
@@ -2,8 +2,8 @@
 # common mkfile parameters shared by all architectures
 #
 
-OS=5678qv
-CPUS=arm alpha 386 power mips
+OS=05678qv
+CPUS=spim arm amd64 alpha 386 power mips
 CFLAGS=-FTVw
 LEX=lex
 YACC=yacc