lib --> lib.bin for programs

diff --git a/lib/i80/descr b/lib/i80/descr
index a4efba1..c16e6b3 100644 (file)
--- a/lib/i80/descr
+++ b/lib/i80/descr
@@ -17,7 +17,7 @@ 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
@@ -25,14 +25,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 -ansi C_LIB={EM}/{LIB}ac
        args -b0:0x1000 {ALIGN} {SEPID?} (.e:{HEAD}={EM}/{RT}em) \
@@ -48,7 +48,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) \
+               (.mod.ocm.b.c.p.e:{TAIL}={EM}/{LIB}mon) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}sys {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/i86/descr b/lib/i86/descr
index 859ac7e..07c6d85 100644 (file)
--- a/lib/i86/descr
+++ b/lib/i86/descr
@@ -9,14 +9,14 @@ var NAME=i86
 var M=i86
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var CPP_F=-Dunix -D__USG
+var CPP_F=-D__unix -D__USG
 var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 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
@@ -24,14 +24,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 -fp FLOATS={EM}/{ILIB}fp
@@ -56,7 +56,7 @@ end
 name cv
        from .out
        to .cv
-       program {EM}/lib/{M}/cv
+       program {EM}/lib.bin/{M}/cv
        args < >
        outfile a.out
 end

diff --git a/lib/m68020/descr b/lib/m68020/descr
index d2266ff..93e3dec 100644 (file)
--- a/lib/m68020/descr
+++ b/lib/m68020/descr
@@ -9,7 +9,7 @@ var NAME=m68020
 var M=m68020
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var CPP_F=-Dunix -D__USG
+var CPP_F=-D__unix -D__USG -D__mc68020 -D__m68k -D__mc68000 -D__M68020
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 # 410 align is the default
@@ -17,7 +17,7 @@ var ALIGN=-a0:4 -a1:4 -a2:0x10000 -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 +25,7 @@ end
 name asopt
        from .s
        to .so
-       program {EM}/lib/{M}/top
+       program {EM}/lib.bin/{M}/top
        args
        optimizer
        stdin
@@ -34,14 +34,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 -fp LIBFP={EM}/{LIB}fp
        mapflag -ansi C_LIB={EM}/{LIB}ac
@@ -62,3 +62,10 @@ name led
                (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
        linker
 end
+name cv
+       from .out
+       to .cv
+       program {EM}/lib.bin/{M}/cv
+       args < >
+       outfile a.out
+end

diff --git a/lib/m68k2/descr b/lib/m68k2/descr
index 6a93a66..e00f4a5 100644 (file)
--- a/lib/m68k2/descr
+++ b/lib/m68k2/descr
@@ -9,7 +9,7 @@ var NAME=m68k2
 var M=m68k2
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var CPP_F=-Dunix -Dm68000
+var CPP_F=-D__unix -D__mc68000 -D__m68k
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 # 407 align is the default
@@ -17,7 +17,7 @@ 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 +25,7 @@ end
 name asopt
        from .s
        to .so
-       program {EM}/lib/{M}/top
+       program {EM}/lib.bin/{M}/top
        args
        optimizer
        stdin
@@ -34,14 +34,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 ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
        mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
@@ -68,7 +68,7 @@ end
 name cv
        from .out
        to .cv
-       program {EM}/lib/{M}/cv
+       program {EM}/lib.bin/{M}/cv
        args < >
        outfile a.out
 end

diff --git a/lib/m68k4/descr b/lib/m68k4/descr
index 2bb5208..db209bd 100644 (file)
--- a/lib/m68k4/descr
+++ b/lib/m68k4/descr
@@ -9,7 +9,7 @@ var NAME=m68k4
 var M=m68k4
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var CPP_F=-Dunix -Dm68000
+var CPP_F=-D__unix -D__mc68000 -D__m68k
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 # 407 align is the default
@@ -17,7 +17,7 @@ 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 +25,7 @@ end
 name asopt
        from .s
        to .so
-       program {EM}/lib/m68k2/top
+       program {EM}/lib.bin/m68k2/top
        args
        optimizer
        stdin
@@ -34,14 +34,14 @@ 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 -i ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
        mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
@@ -68,7 +68,7 @@ end
 name cv
        from .out
        to .cv
-       program {EM}/lib/m68k2/cv
+       program {EM}/lib.bin/m68k2/cv
        args < >
        outfile a.out
 end

diff --git a/lib/mantra/descr b/lib/mantra/descr
index 8d03b9a..14bc8af 100644 (file)
--- a/lib/mantra/descr
+++ b/lib/mantra/descr
@@ -7,11 +7,10 @@ var f=4
 var d=8
 var NAME=m68k4
 var M=m68k4
-var LIB=lib/{M}/tail_
-var RT=lib/{M}/head_
-var NLIB=lib/mantra/tail_
-var NRT=lib/mantra/head_
-var CPP_F=-Dunix -D__USG -Dmc68000
+var MLIB=lib/{M}/tail_
+var LIB=lib/mantra/tail_
+var RT=lib/mantra/head_
+var CPP_F=-D__unix -D__USG -D__mc68000 -D__m68k
 var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
 var OLD_C_LIB={C_LIB}
 # 407 align is the default
@@ -19,7 +18,7 @@ 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
@@ -27,7 +26,7 @@ end
 name asopt
        from .s
        to .so
-       program {EM}/lib/m68k2/top
+       program {EM}/lib.bin/m68k2/top
        args
        optimizer
        stdin
@@ -36,41 +35,41 @@ 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 -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 -b0:0x80000 {ALIGN} (.e:{HEAD}={EM}/{NRT}em) \
+       args -b0:0x80000 {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}/{NRT}m2) \
+               ({RTS}:.mod={EM}/{RT}m2) \
                ({RTS}:.p={EM}/{RT}pc) \
                -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.mod:{TAIL}={EM}/{NLIB}m2) \
