diff --git a/sys/src/cmd/1a/a.h b/sys/src/cmd/1a/a.h
index c57787b97..d9abec361 100644
--- a/sys/src/cmd/1a/a.h
+++ b/sys/src/cmd/1a/a.h
@@ -132,7 +132,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 int	assemble(char*);
diff --git a/sys/src/cmd/1l/l.h b/sys/src/cmd/1l/l.h
index 41ec65685..72cedf3bd 100644
--- a/sys/src/cmd/1l/l.h
+++ b/sys/src/cmd/1l/l.h
@@ -200,7 +200,7 @@ EXTERN	Sym*	symlist;
 EXTERN	long	symsize;
 EXTERN	Prog*	textp;
 EXTERN	long	textsize;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	int	version;
 EXTERN	Prog	zprg;
 
diff --git a/sys/src/cmd/1l/obj.c b/sys/src/cmd/1l/obj.c
index 01fc3344a..9cc82a56e 100644
--- a/sys/src/cmd/1l/obj.c
+++ b/sys/src/cmd/1l/obj.c
@@ -250,7 +250,7 @@ main(int argc, char *argv[])
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
 		Bprint(&bso, "%ld data statements\n", ndata);
 		Bprint(&bso, "%ld symbols\n", nsymbol);
-		Bprint(&bso, "%ld memory used\n", thunk);
+		Bprint(&bso, "%zud memory used\n", thunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}
diff --git a/sys/src/cmd/2a/a.h b/sys/src/cmd/2a/a.h
index 52ed2b2fa..68cd1e8dc 100644
--- a/sys/src/cmd/2a/a.h
+++ b/sys/src/cmd/2a/a.h
@@ -134,7 +134,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 void*	allocn(void*, long, long);
diff --git a/sys/src/cmd/2l/l.h b/sys/src/cmd/2l/l.h
index 19c100f56..a0899c0f5 100644
--- a/sys/src/cmd/2l/l.h
+++ b/sys/src/cmd/2l/l.h
@@ -190,7 +190,7 @@ EXTERN	Sym*	symlist;
 EXTERN	long	symsize;
 EXTERN	Prog*	textp;
 EXTERN	long	textsize;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	int	version;
 EXTERN	Prog	zprg;
 
diff --git a/sys/src/cmd/2l/obj.c b/sys/src/cmd/2l/obj.c
index 70f8f1502..411d2a5f5 100644
--- a/sys/src/cmd/2l/obj.c
+++ b/sys/src/cmd/2l/obj.c
@@ -252,7 +252,7 @@ main(int argc, char *argv[])
 		Bprint(&bso, "%ld+%ld = %ld data statements\n",
 			ndata, ncase, ndata+ncase);
 		Bprint(&bso, "%ld symbols\n", nsymbol);
-		Bprint(&bso, "%ld memory used\n", thunk);
+		Bprint(&bso, "%zud memory used\n", thunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}
diff --git a/sys/src/cmd/5a/a.h b/sys/src/cmd/5a/a.h
index eb3a70ec6..08ea625a9 100644
--- a/sys/src/cmd/5a/a.h
+++ b/sys/src/cmd/5a/a.h
@@ -115,7 +115,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 void*	alloc(long);
diff --git a/sys/src/cmd/5l/l.h b/sys/src/cmd/5l/l.h
index 24426e11b..8a45a7a7a 100644
--- a/sys/src/cmd/5l/l.h
+++ b/sys/src/cmd/5l/l.h
@@ -270,7 +270,7 @@ EXTERN	uchar	repop[ALAST];
 EXTERN	long	symsize;
 EXTERN	Prog*	textp;
 EXTERN	long	textsize;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	int	version;
 EXTERN	char	xcmp[C_GOK+1][C_GOK+1];
 EXTERN	Prog	zprg;
diff --git a/sys/src/cmd/5l/obj.c b/sys/src/cmd/5l/obj.c
index a185919b3..c10d4b8dd 100644
--- a/sys/src/cmd/5l/obj.c
+++ b/sys/src/cmd/5l/obj.c
@@ -281,7 +281,7 @@ main(int argc, char *argv[])
 out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
