cc: dont export gethunk(), hunk, nhunk and thunk

22 files changed, 5 insertions, 30 deletions

diff --git a/sys/src/cmd/1a/lex.c b/sys/src/cmd/1a/lex.c
index 73e2783fe..099f28c0b 100644
--- a/sys/src/cmd/1a/lex.c
+++ b/sys/src/cmd/1a/lex.c
@@ -653,7 +653,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/1l/obj.c b/sys/src/cmd/1l/obj.c
index 0b555a100..15e4df615 100644
--- a/sys/src/cmd/1l/obj.c
+++ b/sys/src/cmd/1l/obj.c
@@ -250,7 +250,6 @@ 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, "%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/lex.c b/sys/src/cmd/2a/lex.c
index f060d920f..aeb6c8354 100644
--- a/sys/src/cmd/2a/lex.c
+++ b/sys/src/cmd/2a/lex.c
@@ -658,7 +658,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/2l/obj.c b/sys/src/cmd/2l/obj.c
index e6bc78ab5..441b7fa0a 100644
--- a/sys/src/cmd/2l/obj.c
+++ b/sys/src/cmd/2l/obj.c
@@ -252,7 +252,6 @@ 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, "%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 8bafbee64..5585b5f59 100644
--- a/sys/src/cmd/5a/a.h
+++ b/sys/src/cmd/5a/a.h
@@ -147,7 +147,6 @@ void	outhist(void);
 void	dodefine(char*);
 void	prfile(long);
 void	linehist(char*, int);
-void	gethunk(void);
 void	yyerror(char*, ...);
 int	yyparse(void);
 void	setinclude(char*);
diff --git a/sys/src/cmd/5a/lex.c b/sys/src/cmd/5a/lex.c
index b884b5063..1eb9fb78c 100644
--- a/sys/src/cmd/5a/lex.c
+++ b/sys/src/cmd/5a/lex.c
@@ -411,7 +411,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/5l/obj.c b/sys/src/cmd/5l/obj.c
index 4d520b7a2..dcc4ba257 100644
--- a/sys/src/cmd/5l/obj.c
+++ b/sys/src/cmd/5l/obj.c
@@ -281,7 +281,6 @@ main(int argc, char *argv[])
 out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
-		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/lex.c b/sys/src/cmd/6a/lex.c
index ac92d8cde..06b6310d5 100644
--- a/sys/src/cmd/6a/lex.c
+++ b/sys/src/cmd/6a/lex.c
@@ -992,7 +992,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/6l/obj.c b/sys/src/cmd/6l/obj.c
index ba8984773..c55120d7e 100644
--- a/sys/src/cmd/6l/obj.c
+++ b/sys/src/cmd/6l/obj.c
@@ -341,7 +341,6 @@ main(int argc, char *argv[])
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
 		Bprint(&bso, "%ld symbols\n", nsymbol);
-		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/lex.c b/sys/src/cmd/7a/lex.c
index 952adcb43..e0d71054c 100644
--- a/sys/src/cmd/7a/lex.c
+++ b/sys/src/cmd/7a/lex.c
@@ -740,7 +740,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/8a/lex.c b/sys/src/cmd/8a/lex.c
index 7504c528b..df76e47d6 100644
--- a/sys/src/cmd/8a/lex.c
+++ b/sys/src/cmd/8a/lex.c
@@ -858,7 +858,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/8l/obj.c b/sys/src/cmd/8l/obj.c
index 1450ba44d..a54ae3949 100644
--- a/sys/src/cmd/8l/obj.c
+++ b/sys/src/cmd/8l/obj.c
@@ -338,7 +338,6 @@ main(int argc, char *argv[])
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
 		Bprint(&bso, "%ld symbols\n", nsymbol);
-		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/compat b/sys/src/cmd/cc/compat
index 7a9eafa0f..58f538304 100644
--- a/sys/src/cmd/cc/compat
+++ b/sys/src/cmd/cc/compat
@@ -78,11 +78,11 @@ myfork(void)
 
 extern char end[];
 
