From e37ff43eb678d0bf1ba45e957b1f653d1daf3795 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Mon, 10 Feb 2014 01:53:26 +0100
Subject: [PATCH] acid: remove objchar, prefering foobar.$objtype.acid

acid already sets up objtype for us.
---
 sys/lib/acid/amd64   | 2 --
 sys/lib/acid/leak    | 2 +-
 sys/lib/acid/pool    | 2 +-
 sys/lib/acid/thread  | 2 +-
 sys/src/cmd/mksyslib | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/lib/acid/amd64 b/sys/lib/acid/amd64
index 3f42435a4..20ea4b441 100644
--- a/sys/lib/acid/amd64
+++ b/sys/lib/acid/amd64
@@ -192,6 +192,4 @@ Ureg(addr) {
 };
 sizeofUreg = 184;
 
-objchar = "6";
-objtype = "amd64";
 print("/sys/lib/acid/amd64");
diff --git a/sys/lib/acid/leak b/sys/lib/acid/leak
index f3bad0d6a..e03d34d01 100644
--- a/sys/lib/acid/leak
+++ b/sys/lib/acid/leak
@@ -1,7 +1,7 @@
 //
 // usage: acid -l pool -l leak
 //
-include("/sys/src/libc/port/pool." + objchar + ".acid");
+include("/sys/src/libc/port/pool." + objtype + ".acid");
 
 defn
 dumppool(p, sum)
diff --git a/sys/lib/acid/pool b/sys/lib/acid/pool
index 56e1e4bbc..6ca5ba5cd 100644
--- a/sys/lib/acid/pool
+++ b/sys/lib/acid/pool
@@ -1,4 +1,4 @@
-include("/sys/src/libc/port/pool." + objchar + ".acid");
+include("/sys/src/libc/port/pool." + objtype + ".acid");
 
 aggr Byte {
 	'b' 0 byte;
diff --git a/sys/lib/acid/thread b/sys/lib/acid/thread
index 811af4273..528f166ea 100644
--- a/sys/lib/acid/thread
+++ b/sys/lib/acid/thread
@@ -1,4 +1,4 @@
-include("/sys/src/libthread/sched." + objchar + ".acid");
+include("/sys/src/libthread/sched." + objtype + ".acid");
 
 defn labpc(l)
 {
diff --git a/sys/src/cmd/mksyslib b/sys/src/cmd/mksyslib
index fbbf0921f..9457a8417 100644
--- a/sys/src/cmd/mksyslib
+++ b/sys/src/cmd/mksyslib
@@ -37,7 +37,7 @@ nuke:V:
 	rm -f *.[$OS] [$OS].out $CLEANFILES $LIB
 
 %.acid:V:
-	$CC $CFLAGS -a `{basename $stem .$O}^.c >$target
+	$CC $CFLAGS -a `{basename $stem .$objtype}^.c >$target
 
 update:V:
 	update $UPDATEFLAGS $UPDATE