-               (.ocm:{TAIL}={EM}/{NLIB}ocm) \
+               (.mod:{TAIL}={EM}/{LIB}m2) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
                (.ocm.b:{TAIL}={OLD_C_LIB}) \
                (.c:{TAIL}={C_LIB}) \
                {LIBFP?} \
-               (.e:{TAIL}={EM}/{LIB}em {EM}/{NLIB}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/mantra/cv
+       program {EM}/lib.bin/mantra/cv
        args < >
        outfile a.out
 end

diff --git a/lib/minix/descr b/lib/minix/descr
index afcb912..723c8b2 100644 (file)
--- a/lib/minix/descr
+++ b/lib/minix/descr
@@ -7,20 +7,19 @@ var f=4
 var d=8
 var NAME=minix
 var M=i86
-var LIB=lib/{M}/tail_
-var RT=lib/{M}/head_
-var MRT=lib/minix/head_
-var MLIB=lib/minix/tail_
-var CPP_F=-Dunix -DACK -Di8088
-var INCLUDES=-I{EM}/lib/minix/include
+var MLIB=lib/{M}/tail_
+var RT=lib/minix/head_
+var LIB=lib/minix/tail_
+var CPP_F=-D__unix -D_MINIX
+var SYSINCLUDES=-I{EM}/lib/minix/include
 var ALIGN=-a0:2 -a1:16 -a2:2 -a3:2
 var CC_ALIGN=-VS2U2
-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
@@ -28,37 +27,37 @@ 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}/{MLIB}*
+       program {EM}/lib.bin/em_led
+       mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i SEPID=-b1:0
-       mapflag -fp LIBFP={EM}/{LIB}fp
-       mapflag -ansi C_LIB={EM}/{MLIB}ac
+       mapflag -fp LIBFP={EM}/{MLIB}fp
+       mapflag -ansi C_LIB={EM}/{LIB}ac
        args {ALIGN} {SEPID?} \
-               (.e:{HEAD}={EM}/{MRT}em) \
-               ({RTS}:.ocm.b={EM}/{MRT}cc) \
-               ({RTS}{ANSI?}:.c={EM}/{MRT}cc) \
-               ({RTS}{ANSI?}:.cansi={EM}/{MRT}ac) \
-               ({RTS}:.p={EM}/{MRT}pc) -o > < \
-               (.p:{TAIL}={EM}/{MLIB}pc) \
+               (.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) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.ocm:{TAIL}={EM}/{MLIB}ocm) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
                (.ocm.b:{TAIL}={OLD_C_LIB}) \
                (.c:{TAIL}={C_LIB}) \
                {LIBFP?} \
-               (.e:{TAIL}={EM}/{MLIB}mon {EM}/lib/minix/end_em)
+               (.e:{TAIL}={EM}/{MLIB}em {EM}/{LIB}mon {EM}/lib/i86/end_em)
        linker
 end
 name cv
        from .out
        to .cv
-       program {EM}/lib/{M}/cv
+       program {EM}/lib.bin/{M}/cv
        args < >
        outfile a.out
 end