-char*	hunk = end;
-long	nhunk;
-uintptr	thunk;
+static char*	hunk = end;
+static long	nhunk;
+static uintptr	thunk;
 
-void
+static void
 gethunk(void)
 {
 	long nh;
diff --git a/sys/src/cmd/cc/compat.h b/sys/src/cmd/cc/compat.h
index d7f3112b5..8e6019843 100644
--- a/sys/src/cmd/cc/compat.h
+++ b/sys/src/cmd/cc/compat.h
@@ -24,11 +24,5 @@ EXTERN	int	mydup(int, int);
 EXTERN	int	myfork(void);
 EXTERN	int	mypipe(int*);
 
-EXTERN	void	gethunk(void);
-
-EXTERN	char*	hunk;
-EXTERN	long	nhunk;
-EXTERN	uintptr	thunk;
-
 EXTERN	void*	alloc(long n);
 EXTERN	void*	allocn(void *p, long on, long n);
diff --git a/sys/src/cmd/cc/lex.c b/sys/src/cmd/cc/lex.c
index 7c22cb464..15da69bee 100644
--- a/sys/src/cmd/cc/lex.c
+++ b/sys/src/cmd/cc/lex.c
@@ -1228,7 +1228,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 
 	types[TXXX] = T;
 	types[TCHAR] = typ(TCHAR, T);
diff --git a/sys/src/cmd/cc/macbody b/sys/src/cmd/cc/macbody
index efe119a4a..290660c22 100644
--- a/sys/src/cmd/cc/macbody
+++ b/sys/src/cmd/cc/macbody
@@ -246,7 +246,7 @@ macdef(void)
 	if(isspace(c))
 		if(c != '\n')
 			c = getnsc();
-	base = hunk;
+	base = alloc(1);
 	len = 1;
 	ischr = 0;
 	for(;;) {
diff --git a/sys/src/cmd/ka/lex.c b/sys/src/cmd/ka/lex.c
index 66152e405..43bcdeb35 100644
--- a/sys/src/cmd/ka/lex.c
+++ b/sys/src/cmd/ka/lex.c
@@ -465,7 +465,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/kl/obj.c b/sys/src/cmd/kl/obj.c
index 39511e1d3..768a9f8d9 100644
--- a/sys/src/cmd/kl/obj.c
+++ b/sys/src/cmd/kl/obj.c
@@ -194,7 +194,6 @@ main(int argc, char *argv[])
 out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
-		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/qa/lex.c b/sys/src/cmd/qa/lex.c
index 96a4c6100..a3202bc86 100644
--- a/sys/src/cmd/qa/lex.c
+++ b/sys/src/cmd/qa/lex.c
@@ -667,7 +667,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/ql/obj.c b/sys/src/cmd/ql/obj.c
index f6108ab6e..b07f9446f 100644
--- a/sys/src/cmd/ql/obj.c
+++ b/sys/src/cmd/ql/obj.c
@@ -273,7 +273,6 @@ main(int argc, char *argv[])
 out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
-		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/va/lex.c b/sys/src/cmd/va/lex.c
index dc32a4f1d..60b7cf89b 100644
--- a/sys/src/cmd/va/lex.c
+++ b/sys/src/cmd/va/lex.c
@@ -444,7 +444,6 @@ cinit(void)
 	iostack = I;
 	iofree = I;
 	peekc = IGN;
-	nhunk = 0;
 	for(i=0; i<NHASH; i++)
 		hash[i] = S;
 	for(i=0; itab[i].name; i++) {
diff --git a/sys/src/cmd/vl/obj.c b/sys/src/cmd/vl/obj.c
index 9d3f9fc29..75d31871d 100644
--- a/sys/src/cmd/vl/obj.c
+++ b/sys/src/cmd/vl/obj.c
@@ -240,7 +240,6 @@ main(int argc, char *argv[])
 out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
-		Bprint(&bso, "%zud memory used\n", thunk);
 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
 	}