-		Bprint(&bso, "%ld memory used\n", thunk);
+		Bprint(&bso, "%zud memory used\n", thunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}
diff --git a/sys/src/cmd/6a/a.h b/sys/src/cmd/6a/a.h
index 84be2f007..9c9833348 100644
--- a/sys/src/cmd/6a/a.h
+++ b/sys/src/cmd/6a/a.h
@@ -128,7 +128,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 void*	allocn(void*, long, long);
diff --git a/sys/src/cmd/6l/l.h b/sys/src/cmd/6l/l.h
index 42dba0d17..6eaa603c6 100644
--- a/sys/src/cmd/6l/l.h
+++ b/sys/src/cmd/6l/l.h
@@ -303,7 +303,7 @@ EXTERN	Sym*	symlist;
 EXTERN	long	symsize;
 EXTERN	Prog*	textp;
 EXTERN	vlong	textsize;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	int	version;
 EXTERN	Prog	zprg;
 EXTERN	int	dtype;
diff --git a/sys/src/cmd/6l/obj.c b/sys/src/cmd/6l/obj.c
index 1c609b98f..5483eebae 100644
--- a/sys/src/cmd/6l/obj.c
+++ b/sys/src/cmd/6l/obj.c
@@ -341,7 +341,7 @@ main(int argc, char *argv[])
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
 		Bprint(&bso, "%ld symbols\n", nsymbol);
-		Bprint(&bso, "%ld memory used\n", thunk);
+		Bprint(&bso, "%zud memory used\n", thunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}
diff --git a/sys/src/cmd/7a/a.h b/sys/src/cmd/7a/a.h
index 5d09f6270..3ef0f1a96 100644
--- a/sys/src/cmd/7a/a.h
+++ b/sys/src/cmd/7a/a.h
@@ -120,7 +120,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 void*	alloc(long);
diff --git a/sys/src/cmd/7l/l.h b/sys/src/cmd/7l/l.h
index 73852d65e..5528cc6bd 100644
--- a/sys/src/cmd/7l/l.h
+++ b/sys/src/cmd/7l/l.h
@@ -310,7 +310,7 @@ EXTERN	uchar	repop[ALAST];
 EXTERN	long	symsize;
 EXTERN	Prog*	textp;
 EXTERN	vlong	textsize;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	int	version;
 EXTERN	char	xcmp[C_NCLASS][C_NCLASS];
 EXTERN	int	xrefresolv;
diff --git a/sys/src/cmd/8a/a.h b/sys/src/cmd/8a/a.h
index 3bac7ae05..7d4b9366b 100644
--- a/sys/src/cmd/8a/a.h
+++ b/sys/src/cmd/8a/a.h
@@ -128,7 +128,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 void*	allocn(void*, long, long);
diff --git a/sys/src/cmd/8l/l.h b/sys/src/cmd/8l/l.h
index 2ca800342..f8968d01d 100644
--- a/sys/src/cmd/8l/l.h
+++ b/sys/src/cmd/8l/l.h
@@ -276,7 +276,7 @@ EXTERN	Sym*	symlist;
 EXTERN	long	symsize;
 EXTERN	Prog*	textp;
 EXTERN	long	textsize;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	int	version;
 EXTERN	Prog	zprg;
 EXTERN	int	dtype;
diff --git a/sys/src/cmd/8l/obj.c b/sys/src/cmd/8l/obj.c
index ba4571468..efdbd4110 100644
--- a/sys/src/cmd/8l/obj.c
+++ b/sys/src/cmd/8l/obj.c
@@ -338,7 +338,7 @@ main(int argc, char *argv[])
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
 		Bprint(&bso, "%ld symbols\n", nsymbol);
-		Bprint(&bso, "%ld memory used\n", thunk);
+		Bprint(&bso, "%zud memory used\n", thunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}
diff --git a/sys/src/cmd/cc/cc.h b/sys/src/cmd/cc/cc.h
index f22cad7e3..75ac42d7f 100644
--- a/sys/src/cmd/cc/cc.h
+++ b/sys/src/cmd/cc/cc.h
@@ -471,7 +471,7 @@ EXTERN	Type*	tufield;
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
 EXTERN	Type*	thisfn;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Type*	types[NTYPE];
 EXTERN	Type*	fntypes[NTYPE];
 EXTERN	Node*	initlist;
