lib --> lib.bin for programs

1991-09-04 17:50:11 +00:00 · 1991-09-04 17:50:11 +00:00 · 9853ac8a4b
parent dc715866bb
commit 9853ac8a4b
11 changed files with 113 additions and 111 deletions
--- a/lib/minixST/descr
+++ b/lib/minixST/descr
@ -7,19 +7,18 @@ var f=4
 var d=8
 var NAME=minixST
 var M=m68k2
-var LIB=lib/{M}/tail_
-var RT=lib/{M}/head_
-var MRT=lib/minixST/head_
-var MLIB=lib/minixST/tail_
-var CPP_F=-Dunix -DATARI_ST -DACK
-var INCLUDES=-I{EM}/lib/minixST/include
+var MLIB=lib/{M}/tail_
+var RT=lib/minixST/head_
+var LIB=lib/minixST/tail_
+var CPP_F=-D__unix -D_ATARI_ST
+var SYSINCLUDES=-I{EM}/lib/minixST/include -I{EM}/lib/minix/include
 var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4
-var C_LIB={EM}/{MLIB}cc.1s {EM}/{MLIB}cc.2g
+var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -27,21 +26,21 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 #	mapflag -i SEPID=-b1:0
-	mapflag -fp LIBFP={EM}/{LIB}fp
+	mapflag -fp LIBFP={EM}/{NLIB}fp
 	mapflag -ansi C_LIB={EM}/{LIB}ac
