Plan 9 from Bell Labs 2012-09-21

sys/include/a.out.h

@@ -25,9 +25,9 @@ struct	Exec
 #define	E_MAGIC		_MAGIC(0, 20)		/* arm */
 #define	Q_MAGIC		_MAGIC(0, 21)		/* powerpc */
 #define	N_MAGIC		_MAGIC(0, 22)		/* mips 4000 LE */
-#define	L_MAGIC		_MAGIC(0, 23)		/* dec alpha */
+#define	L_MAGIC		_MAGIC(0, 23)		/* dec alpha (retired) */
 #define	P_MAGIC		_MAGIC(0, 24)		/* mips 3000 LE */
-#define	U_MAGIC		_MAGIC(0, 25)		/* sparc64 */
+#define	U_MAGIC		_MAGIC(0, 25)		/* sparc64 (retired) */
 #define	S_MAGIC		_MAGIC(HDR_MAGIC, 26)	/* amd64 */
 #define	T_MAGIC		_MAGIC(HDR_MAGIC, 27)	/* powerpc64 */
 #define	R_MAGIC		_MAGIC(HDR_MAGIC, 28)	/* arm64 */

sys/src/cmd/ssh2/ssh.c

@@ -591,9 +591,9 @@ doauth(int cfd1, char *whichkey)
 
  	if (!nopka) {
 		if (whichkey)
-			n = fprint(cfd1, "ssh-userauth K %s %s", user, whichkey);
+			n = fprint(cfd1, "ssh-userauth K %q %q", user, whichkey);
 		else
-			n = fprint(cfd1, "ssh-userauth K %s", user);
+			n = fprint(cfd1, "ssh-userauth K %q", user);
 		if (n >= 0)
 			return 0;
 	}
@@ -605,13 +605,13 @@ doauth(int cfd1, char *whichkey)
 		fprint(2, "%s: didn't get password: %r\n", argv0);
 		return -1;
 	}
-	n = fprint(cfd1, "ssh-userauth k %s %s", user, up->passwd);
+	n = fprint(cfd1, "ssh-userauth k %q %q", user, up->passwd);
 	if (n >= 0)
 		return 0;
 
 	path[0] = '\0';
 	fd2path(cfd1, path, sizeof path);
-	fprint(2, "%s: auth ctl msg `ssh-userauth k %s <password>' for %s: %r\n",
+	fprint(2, "%s: auth ctl msg `ssh-userauth k %q <password>' for %q: %r\n",
 		argv0, user, path);
 	return -1;
 }

sys/src/libmach/executable.c

@@ -68,7 +68,6 @@ extern	Mach	mamd64;
 extern	Mach	marm;
 extern	Mach	mpower;
 extern	Mach	mpower64;
-extern	Mach	malpha;
 
 ExecTable exectab[] =
 {
@@ -234,24 +233,6 @@ ExecTable exectab[] =
 		sizeof(Exec),
 		leswal,
 		armdotout },
-	{ L_MAGIC,			/* alpha 7.out */
-		"alpha plan 9 executable",
-		"alpha plan 9 dlm",
-		FALPHA,
-		1,
-		&malpha,
-		sizeof(Exec),
-		beswal,
-		common },
-	{ 0x0700e0c3,			/* alpha boot image */
-		"alpha plan 9 boot image",
-		nil,
-		FALPHA,
-		0,
-		&malpha,
-		sizeof(Exec),
-		beswal,
-		common },
 	{ 0 },
 };
 
@@ -394,12 +375,6 @@ commonboot(Fhdr *fp)
 		fp->name = "ARM plan 9 boot image";
 		fp->dataddr = _round(fp->txtaddr+fp->txtsz, mach->pgsize);
 		return;
-	case FALPHA:
-		fp->type = FALPHAB;
-		fp->txtaddr = (u32int)fp->entry;
-		fp->name = "alpha plan 9 boot image";
-		fp->dataddr = fp->txtaddr+fp->txtsz;
-		break;
 	case FPOWER:
 		fp->type = FPOWERB;
 		fp->txtaddr = (u32int)fp->entry;

sys/src/libmach/obj.c

@@ -56,7 +56,6 @@ static Obj	obj[] =
 	[Obj68020]	"68020 .2",	_is2, _read2,
 	[ObjAmd64]	"amd64 .6",	_is6, _read6,
 	[ObjArm]	"arm .5",	_is5, _read5,
-	[ObjAlpha]	"alpha .7",	_is7, _read7,
 	[Obj386]	"386 .8",	_is8, _read8,
 	[ObjSparc]	"sparc .k",	_isk, _readk,
 	[ObjPower]	"power .q",	_isq, _readq,

sys/src/libmach/setmach.c

@@ -17,9 +17,9 @@ struct machtab
 };
 
 extern	Mach		mmips, msparc, m68020, mi386, mamd64,
-			marm, mmips2be, mmips2le, mpower, mpower64, malpha, msparc64;
+			marm, mmips2be, mmips2le, mpower, mpower64, msparc64;
 extern	Machdata	mipsmach, mipsmachle, sparcmach, m68020mach, i386mach,
-			armmach, mipsmach2le, powermach, alphamach, sparc64mach;
+			armmach, mipsmach2le, powermach, sparc64mach;
 
 /*
  *	machine selection table.  machines with native disassemblers should
@@ -118,12 +118,6 @@ Machtab	machines[] =
 		APOWER64,
 		&mpower64,
 		&powermach,	},
-	{	"alpha",			/*Alpha*/
-		FALPHA,
-		FALPHAB,
-		AALPHA,
-		&malpha,
-		&alphamach,	},
 	{	"sparc64",			/*plan 9 sparc64 */
 		FSPARC64,
 		FSPARCB,			/* XXX? */

sys/src/mkfile.proto

@@ -2,8 +2,8 @@
 # common mkfile parameters shared by all architectures
 #
 
-OS=578qv
-CPUS=arm alpha 386 power mips
+OS=58qv
+CPUS=arm 386 power mips
 CFLAGS=-FTVw
 LEX=lex
 YACC=yacc