Plan 9 from Bell Labs 2005-04-06

dist/replica/_plan9.db

@@ -5444,7 +5444,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1112461125 52220
 sys/src/9/pc/sd53c8xx.i - 664 sys sys 1045063730 27355
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1032059019 12455
-sys/src/9/pc/sdata.c - 664 sys sys 1112382836 51083
+sys/src/9/pc/sdata.c - 664 sys sys 1112727807 51105
 sys/src/9/pc/sdmylex.c - 664 sys sys 1071245460 27812
 sys/src/9/pc/sdscsi.c - 664 sys sys 1077033661 7487
 sys/src/9/pc/trap.c - 664 sys sys 1105109602 20537
@@ -5613,7 +5613,7 @@ sys/src/ape/9src/tty.h - 664 sys sys 1014921996 2407
 sys/src/ape/cmd - 20000000775 sys sys 1014921977 0
 sys/src/ape/cmd/README - 664 sys sys 1014921974 2953
 sys/src/ape/cmd/basename.c - 664 sys sys 1014921974 729
-sys/src/ape/cmd/cc.c - 664 sys sys 1023741702 7363
+sys/src/ape/cmd/cc.c - 664 sys sys 1112707823 7362
 sys/src/ape/cmd/diff - 20000000775 sys sys 1046198752 0
 sys/src/ape/cmd/diff/COPYING - 664 sys sys 1046198741 17982
 sys/src/ape/cmd/diff/ChangeLog - 664 sys sys 1046198741 66704
@@ -6571,7 +6571,7 @@ sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1094674489 2271
 sys/src/boot/pc/sd53c8xx.c - 664 sys sys 1077033951 52135
 sys/src/boot/pc/sd53c8xx.i - 664 sys sys 1015007955 27245
-sys/src/boot/pc/sdata.c - 664 sys sys 1112382847 38084
+sys/src/boot/pc/sdata.c - 664 sys sys 1112727812 38106
 sys/src/boot/pc/sdmylex.c - 664 sys sys 1015007955 28743
 sys/src/boot/pc/sdscsi.c - 664 sys sys 1077033682 7022
 sys/src/boot/pc/trap.c - 664 sys sys 1018462833 7098
@@ -9822,7 +9822,7 @@ sys/src/cmd/paqfs/mkpaqfs.c - 664 sys sys 1072729575 8836
 sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1084470285 19571
 sys/src/cmd/paqfs/paqfs.h - 664 sys sys 1072729575 1016
 sys/src/cmd/pbd.c - 664 sys sys 944961351 247
-sys/src/cmd/pcc.c - 664 sys sys 1048644546 5994
+sys/src/cmd/pcc.c - 664 sys sys 1112744693 5937
 sys/src/cmd/pic - 20000000775 sys sys 954037275 0
 sys/src/cmd/pic/arcgen.c - 664 sys sys 944961042 5999
 sys/src/cmd/pic/blockgen.c - 664 sys sys 944961042 5209
@@ -12482,3 +12482,18 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/9load - 775 sys sys 1112757508 215872
+386/9loaddebug - 775 sys sys 1112757509 310076
+386/9loadlite - 775 sys sys 1112757508 135244
+386/9loadlitedebug - 775 sys sys 1112757509 199047
+386/9pc - 775 sys sys 1112757401 1833344
+386/9pc.gz - 664 sys sys 1112757510 643423
+386/9pccpu - 775 sys sys 1112757404 1487894
+386/9pccpu.gz - 664 sys sys 1112757511 529529
+386/9pcdisk - 775 sys sys 1112757408 2039046
+386/9pcdisk.gz - 664 sys sys 1112757513 733576
+386/9pcf - 775 sys sys 1112757412 2381878
+386/9pcf.gz - 664 sys sys 1112757515 886966
+386/9pxeload - 775 sys sys 1112757508 215872
+386/bin/pcc - 775 sys sys 1112757395 67806
+386/bin/ape/cc - 775 sys sys 1112757395 70297

dist/replica/plan9.db

@@ -1,17 +1,17 @@
 386 - 20000000775 sys sys 1010957353 0
