Plan 9 from Bell Labs 2013-05-25

rc/bin/fshalt

@@ -32,7 +32,8 @@ if (test -e '#v/vgactl' && test -e '#P/realmode') {
 }
 
 fn isbootable {
-	test -e $1 && ~ `{file $1} *' plan 9 boot image'
+	# on mips (for example), kernels are now a.out format
+	test -e $1 && ~ `{file $1} *' plan 9 boot image' *' plan 9 executable'*
 }
 fn usekernel {
 	kerncopy=kern
@@ -42,7 +43,7 @@ fn usekernel {
 # make a copy of the right kernel
 if (~ $reboot yes) {
 	kern=`{echo $terminal |
-		sed 's;^([^ ]+) .*/([^/]+)$;/n/boot/'$cputype'/9\2;'}
+		sed 's;^([^ ]+) .*/([^/ ]+).*$;/n/boot/'$cputype'/9\2;'}
 	if (isbootable $kern)
 		usekernel $kern
 	if not {

sys/doc/compiler.ms

@@ -22,11 +22,12 @@ is yet to be written.
 Introduction
 .LP
 There are many compilers in the series.
-Five of the compilers (Intel 386, AMD64, PowerPC, PowerPC 64-bit, ARM)
+Six of the compilers
+(Intel 386, AMD64, PowerPC, PowerPC 64-bit, ARM, MIPS R3000)
 are considered active and are used to compile
 current versions of Plan 9.
-Two of the compilers (MIPS 3000, SPARC)
-are maintained but are for older machines
+One of the compilers (SPARC)
+is maintained but is for older machines
 for which we have no current ports of Plan 9;
 we are unlikely to port to any SPARC machines.
 The DEC Alpha and Motorola 68020 compilers have been retired.
@@ -53,7 +54,7 @@ are combined by a loader
 program to produce the executable binary.
 The loader combines the roles of second half
 of the assembler, global optimizer, and loader.
-The names of the compliers, loaders, and assemblers
+The names of the compilers, loaders, and assemblers
 are as follows:
 .DS
 .ta 1.5i

sys/doc/compiler.ps

@@ -3707,109 +3707,101 @@ mark
 (Introduction) 873 2890 w
 10 /LucidaSansUnicode00 f
 (There) 720 3046 w
-(are) 1038 3046 w
-(many) 1230 3046 w
-(compilers) 1532 3046 w
-(in) 2046 3046 w
-(the) 2177 3046 w
-(series.) 2372 3046 w
-(Five) 2760 3046 w
-(of) 2991 3046 w
-(the) 3129 3046 w
-(compilers) 3324 3046 w
-(\(Intel) 3838 3046 w
-(386,) 4124 3046 w
-(AMD64,) 4385 3046 w
+(are) 1041 3046 w
+(many) 1236 3046 w
+(compilers) 1541 3046 w
+(in) 2058 3046 w
+(the) 2192 3046 w
+(series.) 2390 3046 w
+(Six) 2781 3046 w
+(of) 2968 3046 w
+(the) 3110 3046 w
+(compilers) 3309 3046 w
+(\(Intel) 3827 3046 w
+(386,) 4117 3046 w
+(AMD64,) 4382 3046 w
 (Pow\255) 4814 3046 w
 (erPC,) 720 3166 w
-(PowerPC) 1013 3166 w
-(64-bit,) 1467 3166 w
-(ARM\)) 1852 3166 w
-(are) 2143 3166 w
-(considered) 2335 3166 w
-(active) 2908 3166 w
-(and) 3228 3166 w
-(are) 3448 3166 w
-(used) 3640 3166 w
-(to) 3911 3166 w
-(compile) 4048 3166 w
-(current) 4469 3166 w
-(ver\255) 4858 3166 w
-(sions) 720 3286 w
-(of) 1019 3286 w
-(Plan) 1162 3286 w
-(9.) 1408 3286 w
-(Two) 1580 3286 w
-(of) 1826 3286 w
-(the) 1969 3286 w
-(compilers) 2169 3286 w
-(\(MIPS) 2688 3286 w
-(3000,) 2991 3286 w
-(SPARC\)) 3321 3286 w
-(are) 3710 3286 w
-(maintained) 3908 3286 w
-(but) 4495 3286 w
-(are) 4703 3286 w
-(for) 4901 3286 w
-(older) 720 3406 w
-(machines) 1009 3406 w
-(for) 1507 3406 w
-(which) 1685 3406 w
-(we) 2005 3406 w
-(have) 2177 3406 w
-(no) 2441 3406 w
-(current) 2603 3406 w
-(ports) 2991 3406 w
-(of) 3282 3406 w
-(Plan) 3418 3406 w
-(9;) 3657 3406 w
-(we) 3790 3406 w
-(are) 3961 3406 w
-(unlikely) 4151 3406 w
-(to) 4566 3406 w
-(port) 4702 3406 w
-(to) 4942 3406 w
-(any) 720 3526 w
-(SPARC) 926 3526 w
-(machines.) 1273 3526 w
-(The) 1833 3526 w
-(DEC) 2051 3526 w
-(Alpha) 2286 3526 w
-(and) 2601 3526 w
-(Motorola) 2818 3526 w
-(68020) 3286 3526 w
-(compilers) 3638 3526 w
-(have) 4149 3526 w
-(been) 4411 3526 w
-(retired.) 4685 3526 w
-(Several) 720 3646 w
-(others) 1100 3646 w
-(\(Motorola) 1445 3646 w
-(68000,) 1946 3646 w
-(Intel) 2330 3646 w
-(960,) 2580 3646 w
-(AMD) 2838 3646 w
-(29000\)) 3104 3646 w
-(have) 3488 3646 w
-(had) 3749 3646 w
-(only) 3965 3646 w
-(limited) 4205 3646 w
-(use,) 4577 3646 w
-(such) 4814 3646 w
-(as) 720 3766 w
-(to) 862 3766 w
-(program) 996 3766 w
-(peripherals) 1448 3766 w
-(or) 2031 3766 w
-(experimental) 2170 3766 w
-(devices.) 2845 3766 w
-(Any) 3304 3766 w
-(of) 3524 3766 w
-(the) 3659 3766 w
-(disused) 3851 3766 w
-(compilers) 4263 3766 w
-(could) 4774 3766 w
-(be restored if needed.) 720 3886 w
+(PowerPC) 1010 3166 w
+(64-bit,) 1461 3166 w
+(ARM,) 1843 3166 w
+(MIPS) 2130 3166 w
+(R3000\)) 2391 3166 w
+(are) 2776 3166 w
+(considered) 2965 3166 w
+(active) 3535 3166 w
+(and) 3852 3166 w
+(are) 4068 3166 w
+(used) 4256 3166 w
+(to) 4524 3166 w
+(compile) 4658 3166 w
+(current) 720 3286 w
+(versions) 1109 3286 w
+(of) 1551 3286 w
+(Plan) 1688 3286 w
+(9.) 1928 3286 w
+(One) 2094 3286 w
+(of) 2329 3286 w
+(the) 2466 3286 w
+(compilers) 2660 3286 w
+(\(SPARC\)) 3173 3286 w
+(is) 3588 3286 w
+(maintained) 3708 3286 w
+(but) 4289 3286 w
+(is) 4491 3286 w
+(for) 4611 3286 w
+(older) 4790 3286 w
+(machines) 720 3406 w
+(for) 1223 3406 w
+(which) 1406 3406 w
+(we) 1731 3406 w
+(have) 1907 3406 w
+(no) 2175 3406 w
+(current) 2341 3406 w
+(ports) 2734 3406 w
+(of) 3030 3406 w
+(Plan) 3171 3406 w
+(9;) 3415 3406 w
+(we) 3553 3406 w
+(are) 3729 3406 w
+(unlikely) 3924 3406 w
+(to) 4344 3406 w
+(port) 4485 3406 w
+(to) 4730 3406 w
+(any) 4871 3406 w
+(SPARC machines.) 720 3526 w
+(The DEC Alpha and Motorola 68020 compilers have been) 1617 3526 w
+(retired.) 4425 3526 w
+(Sev\255) 4845 3526 w
+(eral) 720 3646 w
+(others) 939 3646 w
+(\(Motorola) 1285 3646 w
+(68000,) 1787 3646 w
+(Intel) 2172 3646 w
+(960,) 2423 3646 w
+(AMD) 2682 3646 w
+(29000\)) 2950 3646 w
+(have) 3336 3646 w
+(had) 3599 3646 w
+(only) 3817 3646 w
+(limited) 4059 3646 w
+(use,) 4433 3646 w
+(such) 4671 3646 w
+(as) 4934 3646 w
+(to) 720 3766 w
+(program) 853 3766 w
+(peripherals) 1304 3766 w
+(or) 1885 3766 w
+(experimental) 2022 3766 w
+(devices.) 2696 3766 w
+(Any) 3154 3766 w
+(of) 3373 3766 w
+(the) 3507 3766 w
+(disused) 3698 3766 w
+(compilers) 4109 3766 w
+(could) 4619 3766 w
+(be) 4921 3766 w
+(restored if needed.) 720 3886 w
 10 /LucidaSans-Demi f
 (2.) 720 4126 w
 (Structure) 873 4126 w
@@ -3899,7 +3891,7 @@ mark
 (global) 4466 5038 w
 (opti\255) 4817 5038 w
 (mizer, and loader.) 720 5158 w
-(The names of the compliers, loaders, and assemblers are as follows:) 1673 5158 w
+(The names of the compilers, loaders, and assemblers are as follows:) 1673 5158 w
 (SPARC) 1080 5338 w
 10 /LucidaTypewriter f
 (kc) 2160 5338 w