-	args {ALIGN} {SEPID?} -c (.e:{HEAD}={EM}/{MRT}em) \
-		({RTS}:.ocm.b={EM}/{MRT}cc) \
-		({RTS}{ANSI?}:.c={EM}/{MRT}cc) \
+	args {ALIGN} {SEPID?} -c (.e:{HEAD}={EM}/{RT}em) \
+		({RTS}:.ocm.b={EM}/{RT}cc) \
+		({RTS}{ANSI?}:.c={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \
 		({RTS}:.p={EM}/{RT}pc) \
 		({RTS}:.mod={EM}/{RT}m2) \
@ -53,13 +52,13 @@ name led
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
 		{LIBFP?} \
-		(.e:{TAIL}={EM}/{MLIB}mon {EM}/{LIB}em {EM}/lib/minixST/end_em)
+		(.e:{TAIL}={EM}/{LIB}mon {EM}/{MLIB}em {EM}/lib/minixST/end_em)
 	linker
 end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/minixST/cv
+	program {EM}/lib.bin/minixST/cv
 	args < >
 	outfile a.out
 end
--- a/lib/ns/descr
+++ b/lib/ns/descr
@ -9,14 +9,14 @@ var M=ns
 var NAME=NS
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var CPP_F=-Dunix
+var CPP_F=-D__unix
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -24,14 +24,14 @@ end
 name as
 	from .s
 	to .o
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -ansi C_LIB={EM}/{LIB}ac
 	args {ALIGN} (.e:{HEAD}={EM}/{RT}em) \
@ -47,6 +47,6 @@ name led
 		(.mod:{TAIL}={EM}/{LIB}m2) \
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
-		(.e:{TAIL}={EM}/{LIB}mon {EM}/{LIB}em {EM}/lib/{M}/end_em)
+		(.e:{TAIL}={EM}/{LIB}mon {EM}/{LIB}mon2 {EM}/{LIB}em {EM}/lib/{M}/end_em)
 	linker
 end
--- a/lib/pdp/descr
+++ b/lib/pdp/descr
@ -9,14 +9,14 @@ var M=pdp
 var NAME=pdp
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var CPP_F=-Dunix
+var CPP_F=-D__unix
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 var ALIGN=-a0:1 -a1:1 -a2:1 -a3:1
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -24,7 +24,7 @@ end
 name asopt
 	from .s
 	to .so
-	program {EM}/lib/{M}/top
+	program {EM}/lib.bin/{M}/top
 	args
 	optimizer
 	stdin
@ -33,14 +33,14 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -i SEPID=-b1:0
 	mapflag -n ALIGN=-a0:1 -a1:0x2000 -a2:1 -a3:1
@ -65,7 +65,7 @@ end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/{M}/cv
+	program {EM}/lib.bin/{M}/cv
 	args < >
 	outfile a.out
 end
--- a/lib/pmds/descr
+++ b/lib/pmds/descr
@ -7,17 +7,19 @@ var f=4
 var d=8
 var NAME=m68k2
 var M=m68k2
-var LIB=lib/m68k2/tail_
-var RT=lib/m68k2/head_
+var MLIB=lib/{M}/tail_
+var LIB=lib/pmds/tail_
+var RT=lib/pmds/head_
+
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
-var CPP_F=-Dunix -Dm68000
+var CPP_F=-D__unix -D__m68000 -D__m68k
 # 407 align is the default
 var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -25,7 +27,7 @@ end
 name asopt
 	from .s
 	to .so
-	program {EM}/lib/{M}/top
+	program {EM}/lib.bin/{M}/top
 	args
 	optimizer
 	stdin
@ -34,21 +36,21 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -i ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
 	mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
 	mapflag -nr ALIGN=-a0:4 -a1:0x8000 -a2:4 -a3:4
-	mapflag -fp LIBFP={EM}/{LIB}fp
+	mapflag -fp LIBFP={EM}/{MLIB}fp
 	mapflag -ansi C_LIB={EM}/{LIB}ac
-	args  {ALIGN} (.e:{HEAD}={EM}/lib/pmds/head_em) \
+	args  {ALIGN} (.e:{HEAD}={EM}/{RT}em) \
 		({RTS}:.ocm.b={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.c={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \
@ -62,13 +64,13 @@ name led
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
 		{LIBFP?} \
-		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds/tail_mon {EM}/lib/{M}/end_em)
+		(.e:{TAIL}={EM}/{MLIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
 	linker
 end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/pmds/cv
+	program {EM}/lib.bin/pmds/cv
 	args < >
 	outfile a.out
 end
--- a/lib/pmds4/descr
+++ b/lib/pmds4/descr
@ -7,17 +7,19 @@ var f=4
 var d=8
 var NAME=m68k4
 var M=m68k4
-var LIB=lib/{M}/tail_
-var RT=lib/{M}/head_
-var CPP_F=-Dunix -Dm68000
+var MLIB=lib/{M}/tail_
+var LIB=lib/pmds4/tail_
+var RT=lib/pmds4/head_
+
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
-# 407 align is default
+var CPP_F=-D__unix -D__m68000 -D__m68k
+# 407 align is the default
 var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -25,7 +27,7 @@ end
 name asopt
 	from .s
 	to .so
-	program {EM}/lib/m68k2/top
+	program {EM}/lib.bin/{M}/top
 	args
 	optimizer
 	stdin
@ -34,21 +36,21 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/m68k2/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -i ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
 	mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
 	mapflag -nr ALIGN=-a0:4 -a1:0x8000 -a2:4 -a3:4
-	mapflag -fp LIBFP={EM}/{LIB}fp
+	mapflag -fp LIBFP={EM}/{MLIB}fp
 	mapflag -ansi C_LIB={EM}/{LIB}ac
-	args {ALIGN} (.e:{HEAD}={EM}/lib/pmds4/head_em) \
+	args  {ALIGN} (.e:{HEAD}={EM}/{RT}em) \
 		({RTS}:.ocm.b={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.c={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \
@ -62,13 +64,13 @@ name led
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
 		{LIBFP?} \
-		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds4/tail_mon {EM}/lib/{M}/end_em)
+		(.e:{TAIL}={EM}/{MLIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
 	linker
 end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/pmds/cv
+	program {EM}/lib.bin/pmds/cv
 	args < >
 	outfile a.out
 end
--- a/lib/sun2/descr
+++ b/lib/sun2/descr
@ -11,9 +11,8 @@ var P=sun2
 var CC_ALIGN=-Vw{w}.1
 var LIB=lib/{P}/tail_
 var RT=lib/{P}/head_
-var PLIB=lib/{M}/tail_
-var PRT=lib/{M}/head_
-var CPP_F=-Dunix -Dm68k -DM68010 -Dmc68010 -D__BSD4_2
+var MLIB=lib/{M}/tail_
+var CPP_F=-D__unix -D__m68k -D__M68010 -D__mc68010 -D__BSD4_2
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 # 413 align is the default, rom in text
@ -21,7 +20,7 @@ var ALIGN=-a0:4 -a1:4 -a2:0x20000 -a3:4 -b0:0x2020
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -29,7 +28,7 @@ end
 name asopt
 	from .s
 	to .so
-	program {EM}/lib/m68k2/top
+	program {EM}/lib.bin/m68k2/top
 	args
 	optimizer
 	stdin
@ -38,42 +37,42 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/m68k2/as
+	program {EM}/lib.bin/m68k2/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x20000 -a3:4 -b0:0x2000
 	mapflag -nr ALIGN=-a0:4 -a1:0x20000 -a2:4 -a3:4 -b0:0x2000
 	mapflag -N ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 -b0:0x2000
 	mapflag -r ALIGN=-a0:4 -a1:0x20000 -a2:4 -a3:4 -b0:0x2020
-	mapflag -fp LIBFP={EM}/{PLIB}fp
+	mapflag -fp LIBFP={EM}/{MLIB}fp
 	mapflag -ansi C_LIB={EM}/{LIB}ac
 	args  {ALIGN} (.e:{HEAD}={EM}/{RT}em) \
 		({RTS}:.ocm.b={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.c={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \
-		({RTS}:.p={EM}/{PRT}pc) \
-		({RTS}:.mod={EM}/{PRT}m2) \
+		({RTS}:.p={EM}/{RT}pc) \
+		({RTS}:.mod={EM}/{RT}m2) \
 		-o > < \
-		(.p:{TAIL}={EM}/{PLIB}pc) \
-		(.b:{TAIL}={EM}/{PLIB}bc) \
+		(.p:{TAIL}={EM}/{LIB}pc) \
+		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.ocm:{TAIL}={EM}/{LIB}ocm) \
 		(.mod:{TAIL}={EM}/{LIB}m2) \
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
 		{LIBFP?} \
-		(.e:{TAIL}={EM}/{PLIB}em {EM}/{LIB}mon {EM}/{PLIB}em {EM}/lib/{M}/end_em)
+		(.e:{TAIL}={EM}/{PLIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
 	linker
 end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/{P}/cv
+	program {EM}/lib.bin/{P}/cv
 	args < >
 	outfile a.out
 end
--- a/lib/sun3/descr
+++ b/lib/sun3/descr
@ -10,10 +10,9 @@ var M=m68020
 var P=sun3
 var LIB=lib/{P}/tail_
 var RT=lib/{P}/head_
-var PLIB=lib/{M}/tail_
-var PRT=lib/{M}/head_
-var CPP_F=-Dunix -Dm68k -Dmc68000 -DM68020 -Dmc68020 -D__BSD4_2
-var CC_ALIGN=-Vw4.1
+var MLIB=lib/{M}/tail_
+var CPP_F=-D__unix -D__m68k -D__mc68000 -D__M68020 -D__mc68020 -D__BSD4_2
+var CC_ALIGN=-Vw4.1 -S9
 # 413 align is the default, rom in text
 var ALIGN=-a0:4 -a1:4 -a2:0x20000 -a3:4 -b0:0x2020
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
@ -21,7 +20,7 @@ var OLD_C_LIB={C_LIB}
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -29,7 +28,7 @@ end
 name asopt
 	from .s
 	to .so
-	program {EM}/lib/{M}/top
+	program {EM}/lib.bin/{M}/top
 	args
 	optimizer
 	stdin
@ -38,43 +37,45 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x20000 -a3:4 -b0:0x2000
 	mapflag -nr ALIGN=-a0:4 -a1:0x20000 -a2:4 -a3:4 -b0:0x2000
 	mapflag -N ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 -b0:0x2000
 	mapflag -r ALIGN=-a0:4 -a1:0x20000 -a2:4 -a3:4 -b0:0x2020
-	mapflag -fp LIBFP={EM}/{PLIB}fp
+	mapflag -fp LIBFP={EM}/{MLIB}fp
+	mapflag -g LIBDB={EM}/{LIB}db
 	mapflag -ansi C_LIB={EM}/{LIB}ac
 	args {ALIGN} (.e:{HEAD}= {EM}/{RT}em) \
 		({RTS}:.ocm.b={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.c={EM}/{RT}cc) \
 		({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \
 		({RTS}:.mod={EM}/{RT}m2) \
-		({RTS}:.p.8={EM}/{PRT}pc) \
+		({RTS}:.p.8={EM}/{RT}pc) \
 		-o > < \
 		(.8:{TAIL}={EM}/{LIB}a68s) \
-		(.p.8:{TAIL}={EM}/{PLIB}pc) \
-		(.b:{TAIL}={EM}/{PLIB}bc) \
+		(.p.8:{TAIL}={EM}/{LIB}pc) \
+		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.ocm:{TAIL}={EM}/{LIB}ocm) \
 		(.mod:{TAIL}={EM}/{LIB}m2) \
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
 		{LIBFP?} \
-		(.e:{TAIL}={EM}/{PLIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
+		{LIBDB?} \
+		(.e:{TAIL}={EM}/{MLIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
 	linker
 end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/{P}/cv
+	program {EM}/lib.bin/{P}/cv
 	args < >
 	outfile a.out
 end
--- a/lib/vax4/descr
+++ b/lib/vax4/descr
@ -9,7 +9,7 @@ var NAME=vax4
 var M=vax4
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var CPP_F=-Dunix -Dvax
+var CPP_F=-D__unix -D__vax
 var CC_ALIGN=-Vw4.1
 # 413 align is the default, rom in text
 var ALIGN=-a0:4 -a1:4 -a2:0x400 -a3:4
@ -18,7 +18,7 @@ var OLD_C_LIB={C_LIB}
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -26,7 +26,7 @@ end
 name asopt
 	from .s
 	to .so
-	program {EM}/lib/{M}/top
+	program {EM}/lib.bin/{M}/top
 	args
 	optimizer
 	stdin
@ -35,14 +35,14 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -N ALIGN=-a0:4 -a1:4 -a2:4 -a3:4
 	mapflag -r ALIGN=-a0:4 -a1:0x400 -a2:4 -a3:4
@ -67,7 +67,7 @@ end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/{M}/cv
+	program {EM}/lib.bin/{M}/cv
 	mapflag -n CV_ARG=-n
 	args {CV_ARG?} < >
 	outfile a.out
--- a/lib/xenix3/descr
+++ b/lib/xenix3/descr
@ -11,15 +11,14 @@ var IM=xenix3
 var LIB=lib/{IM}/tail_
 var ILIB=lib/i86/tail_
 var RT=lib/{IM}/head_
-var IRT=lib/i86/head_
-var CPP_F=-Dunix -D__USG
-var C_LIB={EM}/{ILIB}cc.1s {EM}/{ILIB}cc.2g
+var CPP_F=-D__unix -D__USG
+var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -27,29 +26,29 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
 name led
 	from .o.a
 	to .out
-	program {EM}/lib/em_led
-	mapflag -l* LNAME={EM}/{ILIB}*
+	program {EM}/lib.bin/em_led
+	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -i SEPID=-b1:0
 	mapflag -fp FLOATS={EM}/{ILIB}fp
-	mapflag -ansi C_LIB={EM}/{ILIB}ac
+	mapflag -ansi C_LIB={EM}/{LIB}ac
 	args {ALIGN} {SEPID?} (.e:{HEAD}={EM}/{RT}em) \
-		({RTS}:.ocm.b={EM}/{IRT}cc) \
-		({RTS}{ANSI?}:.c={EM}/{IRT}cc) \
-		({RTS}{ANSI?}:.cansi={EM}/{IRT}ac) \
-		({RTS}:.p={EM}/{IRT}pc) \
-		({RTS}:.mod={EM}/{IRT}m2) \
+		({RTS}:.ocm.b={EM}/{RT}cc) \
+		({RTS}{ANSI?}:.c={EM}/{RT}cc) \
+		({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \
+		({RTS}:.p={EM}/{RT}pc) \
+		({RTS}:.mod={EM}/{RT}m2) \
 		-o > < \
-		(.p:{TAIL}={EM}/{ILIB}pc) \
-		(.b:{TAIL}={EM}/{ILIB}bc) \
-		(.mod:{TAIL}={EM}/{ILIB}m2) \
-		(.ocm:{TAIL}={EM}/{ILIB}ocm) \
+		(.p:{TAIL}={EM}/{LIB}pc) \
+		(.b:{TAIL}={EM}/{LIB}bc) \
+		(.mod:{TAIL}={EM}/{LIB}m2) \
+		(.ocm:{TAIL}={EM}/{LIB}ocm) \
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
 		{FLOATS?} \
@ -59,7 +58,7 @@ end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/{IM}/cv
+	program {EM}/lib.bin/{IM}/cv
 	mapflag -F* CVFLAG=-F*
 	args {CVFLAG?} < >
 	outfile a.out
--- a/lib/z80/descr
+++ b/lib/z80/descr
@ -15,7 +15,7 @@ var OLD_C_LIB={C_LIB}
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -23,7 +23,7 @@ end
 name as
 	from .s.so
 	to .o
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	args - -o > <
 	prep cond
 end
@ -31,7 +31,7 @@ name led
 	from .o.a
 	to .out
 	outfile a.out
-	program {EM}/lib/em_led
+	program {EM}/lib.bin/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -ansi C_LIB={EM}/{LIB}ac
 	args -b0:0x1000 ( .e:{HEAD}={EM}/{RT}em) \
@ -47,7 +47,7 @@ name led
 		(.mod:{TAIL}={EM}/{LIB}m2) \
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
-		(.mod.ocm.b.c.p:{TAIL}={EM}/{LIB}mon) \
-		(.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}sys {EM}/lib/{M}/end_em)
+		(.mod.ocm.b.c.p.e:{TAIL}={EM}/{LIB}mon) \
+		(.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon2 {EM}/lib/{M}/end_em)
 	linker
 end
--- a/lib/z8000/descr
+++ b/lib/z8000/descr
@ -15,7 +15,7 @@ var OLD_C_LIB={C_LIB}
 name be
 	from .m.g
 	to .s
-	program {EM}/lib/{M}/cg
+	program {EM}/lib.bin/{M}/cg
 	args <
 	stdout
 	need .e
@ -24,7 +24,7 @@ name asld
 	from .s.a
 	to .out
 	outfile a.out
-	program {EM}/lib/{M}/as
+	program {EM}/lib.bin/{M}/as
 	mapflag -l* LNAME={EM}/{LIB}*
 	mapflag -i  IFILE={EM}/{RT}i
 	mapflag -ansi C_LIB={EM}/{LIB}ac
@ -41,7 +41,7 @@ name asld
 		(.mod:{TAIL}={EM}/{LIB}m2) \
 		(.ocm.b:{TAIL}={OLD_C_LIB}) \
 		(.c:{TAIL}={C_LIB}) \
-		(.mod.ocm.b.c.p:{TAIL}={EM}/{LIB}mon) \
-		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/z8000/end_em)
+		(.mod.ocm.b.c.p.e:{TAIL}={EM}/{LIB}mon) \
+		(.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon2 {EM}/lib/z8000/end_em)
 	linker
 end