diff --git a/sys/src/cmd/ka/a.h b/sys/src/cmd/ka/a.h
index 9ab6ec68d..9f55ab333 100644
--- a/sys/src/cmd/ka/a.h
+++ b/sys/src/cmd/ka/a.h
@@ -115,7 +115,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 void*	alloc(long);
diff --git a/sys/src/cmd/kl/l.h b/sys/src/cmd/kl/l.h
index 94fa2b40f..e296e4509 100644
--- a/sys/src/cmd/kl/l.h
+++ b/sys/src/cmd/kl/l.h
@@ -241,7 +241,7 @@ EXTERN	long	symsize;
 EXTERN	long	staticgen;
 EXTERN	Prog*	textp;
 EXTERN	long	textsize;
-EXTERN	long	tothunk;
+EXTERN	uintptr	tothunk;
 EXTERN	char	xcmp[C_NCLASS][C_NCLASS];
 EXTERN	int	version;
 EXTERN	Prog	zprg;
diff --git a/sys/src/cmd/kl/obj.c b/sys/src/cmd/kl/obj.c
index 381bcf1dc..b778cfd8d 100644
--- a/sys/src/cmd/kl/obj.c
+++ b/sys/src/cmd/kl/obj.c
@@ -194,7 +194,7 @@ main(int argc, char *argv[])
 out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
-		Bprint(&bso, "%ld memory used\n", tothunk);
+		Bprint(&bso, "%zud memory used\n", tothunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}
diff --git a/sys/src/cmd/qa/a.h b/sys/src/cmd/qa/a.h
index ab93efd07..74f386379 100644
--- a/sys/src/cmd/qa/a.h
+++ b/sys/src/cmd/qa/a.h
@@ -135,7 +135,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 void	errorexit(void);
diff --git a/sys/src/cmd/ql/l.h b/sys/src/cmd/ql/l.h
index fd56f6882..e7822d01e 100644
--- a/sys/src/cmd/ql/l.h
+++ b/sys/src/cmd/ql/l.h
@@ -234,7 +234,7 @@ EXTERN	long	symsize;
 EXTERN	long	staticgen;
 EXTERN	Prog*	textp;
 EXTERN	long	textsize;
-EXTERN	long	tothunk;
+EXTERN	uintptr	tothunk;
 EXTERN	char	xcmp[C_NCLASS][C_NCLASS];
 EXTERN	int	version;
 EXTERN	Prog	zprg;
diff --git a/sys/src/cmd/ql/obj.c b/sys/src/cmd/ql/obj.c
index c6c4e26dc..dba56bd46 100644
--- a/sys/src/cmd/ql/obj.c
+++ b/sys/src/cmd/ql/obj.c
@@ -273,7 +273,7 @@ main(int argc, char *argv[])
 out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
-		Bprint(&bso, "%ld memory used\n", tothunk);
+		Bprint(&bso, "%zud memory used\n", tothunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}
diff --git a/sys/src/cmd/va/a.h b/sys/src/cmd/va/a.h
index 9b1f4da38..7438512f1 100644
--- a/sys/src/cmd/va/a.h
+++ b/sys/src/cmd/va/a.h
@@ -114,7 +114,7 @@ EXTERN	int	sym;
 EXTERN	char	symb[NSYMB];
 EXTERN	int	thechar;
 EXTERN	char*	thestring;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	Biobuf	obuf;
 
 void*	alloc(long);
diff --git a/sys/src/cmd/vl/l.h b/sys/src/cmd/vl/l.h
index 1ea12b15b..094da0a50 100644
--- a/sys/src/cmd/vl/l.h
+++ b/sys/src/cmd/vl/l.h
@@ -233,7 +233,7 @@ EXTERN	uchar	repop[ALAST];
 EXTERN	long	symsize;
 EXTERN	Prog*	textp;
 EXTERN	long	textsize;
-EXTERN	long	thunk;
+EXTERN	uintptr	thunk;
 EXTERN	int	version;
 EXTERN	char	xcmp[32][32];
 EXTERN	Prog	zprg;
diff --git a/sys/src/cmd/vl/obj.c b/sys/src/cmd/vl/obj.c
index 5f6e7200c..c20e5c98b 100644
--- a/sys/src/cmd/vl/obj.c
+++ b/sys/src/cmd/vl/obj.c
@@ -240,7 +240,7 @@ main(int argc, char *argv[])
 out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
-		Bprint(&bso, "%ld memory used\n", thunk);
+		Bprint(&bso, "%zud memory used\n", thunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}