-386/9load - 775 sys sys 1100269948 208708
-386/9loaddebug - 775 sys sys 1112501902 310058
-386/9loadlite - 775 sys sys 1100269949 132260
-386/9loadlitedebug - 775 sys sys 1112501902 199029
-386/9pc - 775 sys sys 1112501906 1833326
-386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1112501910 1487876
-386/9pccpu.gz - 664 sys sys 1077049387 519909
-386/9pcdisk - 775 sys sys 1112501914 2039028
-386/9pcdisk.gz - 664 sys sys 1040006345 703136
-386/9pcf - 775 sys sys 1112501918 2381860
-386/9pcf.gz - 664 sys sys 1077049490 872650
-386/9pxeload - 775 sys sys 1109598590 215716
+386/9load - 775 sys sys 1112757508 215872
+386/9loaddebug - 775 sys sys 1112757509 310076
+386/9loadlite - 775 sys sys 1112757508 135244
+386/9loadlitedebug - 775 sys sys 1112757509 199047
+386/9pc - 775 sys sys 1112757401 1833344
+386/9pc.gz - 664 sys sys 1112757510 643423
+386/9pccpu - 775 sys sys 1112757404 1487894
+386/9pccpu.gz - 664 sys sys 1112757511 529529
+386/9pcdisk - 775 sys sys 1112757408 2039046
+386/9pcdisk.gz - 664 sys sys 1112757513 733576
+386/9pcf - 775 sys sys 1112757412 2381878
+386/9pcf.gz - 664 sys sys 1112757515 886966
+386/9pxeload - 775 sys sys 1112757508 215872
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1108285260 115096
@@ -23,7 +23,7 @@
 386/bin/acme - 775 sys sys 1111637282 428512
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1087442501 132681
-386/bin/ape/cc - 775 sys sys 1104121958 70291
+386/bin/ape/cc - 775 sys sys 1112757395 70297
 386/bin/ape/diff - 775 sys sys 1094040080 349639
 386/bin/ape/diff3 - 775 sys sys 1094040081 188059
 386/bin/ape/dirname - 775 sys sys 1087442502 132460
@@ -350,7 +350,7 @@
 386/bin/paqfs - 775 sys sys 1108354560 107558
 386/bin/passwd - 775 sys sys 1104122044 83747
 386/bin/pbd - 775 sys sys 1085077087 4661
-386/bin/pcc - 775 sys sys 1104122044 67857
+386/bin/pcc - 775 sys sys 1112757395 67806
 386/bin/pic - 775 sys sys 1094040111 305519
 386/bin/pipefile - 775 sys sys 1104122044 39396
 386/bin/plot - 775 sys sys 1106799178 221135
@@ -5444,7 +5444,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1112461125 52220
 sys/src/9/pc/sd53c8xx.i - 664 sys sys 1045063730 27355
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1032059019 12455
-sys/src/9/pc/sdata.c - 664 sys sys 1112382836 51083
+sys/src/9/pc/sdata.c - 664 sys sys 1112727807 51105
 sys/src/9/pc/sdmylex.c - 664 sys sys 1071245460 27812
 sys/src/9/pc/sdscsi.c - 664 sys sys 1077033661 7487
 sys/src/9/pc/trap.c - 664 sys sys 1105109602 20537
@@ -5613,7 +5613,7 @@ sys/src/ape/9src/tty.h - 664 sys sys 1014921996 2407
 sys/src/ape/cmd - 20000000775 sys sys 1014921977 0
 sys/src/ape/cmd/README - 664 sys sys 1014921974 2953
 sys/src/ape/cmd/basename.c - 664 sys sys 1014921974 729
-sys/src/ape/cmd/cc.c - 664 sys sys 1023741702 7363
+sys/src/ape/cmd/cc.c - 664 sys sys 1112707823 7362
 sys/src/ape/cmd/diff - 20000000775 sys sys 1046198752 0
 sys/src/ape/cmd/diff/COPYING - 664 sys sys 1046198741 17982
 sys/src/ape/cmd/diff/ChangeLog - 664 sys sys 1046198741 66704
