make mcs locks the default

Reference: /n/atom/patch/applied/mcslockdflt
Date: Thu Apr  3 01:47:52 CES 2014
Signed-off-by: quanstro@quanstro.net

--- /sys/src/nix/k10/termd	Thu Apr  3 01:47:52 2014
+++ /sys/src/nix/k10/termd	Thu Apr  3 01:47:52 2014
@@ -180,7 +180,8 @@
 #	syssem
 	systab
 #	taslock
-	tiklock
+#	tiklock
+	mcslock
 	tod
 	syscallfmt
 
@@ -198,3 +199,6 @@
 	libmp
 	libfis
 	libc
+
+mkargs
+	CFLAGS=-FVTw
--- /sys/src/nix/k10/term	Thu Apr  3 01:47:52 2014
+++ /sys/src/nix/k10/term	Thu Apr  3 01:47:52 2014
@@ -172,7 +172,8 @@
 #	syssem
 	systab
 #	taslock
-	tiklock
+#	tiklock
+	mcslock
 	tod
 	syscallfmt
 
@@ -190,3 +191,6 @@
 	libmp
 	libfis
 	libc
+
+mkargs
+	CFLAGS=-FVTw
--- /sys/src/nix/k10/dat.h	Thu Apr  3 01:47:52 2014
+++ /sys/src/nix/k10/dat.h	Thu Apr  3 01:47:52 2014
@@ -32,6 +32,18 @@
 /*
  *  machine dependent definitions used by ../port/portdat.h
  */
+#ifdef Taslock
+struct Lock
+{
+	u32int	key;
+	int	isilock;
+	Mpl	pl;
+	uintptr	pc;
+	Proc*	p;
+	Mach*	m;
+	uvlong	lockcycles;
+};
+#else
 #ifdef Tiklock
 enum {
 	Cachelinesz	= 64,
@@ -47,22 +59,10 @@
 	uvlong	lockcycles;
 };
 #else
-#ifdef Mcslock
 struct Lock
 {
 	LockEntry*	head;
 	LockEntry*	e;
-};
-#else
-struct Lock
-{
-	u32int	key;
-	int	isilock;
-	Mpl	pl;
-	uintptr	pc;
-	Proc*	p;
-	Mach*	m;
-	uvlong	lockcycles;
 };
 #endif
 #endif
--- /sys/src/nix/k10/cpuf	Thu Apr  3 01:47:52 2014
+++ /sys/src/nix/k10/cpuf	Thu Apr  3 01:47:52 2014
@@ -170,7 +170,8 @@
 #	syssem
 	systab
 #	taslock
-	tiklock
+#	tiklock
+	mcslock
 	tod
 	syscallfmt
 
@@ -185,3 +186,7 @@
 	libmp
 	libfis
 	libc
+
+mkargs
+	CFLAGS=-FVTw -DMcslock
+#	CFLAGS=-FVTw
--- /sys/src/nix/k10/cpud	Thu Apr  3 01:47:52 2014
+++ /sys/src/nix/k10/cpud	Thu Apr  3 01:47:52 2014
@@ -169,7 +169,8 @@
 #	syssem
 	systab
 #	taslock
-	tiklock
+#	tiklock
+	mcslock
 	tod
 	syscallfmt
 
@@ -184,3 +185,6 @@
 	libmp
 	libfis
 	libc
+
+mkargs
+	CFLAGS=-FVTw
--- /sys/src/nix/k10/cpu	Thu Apr  3 01:47:52 2014
+++ /sys/src/nix/k10/cpu	Thu Apr  3 01:47:52 2014
@@ -167,7 +167,8 @@
 #	syssem
 	systab
 #	taslock
-	tiklock
+#	tiklock
+	mcslock
 	tod
 	syscallfmt
 
@@ -182,3 +183,6 @@
 	libmp
 	libfis
 	libc
+
+mkargs
+	CFLAGS=-FVTw