sync compilers with Plan 9

remove 1[acl] 2[acl]

5 files changed, 6 insertions, 5 deletions

diff --git a/utils/tc/gc.h b/utils/tc/gc.h
index a4135374..9564a449 100644
--- a/utils/tc/gc.h
+++ b/utils/tc/gc.h
@@ -264,7 +264,7 @@ void	gpseudo(int, Sym*, Node*);
 /*
  * swt.c
  */
-int	swcmp(const void*, const void*);
+int	swcmp(void*, void*);
 void	doswit(Node*);
 void	swit1(C1*, int, long, Node*);
 void	casf(void);
@@ -295,7 +295,7 @@ int	Rconv(Fmt*);
  * reg.c
  */
 Reg*	rega(void);
-int	rcmp(const void*, const void*);
+int	rcmp(void*, void*);
 void	regopt(Prog*);
 void	addmove(Reg*, int, int, int);
 Bits	mkvar(Adr*, int);
diff --git a/utils/tc/list.c b/utils/tc/list.c
index 1078423e..1124aaac 100644
--- a/utils/tc/list.c
+++ b/utils/tc/list.c
@@ -78,7 +78,7 @@ Aconv(Fmt *fp)
 	int a;
 
 	a = va_arg(fp->args, int);
-	s = "???";
+	s = "?";
 	if(a >= AXXX && a < ALAST)
 		s = anames[a];
 	return fmtstrcpy(fp, s);
diff --git a/utils/tc/reg.c b/utils/tc/reg.c
index 54bc76a7..42d25a20 100644
--- a/utils/tc/reg.c
+++ b/utils/tc/reg.c
@@ -18,7 +18,7 @@ rega(void)
 }
 
 int
-rcmp(const void *a1, const void *a2)
+rcmp(void *a1, void *a2)
 {
 	Rgn *p1, *p2;
 	int c1, c2;
diff --git a/utils/tc/swt.c b/utils/tc/swt.c
index 04d879c2..b69a48b6 100644
--- a/utils/tc/swt.c
+++ b/utils/tc/swt.c
@@ -1,7 +1,7 @@
 #include "gc.h"
 
 int
-swcmp(const void *a1, const void *a2)
+swcmp(void *a1, void *a2)
 {
 	C1 *p1, *p2;
 
diff --git a/utils/tc/txt.c b/utils/tc/txt.c
index 7f186bd4..85b38897 100644
--- a/utils/tc/txt.c
+++ b/utils/tc/txt.c
@@ -1036,6 +1036,7 @@ gopcode2(int o, Node *f1, Node *f2, Node *t)
 	// regfree(&nod);
 }
 
+int
 samaddr(Node *f, Node *t)
 {