@@ -6571,7 +6571,7 @@ sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1094674489 2271
 sys/src/boot/pc/sd53c8xx.c - 664 sys sys 1077033951 52135
 sys/src/boot/pc/sd53c8xx.i - 664 sys sys 1015007955 27245
-sys/src/boot/pc/sdata.c - 664 sys sys 1112382847 38084
+sys/src/boot/pc/sdata.c - 664 sys sys 1112727812 38106
 sys/src/boot/pc/sdmylex.c - 664 sys sys 1015007955 28743
 sys/src/boot/pc/sdscsi.c - 664 sys sys 1077033682 7022
 sys/src/boot/pc/trap.c - 664 sys sys 1018462833 7098
@@ -9822,7 +9822,7 @@ sys/src/cmd/paqfs/mkpaqfs.c - 664 sys sys 1072729575 8836
 sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1084470285 19571
 sys/src/cmd/paqfs/paqfs.h - 664 sys sys 1072729575 1016
 sys/src/cmd/pbd.c - 664 sys sys 944961351 247
-sys/src/cmd/pcc.c - 664 sys sys 1048644546 5994
+sys/src/cmd/pcc.c - 664 sys sys 1112744693 5937
 sys/src/cmd/pic - 20000000775 sys sys 954037275 0
 sys/src/cmd/pic/arcgen.c - 664 sys sys 944961042 5999
 sys/src/cmd/pic/blockgen.c - 664 sys sys 944961042 5209

dist/replica/plan9.log

@@ -14084,3 +14084,23 @@
 1112585482 0 c 386/bin/ftpfs - 775 sys sys 1112583961 270843
 1112585482 1 c 386/bin/sam - 775 sys sys 1112583961 158368
 1112617888 0 c adm/timezone/CET - 664 adm adm 1112616249 1162
+1112704307 0 c sys/src/cmd/pcc.c - 664 sys sys 1112703290 5899
+1112707906 0 c sys/src/ape/cmd/cc.c - 664 sys sys 1112707823 7362
+1112729511 0 c sys/src/9/pc/sdata.c - 664 sys sys 1112727807 51105
+1112729511 1 c sys/src/boot/pc/sdata.c - 664 sys sys 1112727812 38106
+1112745714 0 c sys/src/cmd/pcc.c - 664 sys sys 1112744693 5937
+1112758317 0 c 386/9load - 775 sys sys 1112757508 215872
+1112758317 1 c 386/9loaddebug - 775 sys sys 1112757509 310076
+1112758317 2 c 386/9loadlite - 775 sys sys 1112757508 135244
+1112758317 3 c 386/9loadlitedebug - 775 sys sys 1112757509 199047
+1112758317 4 c 386/9pc - 775 sys sys 1112757401 1833344
+1112758317 5 c 386/9pc.gz - 664 sys sys 1112757510 643423
+1112758317 6 c 386/9pccpu - 775 sys sys 1112757404 1487894
+1112758317 7 c 386/9pccpu.gz - 664 sys sys 1112757511 529529
+1112758317 8 c 386/9pcdisk - 775 sys sys 1112757408 2039046
+1112758317 9 c 386/9pcdisk.gz - 664 sys sys 1112757513 733576
+1112758317 10 c 386/9pcf - 775 sys sys 1112757412 2381878
+1112758317 11 c 386/9pcf.gz - 664 sys sys 1112757515 886966
+1112758317 12 c 386/9pxeload - 775 sys sys 1112757508 215872
+1112758317 13 c 386/bin/pcc - 775 sys sys 1112757395 67806
+1112758317 14 c 386/bin/ape/cc - 775 sys sys 1112757395 70297

sys/src/9/pc/sdata.c

@@ -1221,7 +1221,8 @@ atapktio(Drive* drive, uchar* cmd, int clen)
 
 	qlock(ctlr);
 
