lib --> lib.bin for programs

diff --git a/lib/6800/descr b/lib/6800/descr
index 753c4b6..616e30a 100644 (file)
--- a/lib/6800/descr
+++ b/lib/6800/descr
@@ -10,24 +10,34 @@ var M=6800
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include/_tail_mon
+var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
+var OLD_C_LIB={C_LIB}
 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}*
        args (.e:{HEAD}={EM}/{RT}em) \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({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}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
-               (.e:{TAIL}={EM}/{LIB}em)
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.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/{M}/end_em)
        linker
 end

diff --git a/lib/6805/descr b/lib/6805/descr
index 0f0caba..763073e 100644 (file)
--- a/lib/6805/descr
+++ b/lib/6805/descr
@@ -10,24 +10,34 @@ var M=6805
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include/_tail_mon
+var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
+var OLD_C_LIB={C_LIB}
 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}*
        args (.e:{HEAD}={EM}/{RT}em) \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({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}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
-               (.e:{TAIL}={EM}/{LIB}em)
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.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/{M}/end_em)
        linker
 end

diff --git a/lib/6809/descr b/lib/6809/descr
index f1c9a60..deef5cf 100644 (file)
--- a/lib/6809/descr
+++ b/lib/6809/descr
@@ -7,29 +7,38 @@ var f=4
 var d=8
 var NAME=m6809
 var M=6809
+var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var CPP_F=
 var INCLUDES=-I{EM}/include/_tail_mon
-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 as
-       from .s
+       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}*
-       args -b0:0x800 (.e:{HEAD}={ALIGN} {SEPID?} {EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+       args -b0:0x800 (.e:{HEAD}={ALIGN} {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) \
+               -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.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/{M}/end_em)
        linker
 end

diff --git a/lib/s2650/descr b/lib/s2650/descr
index e30d4de..e2500bd 100644 (file)
--- a/lib/s2650/descr
+++ b/lib/s2650/descr
@@ -10,24 +10,34 @@ var M=s2650
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include/_tail_mon
+var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g
+var OLD_C_LIB={C_LIB}
 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}*
        args (.e:{HEAD}={EM}/{RT}em) \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({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}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.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/{M}/end_em)
        linker
 end