23 files changed, 230 insertions, 228 deletions
diff --git a/NOTICE b/NOTICE
index 562662a2..d95f5ab0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,12 +1,12 @@
 This Inferno® distribution includes software from various sources and
 different portions are therefore subject to different licence terms.
-The most stringent is the GNU Public License (version 2), which governs the collection.
+The bulk of the tree is covered by the permissive MIT licence reproduced below.
 Individual components might have their own NOTICE and licence files (LICENCE
 or COPYING) that cover their content.  All of them allow modification and redistribution.
 They are all compatible with the GPLv2.
 
 The following copyright notice covers the contents of this
-distribution unless otherwise specified by a given file, directory, or
+distribution unless otherwise specified by a given file, directory or
 directory tree:
 
 Inferno® Copyright © 1996-1999 Lucent Technologies Inc.  All rights reserved.
@@ -15,18 +15,21 @@ Inferno revisions Copyright © 2000-2015 Vita Nuova Holdings Limited.  All right
 Inferno new material Copyright © 2000-2015 Vita Nuova Holdings Limited.  All rights reserved.
 
 Inferno, Styx, Dis and Limbo are registered trademarks of Vita Nuova Holdings Limited in the USA and other countries.
-Plan 9 is a registered trademark of Lucent Technologies Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License (`GPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/appl/NOTICE b/appl/NOTICE
index 04cbab52..55e1e0b4 100644
--- a/appl/NOTICE
+++ b/appl/NOTICE
@@ -10,16 +10,20 @@ Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
 Portions Copyright © 2000-2010 Vita Nuova Holdings Limited
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/appl/lib/NOTICE b/appl/lib/NOTICE
index 6169ac2f..55e1e0b4 100644
--- a/appl/lib/NOTICE
+++ b/appl/lib/NOTICE
@@ -10,16 +10,20 @@ Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
 Portions Copyright © 2000-2010 Vita Nuova Holdings Limited
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License (`LGPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/appl/lib/newns.b b/appl/lib/newns.b
index 6a53cb75..e6864f86 100644
--- a/appl/lib/newns.b
+++ b/appl/lib/newns.b
@@ -196,11 +196,12 @@ Moptres: adt {
 	keyfile: string;
 	ignore: int;
 	use9: int;
+	doauth: int;
 };
 
 mopt(argv: list of string): (ref Moptres, string)
 {
-	r := ref Moptres(nil, 0, "none", nil, 0, 0);
+	r := ref Moptres(nil, 0, "none", nil, 0, 0, 1);
 
 	arg->init(argv);
 	while ((opt := arg->opt()) != 0) {
@@ -218,6 +219,8 @@ mopt(argv: list of string): (ref Moptres, string)
 				return (nil, "mount: missing arg to -C option");
 		'9' =>
 			r.use9 = 1;
+		'A' =>
+			r.doauth = 0;
 		 *  =>
 			return (nil, sys->sprint("mount: bad option -%c", opt));
 		}
@@ -275,6 +278,12 @@ mount(argv: list of string, facfd: ref Sys->FD): string
 	c := dial->dial(dest, nil);
 	if(c == nil)
 		return ig(r, sys->sprint("dial: %s: %r", dest));
+
+	if(r.doauth != 1){
+		if(sys->mount(c.dfd, nil, dir, r.flags, spec) < 0)
+			return ig(r, sys->sprint("mount %q %q: %r", addr, dir));
+		return nil;
+	}
 	
 	if(r.use9){
 		factotum := load Factotum Factotum->PATH;
diff --git a/appl/lib/parseman.b b/appl/lib/parseman.b
index bf420763..0f4151e9 100644
--- a/appl/lib/parseman.b
+++ b/appl/lib/parseman.b
@@ -443,11 +443,11 @@ parsetext[T](state: ref ParseState[T], t: string): list of Text
 			case t[i] {
 			'-' or '.' or '\\' =>
 				ch = t[i];
-			' '  =>
+			' ' or '0'  =>
 				ch = ' ';
 			'e' =>
 				ch = '\\';
-			'|' or '&' =>
+			'|' or '&' or '^' =>
 				continue;
 			'(' =>
 				if (width > 3)
diff --git a/dis/lib/newns.dis b/dis/lib/newns.dis
index eaed2b2e..fca50719 100644
--- a/dis/lib/newns.dis
+++ b/dis/lib/newns.dis
diff --git a/emu/port/win-x11a.c b/emu/port/win-x11a.c
index 569287b6..bbc65761 100644
--- a/emu/port/win-x11a.c
+++ b/emu/port/win-x11a.c
@@ -1613,11 +1613,11 @@ if(0) iprint("xselect target=%d requestor=%d property=%d selection=%d\n",
 			8, PropModeReplace, (uchar*)clip.buf, strlen(clip.buf));
 		qunlock(&clip.lk);
 	}else{
-		iprint("get %d\n", xe->target);
 		name = XGetAtomName(xd, xe->target);
 		if(name == nil)
-			iprint("XGetAtomName failed\n");
-		else if(strcmp(name, "TIMESTAMP") != 0)
+			name = "<XGetAtomName failed>";
+		if(strcmp(name, "TIMESTAMP") != 0
+			&& strcmp(name, "x-special/gnome-copied-files") != 0)
 			iprint("%s: cannot handle selection request for '%s' (%d)\n", argv0, name, (int)xe->target);
 		r.xselection.property = None;
 	}
diff --git a/lib9/setfcr-Linux-spim.S b/lib9/setfcr-Linux-spim.S
new file mode 100644
index 00000000..9031f628
--- /dev/null
+++ b/lib9/setfcr-Linux-spim.S
@@ -0,0 +1,27 @@
+#include <sys/regdef.h>
+#include <sys/asm.h>
+
+#define	FN(x)	.type x,%function; .global x; x
+#define	ENT
+#define	RET	jr ra
+
+	.file	"setfcr-Linux-spim.S"
+FN(setfcr):
+	ENT
+	mtc1 a0, $31
+	RET
+
+FN(getfcr):
+	ENT
+	mfc1 v0, $31
+	RET
+
+FN(getfsr):
+	ENT
+	mfc1 v0, $31
+	RET
+
+FN(setfsr):
+	ENT
+	mtc1 a0, $31
+	RET
diff --git a/libinterp/NOTICE b/libinterp/NOTICE
deleted file mode 100644
index 1986db19..00000000
--- a/libinterp/NOTICE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright © 1995-1999 Lucent Technologies Inc.
-Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2009 Vita Nuova Holdings Limited
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License (`LGPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/libkeyring/NOTICE b/libkeyring/NOTICE
index a9a7616f..72174586 100644
--- a/libkeyring/NOTICE
+++ b/libkeyring/NOTICE
@@ -10,16 +10,20 @@ Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
 Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License (`LGPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/liblogfs/NOTICE b/liblogfs/NOTICE
index a9db7f59..8e4560c7 100644
--- a/liblogfs/NOTICE
+++ b/liblogfs/NOTICE
@@ -8,16 +8,20 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 2002, 2003 Vita Nuova Holdings Limited.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/libnandfs/NOTICE b/libnandfs/NOTICE
index a9db7f59..8e4560c7 100644
--- a/libnandfs/NOTICE
+++ b/libnandfs/NOTICE
@@ -8,16 +8,20 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 2002, 2003 Vita Nuova Holdings Limited.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/libprefab/NOTICE b/libprefab/NOTICE
deleted file mode 100644
index a9a7616f..00000000
--- a/libprefab/NOTICE
+++ /dev/null
@@ -1,25 +0,0 @@
-This copyright NOTICE applies to all files in this directory and
-subdirectories, unless another copyright notice appears in a given
-file or subdirectory.  If you take substantial code from this software to use in
-other programs, you must somehow include with it an appropriate
-copyright notice that includes the copyright notice and the other
-notices below.  It is fine (and often tidier) to do that in a separate
-file such as NOTICE, LICENCE or COPYING.
-
-Copyright © 1995-1999 Lucent Technologies Inc.
-Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License (`LGPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/libtk/NOTICE b/libtk/NOTICE
index 2b1c542d..69851cb9 100644
--- a/libtk/NOTICE
+++ b/libtk/NOTICE
@@ -11,16 +11,20 @@ Portions Copyright © 1997-2000 Vita Nuova Limited
 Portions Copyright © 2000-2008 Vita Nuova Holdings Limited
 Portions Copyright © 2010 Vita Nuova Holdings Limited
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License (`LGPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/limbo/NOTICE b/limbo/NOTICE
deleted file mode 100644
index 4d026aa9..00000000
--- a/limbo/NOTICE
+++ /dev/null
@@ -1,25 +0,0 @@
-This copyright NOTICE applies to all files in this directory and
-subdirectories, unless another copyright notice appears in a given
-file or subdirectory.  If you take substantial code from this software to use in
-other programs, you must somehow include with it an appropriate
-copyright notice that includes the copyright notice and the other
-notices below.  It is fine (and often tidier) to do that in a separate
-file such as NOTICE, LICENCE or COPYING.
-
-Copyright © 1995-1999 Lucent Technologies Inc.
-Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2009 Vita Nuova Holdings Limited
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/locale/Moscow b/locale/Moscow
index 475def6c..f56a511f 100644
--- a/locale/Moscow
+++ b/locale/Moscow
@@ -1,12 +1,32 @@
 MSK 10800 MSD 14400
-638330400 657079200 670384800 688528800 701834400 719978400
-733284000 752032800 764733600 783482400 796183200 814932000
-828237600 846381600 859687200 877831200 891136800 909280800
-922586400 941335200 954036000 972784800 985485600 1004234400
-1017540000 1035684000 1048989600 1067133600 1080439200 1099188000
-1111888800 1130637600 1143338400 1162087200 1174788000 1193536800
-1206842400 1224986400 1238292000 1256436000 1269741600 1288490400
-1301191200 1319940000 1332640800 1351389600 1364695200 1382839200
-1396144800 1414288800 1427594400 1445738400 1459044000 1477792800
-1490493600 1509242400 1521943200 1540692000 1553997600 1572141600
-1585447200 1603591200 1616896800 1635645600 1648346400 
+354931200 370738800
+386467200 402274800
+418003200 433810800
+449625600 465357600
+481082400 496807200
+512532000 528256800
+543981600 559706400
+575431200 591156000
+606880800 622605600
+638330400 654660000
+670384800 686109600
+701834400 717559200
+733284000 749008800
+764733600 780458400
+796183200 811908000
+828237600 846381600
+859687200 877831200
+891136800 909280800
+922586400 941335200
+954036000 972784800
+985485600 1004234400
+1017540000 1035684000
+1048989600 1067133600
+1080439200 1099188000
+1111888800 1130637600
+1143338400 1162087200
+1174788000 1193536800
+1206842400 1224986400
+1238292000 1256436000
+1269741600 1288490400
+1301191200 1414285200
diff --git a/makemk.sh b/makemk.sh
index 1e18782a..e20886d3 100755
--- a/makemk.sh
+++ b/makemk.sh
@@ -19,8 +19,8 @@ grep -s 'SYSTARG=Plan9' mkconfig || . ./mkconfig
 PLAT=$ROOT/$SYSTARG/$OBJTYPE
 
 # you might need to adjust the CC, LD, AR, and RANLIB definitions after this point
-CC="p gcc -m32 -c -I$PLAT/include -I$ROOT/include -I$ROOT/utils/include"
-LD="p gcc -m32"
+CC="p gcc -c -I$PLAT/include -I$ROOT/include -I$ROOT/utils/include"
+LD="p gcc"
 AR="p ar crvs"
 RANLIB=":"	# some systems still require `ranlib'
 
diff --git a/man/6/namespace b/man/6/namespace
index 8eee9376..09c12a25 100644
--- a/man/6/namespace
+++ b/man/6/namespace
@@ -65,7 +65,7 @@ This is equivalent to passing a value of
 to
 .IR sys-pctl (2).
 .TP
-.B "mount [-abc9i] [-k \f2keyfile\fP] [-C \f2alg\fP] [\f2net\fP!]\f2machine\fP[!\f2svc\fP] \f2dir\fP [\f2spec\fP]"
+.B "mount [-abc9iA] [-k \f2keyfile\fP] [-C \f2alg\fP] [\f2net\fP!]\f2machine\fP[!\f2svc\fP] \f2dir\fP [\f2spec\fP]"
 Mount the file tree of
 .I machine
 upon directory
@@ -79,7 +79,10 @@ Options
 and
 . B i
 are the same as for
-.BR bind .
+.BR bind,
+option
+.BR A
+is the same for mount.
 The tokens
 .I dir
 and
diff --git a/mkfiles/mkfile-Linux-spim b/mkfiles/mkfile-Linux-spim
index c68c798b..9fa842cd 100644
--- a/mkfiles/mkfile-Linux-spim
+++ b/mkfiles/mkfile-Linux-spim
@@ -5,23 +5,22 @@ CPUS=		spim
 O=		o
 OS=		o
 
-AR=		mipsel-linux-uclibc-ar
+AR=		mipsel-linux-gnu-ar
 ARFLAGS=	crvs
 
-AS=		mipsel-linux-uclibc-gcc -c -mips32
+AS=		mipsel-linux-gnu-gcc -c -mips32
 ASFLAGS=
 
-CC=		mipsel-linux-uclibc-gcc -c -mips32
+CC=		mipsel-linux-gnu-gcc -c -mips32
 CFLAGS=		-g\
 		-Os\
 		-I$ROOT/Linux/spim/include\
 		-I$ROOT/include\
- 		-I/usr/X11R6/include
+ 		-I/usr/include/X11
 
 ANSICPP=
-LD=		mipsel-linux-uclibc-gcc
-LDFLAGS=	-L/usr/openwin/lib\
-		-L/usr/X11R6/lib\
+LD=		mipsel-linux-gnu-gcc
+LDFLAGS=	-L/usr/lib/X11
 
 SYSLIBS=
 
diff --git a/module/NOTICE b/module/NOTICE
deleted file mode 100644
index 6169ac2f..00000000
--- a/module/NOTICE
+++ /dev/null
@@ -1,25 +0,0 @@
-This copyright NOTICE applies to all files in this directory and
-subdirectories, unless another copyright notice appears in a given
-file or subdirectory.  If you take substantial code from this software to use in
-other programs, you must somehow include with it an appropriate
-copyright notice that includes the copyright notice and the other
-notices below.  It is fine (and often tidier) to do that in a separate
-file such as NOTICE, LICENCE or COPYING.
-
-Copyright © 1995-1999 Lucent Technologies Inc.
-Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2010 Vita Nuova Holdings Limited
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License (`LGPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/tools/NOTICE b/tools/NOTICE
index 089b8163..b5c3a295 100644
--- a/tools/NOTICE
+++ b/tools/NOTICE
@@ -8,16 +8,20 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 2000-2007 Vita Nuova Holdings Limited
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License (`LGPL') as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/utils/5l/asm.c b/utils/5l/asm.c
index 53d51c45..d693eea6 100644
--- a/utils/5l/asm.c
+++ b/utils/5l/asm.c
@@ -902,13 +902,15 @@ PP = p;
 			r = o->param;
 		o1 = olr(instoffset, r, p->to.reg, p->scond);
 
-		o2 = oprrr(ASLL, p->scond);
-		o3 = oprrr(ASRA, p->scond);
 		r = p->to.reg;
 		if(p->as == AMOVB) {
+			o2 = oprrr(ASLL, p->scond & ~C_PBIT);
+			o3 = oprrr(ASRA, p->scond & ~C_PBIT);
 			o2 |= (24<<7)|(r)|(r<<12);
 			o3 |= (24<<7)|(r)|(r<<12);
 		} else {
+			o2 = oprrr(ASLL, p->scond);
+			o3 = oprrr(ASRA, p->scond);
 			o2 |= (16<<7)|(r)|(r<<12);
 			if(p->as == AMOVHU)
 				o3 = oprrr(ASRL, p->scond);
@@ -1195,15 +1197,18 @@ PP = p;
 			o1 |= 1<<22;
 		break;
 
-	case 60:	/* movb R(R),R -> ldrsb indexed */
+	case 60:	/* movb R(R),R -> ldrb indexed */
 		if(p->from.reg == NREG) {
 			diag("byte MOV from shifter operand");
 			goto mov;
 		}
 		if(p->from.offset&(~0xf))
-			diag("bad shift in LDRSB");
-		o1 = olhrr(p->from.offset, p->from.reg, p->to.reg, p->scond);
-		o1 ^= (1<<5)|(1<<6);
+			diag("bad shift in LDRB");
+		o1 = olr(p->from.offset, p->from.reg, p->to.reg, p->scond);
+		if(p->as == AMOVB) {
+			o1 |= 1<<22; /* B */
+			o1 ^= 1<<25; /* instruction with Rm */
+                }
 		break;
 
 	case 61:	/* movw/b/bu R,R<<[IR](R) -> str indexed */
diff --git a/utils/libmach/executable.c b/utils/libmach/executable.c
index 2734cf44..ce12ca83 100644
--- a/utils/libmach/executable.c
+++ b/utils/libmach/executable.c
@@ -17,7 +17,7 @@ typedef struct {
 			uvlong hdr[1];
 		} exechdr64;
 		Ehdr elfhdr32;			/* elf.h */
-		struct mipsexec mips;	/* bootexec.h */
+		struct mipsexec mips32;	/* bootexec.h */
 		struct mips4kexec mips4k;	/* bootexec.h */
 		struct sparcexec sparc;	/* bootexec.h */
 		struct nextexec next;	/* bootexec.h */
@@ -451,22 +451,22 @@ mipsboot(int fd, Fhdr *fp, ExecHdr *hp)
 {
 	USED(fd);
 	fp->type = FMIPSB;
-	switch(hp->e.mips.amagic) {
+	switch(hp->e.mips32.amagic) {
 	default:
 	case 0407:	/* some kind of mips */
-		settext(fp, (u32int)hp->e.mips.mentry, (u32int)hp->e.mips.text_start,
-			hp->e.mips.tsize, sizeof(struct mipsexec)+4);
-		setdata(fp, (u32int)hp->e.mips.data_start, hp->e.mips.dsize,
-			fp->txtoff+hp->e.mips.tsize, hp->e.mips.bsize);
+		settext(fp, (u32int)hp->e.mips32.mentry, (u32int)hp->e.mips32.text_start,
+			hp->e.mips32.tsize, sizeof(struct mipsexec)+4);
+		setdata(fp, (u32int)hp->e.mips32.data_start, hp->e.mips32.dsize,
+			fp->txtoff+hp->e.mips32.tsize, hp->e.mips32.bsize);
 		break;
 	case 0413:	/* some kind of mips */
-		settext(fp, (u32int)hp->e.mips.mentry, (u32int)hp->e.mips.text_start,
-			hp->e.mips.tsize, 0);
-		setdata(fp, (u32int)hp->e.mips.data_start, hp->e.mips.dsize,
-			hp->e.mips.tsize, hp->e.mips.bsize);
+		settext(fp, (u32int)hp->e.mips32.mentry, (u32int)hp->e.mips32.text_start,
+			hp->e.mips32.tsize, 0);
+		setdata(fp, (u32int)hp->e.mips32.data_start, hp->e.mips32.dsize,
+			hp->e.mips32.tsize, hp->e.mips32.bsize);
 		break;
 	}
-	setsym(fp, hp->e.mips.nsyms, 0, hp->e.mips.pcsize, hp->e.mips.symptr);
+	setsym(fp, hp->e.mips32.nsyms, 0, hp->e.mips32.pcsize, hp->e.mips32.symptr);
 	fp->hdrsz = 0;			/* header stripped */
 	return 1;
 }