-	if(ataready(cmdport, ctlport, drive->dev, Bsy|Drq, 0, 107*1000) < 0){
+	as = ataready(cmdport, ctlport, drive->dev, Bsy|Drq, 0, 107*1000);
+	if(as < 0 || (as&Chk)){
 		qunlock(ctlr);
 		return -1;
 	}

sys/src/ape/cmd/cc.c

@@ -23,14 +23,14 @@ typedef struct Objtype {
 } Objtype;
 
 Objtype objtype[] = {
-	{"386",		"8c", "8l", "8"},
 	{"68020",	"2c", "2l", "2"},
+	{"arm",		"5c", "5l", "5"},
+	{"amd64",	"6c", "6l", "6"},
 	{"alpha",	"7c", "7l", "7"},
-	{"mips",	"vc", "vl", "v"},
-	{"arm",	"5c", "5l", "5"},
-	{"mips2",	"4c", "4l", "4"},
-	{"power",	"qc", "ql", "q"},
+	{"386",		"8c", "8l", "8"},
 	{"sparc",	"kc", "kl", "k"},
+	{"power",	"qc", "ql", "q"},
+	{"mips",	"vc", "vl", "v"},
 };
 
 enum {
@@ -45,7 +45,7 @@ typedef struct List {
 
 List	srcs, objs, cpp, cc, ld, ldargs, srchlibs;
 int	cflag, vflag, Eflag, Sflag, Aflag;
-char	*allos = "2478kqv";
+char	*allos = "2678kqv";
 
 void	append(List *, char *);
 char	*changeext(char *, char *);
@@ -112,7 +112,9 @@ main(int argc, char *argv[])
 				append(&srchlibs, lib);
 			break;
 		case 'N':
-			append(&cc, "-N");
+		case 'T':
+		case 'w':
+			append(&cc, smprint("-%c", ARGC()));
 			break;
 		case 'O':
 			break;
@@ -139,9 +141,6 @@ main(int argc, char *argv[])
 			vflag = 1;
 			append(&ldargs, "-v");
 			break;
-		case 'w':
-			append(&cc, "-w");
-			break;
 		case 'A':
 			Aflag = 1;
 			break;

sys/src/boot/pc/sdata.c

@@ -874,7 +874,8 @@ atapktio(Drive* drive, uchar* cmd, int clen)
 
 	qlock(ctlr);
 
-	if(ataready(cmdport, ctlport, drive->dev, Bsy|Drq, 0, 107*1000) < 0){
+	as = ataready(cmdport, ctlport, drive->dev, Bsy|Drq, 0, 107*1000);
+	if(as < 0 || (as&Chk)){
 		qunlock(ctlr);
 		return -1;
 	}

sys/src/cmd/pcc.c

@@ -11,14 +11,13 @@ typedef struct Objtype {
 } Objtype;
 
 Objtype objtype[] = {
-	{"arm",	"5c", "5l", "5", "5.out"},
-	{"mips2",	"4c", "4l", "4", "4.out"},
-	{"mips",	"vc", "vl", "v", "v.out"},
-	{"68000",	"1c", "1l", "1", "1.out"},
 	{"68020",	"2c", "2l", "2", "2.out"},
-	{"sparc",	"kc", "kl", "k", "k.out"},
-	{"386",		"8c", "8l", "8", "8.out"},
+	{"arm",		"5c", "5l", "5", "5.out"},
+	{"amd64",	"6c", "6l", "6", "6.out"},
 	{"alpha",	"7c", "7l", "7", "7.out"},
+	{"386",		"8c", "8l", "8", "8.out"},
+	{"sparc",	"kc", "kl", "k", "k.out"},
+	{"mips",	"vc", "vl", "v", "v.out"},
 	{"power",	"qc", "ql", "q", "q.out"},
 };
 
@@ -79,8 +78,10 @@ main(int argc, char *argv[])
 			break;
 		case 'w':
 		case 'B':
+		case 'F':
 		case 'N':
 		case 'S':
+		case 'T':
 		case 'V':
 			append(&cc, smprint("-%c", ARGC()));
 			break;
@@ -116,9 +117,6 @@ main(int argc, char *argv[])
 				append(&cc, "-a");
 			cflag = 1;
 			break;
-		case 'F':
-			append(&cc, "-F");
-			break;
 		default:
 			fprint(2, "pcc: flag -%c ignored\n", ARGC());
 			break;