Added Occam

diff --git a/lib/6500/descr b/lib/6500/descr
index 21efa05..5bfbc76 100644 (file)
--- a/lib/6500/descr
+++ b/lib/6500/descr
@@ -26,11 +26,12 @@ name asld
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i  IFILE={EM}/{RT}i
        args {IFILE?} (.e:{HEAD}={EM}/{RT}em) \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -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) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm.b.c.p:{TAIL}={EM}/{LIB}mon) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/em22/descr b/lib/em22/descr
index 62b677c..36e2ff6 100644 (file)
--- a/lib/em22/descr
+++ b/lib/em22/descr
@@ -22,10 +22,11 @@ name asld
        mapflag --* ASS_F={ASS_F?} --*
        mapflag -s* SIZE_FLAG=-s*
        args {SIZE_FLAG} \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -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) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm.b.c.p:{TAIL}={EM}/{LIB}mon)
        linker
 end

diff --git a/lib/em24/descr b/lib/em24/descr
index 196f91d..ab14bef 100644 (file)
--- a/lib/em24/descr
+++ b/lib/em24/descr
@@ -22,10 +22,11 @@ name asld
        mapflag --* ASS_F={ASS_F?} --*
        mapflag -s* SIZE_FLAG=-s*
        args {SIZE_FLAG} \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -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) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm.b.c.p:{TAIL}={EM}/{LIB}mon)
        linker
 end

diff --git a/lib/em44/descr b/lib/em44/descr
index b20e399..d4fe404 100644 (file)
--- a/lib/em44/descr
+++ b/lib/em44/descr
@@ -22,10 +22,11 @@ name asld
        mapflag --* ASS_F={ASS_F?} --*
        mapflag -s* SIZE_FLAG=-s*
        args {SIZE_FLAG} \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -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) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm.b.c.p:{TAIL}={EM}/{LIB}mon)
        linker
 end

diff --git a/lib/i80/descr b/lib/i80/descr
index 78c10e9..dab7e5b 100644 (file)
--- a/lib/i80/descr
+++ b/lib/i80/descr
@@ -21,7 +21,7 @@ name be
        need .e
 end
 name as
-       from .s
+       from .s.so
        to .o
        program {EM}/lib/{M}/as
        args - -o > <
@@ -33,11 +33,12 @@ name led
        program {EM}/lib/em_led
        mapflag -l* LNAME={EM}/{LIB}*
        args -b0:0x1000 (.e:{HEAD}={ALIGN} {SEPID?} {EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -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) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm.b.c.p:{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 c313e65..0d79580 100644 (file)
--- a/lib/i86/descr
+++ b/lib/i86/descr
@@ -34,10 +34,11 @@ name led
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i SEPID=-b1:0
        args (.e:{HEAD}={ALIGN} {SEPID?} {EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/m68020/descr b/lib/m68020/descr
index afe972b..1102aef 100644 (file)
--- a/lib/m68020/descr
+++ b/lib/m68020/descr
@@ -34,10 +34,11 @@ name led
        program {EM}/lib/em_led
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}= {ALIGN} {EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/m68k2/descr b/lib/m68k2/descr
index 9377b56..bda28da 100644 (file)
--- a/lib/m68k2/descr
+++ b/lib/m68k2/descr
@@ -46,10 +46,11 @@ name led
        mapflag -n ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
        mapflag -nr ALIGN=-a0:2 -a1:0x8000 -a2:2 -a3:2
        args (.e:{HEAD}=-b0:0x20000 {ALIGN} {EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/m68k4/descr b/lib/m68k4/descr
index a6def77..a53cfef 100644 (file)
--- a/lib/m68k4/descr
+++ b/lib/m68k4/descr
@@ -46,10 +46,11 @@ name led
        mapflag -n ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
        mapflag -nr ALIGN=-a0:2 -a1:0x8000 -a2:2 -a3:2
        args (.e:{HEAD}=-b0:0x20000 {ALIGN} {EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/mantra/descr b/lib/mantra/descr
index a881997..604010c 100644 (file)
--- a/lib/mantra/descr
+++ b/lib/mantra/descr
@@ -48,10 +48,11 @@ name led
        mapflag -n ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
        mapflag -nr ALIGN=-a0:2 -a1:0x8000 -a2:2 -a3:2
        args (.e:{HEAD}=-b0:0x80000 {ALIGN} {EM}/{NRT}em) \
-({RTS}:.b.c={EM}/{NRT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{NRT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{NLIB}cc.1s {EM}/{NLIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{NLIB}cc.1s {EM}/{NLIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/{NLIB}mon {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/ns/descr b/lib/ns/descr
index 42b0638..49e9c43 100644 (file)
--- a/lib/ns/descr
+++ b/lib/ns/descr
@@ -33,10 +33,11 @@ name led
        program {EM}/lib/em_led
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}={ALIGN} {EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}mon {EM}/{LIB}em {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/pdp/descr b/lib/pdp/descr
index 1940e16..bce7861 100644 (file)
--- a/lib/pdp/descr
+++ b/lib/pdp/descr
@@ -42,10 +42,11 @@ name ld
        program /bin/ld
        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.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon)
        linker
 end

diff --git a/lib/pmds/descr b/lib/pmds/descr
index 111f229..be7b0b7 100644 (file)
--- a/lib/pmds/descr
+++ b/lib/pmds/descr
@@ -46,10 +46,11 @@ name led
        mapflag -n ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
        mapflag -nr ALIGN=-a0:2 -a1:0x8000 -a2:2 -a3:2
        args (.e:{HEAD}= {ALIGN} {EM}/lib/pmds/head_em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds/tail_mon {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/pmds4/descr b/lib/pmds4/descr
index 3ee1f29..6c79110 100644 (file)
--- a/lib/pmds4/descr
+++ b/lib/pmds4/descr
@@ -46,10 +46,11 @@ name led
        mapflag -n ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
        mapflag -nr ALIGN=-a0:2 -a1:0x8000 -a2:2 -a3:2
        args (.e:{HEAD}={ALIGN} {EM}/lib/pmds4/head_em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds4/tail_mon {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/sun3/descr b/lib/sun3/descr
index a13561e..d9996fa 100644 (file)
--- a/lib/sun3/descr
+++ b/lib/sun3/descr
@@ -41,10 +41,11 @@ name led
        mapflag -N ALIGN=-a0:2 -a1:2 -a2:2 -a3:2 -b0:0x2000
        mapflag -r ALIGN=-a0:2 -a1:0x20000 -a2:2 -a3:2 -b0:0x2020
        args (.e:{HEAD}= {ALIGN} {EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{PRT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{PRT}pc) -o > < \
                (.p:{TAIL}={EM}/{PLIB}pc) \
                (.b:{TAIL}={EM}/{PLIB}bc) \
-               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm:{TAIL}={EM}/{PLIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.e:{TAIL}={EM}/{PLIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/vax4/descr.src b/lib/vax4/descr.src
index b1dc7d3..80b651b 100644 (file)
--- a/lib/vax4/descr.src
+++ b/lib/vax4/descr.src
@@ -43,13 +43,13 @@ name ld
        program /bin/ld
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}={EM}/{RT}em) \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) \
+               ({RTS}:.ocm.b.c={EM}/{RT}cc) ({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) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
                (.mod:{TAIL}={EM}/{LIB}m2.1 {EM}/{LIB}m2.2 {EM}/{LIB}m2.3) \
-               (.e:{TAIL}={EM}/{LIB}em) \
-               (.b.c.p.mod:{TAIL}={EM}/{LIB}mon)
+               (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon)
        linker
 end

diff --git a/lib/z80/descr b/lib/z80/descr
index 98a4a3f..c88f2e4 100644 (file)
--- a/lib/z80/descr
+++ b/lib/z80/descr
@@ -32,11 +32,12 @@ name led
        program {EM}/lib/em_led
        mapflag -l* LNAME={EM}/{LIB}*
        args -b0:0x1000 ( .e:{HEAD}={EM}/{RT}em) \
-               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -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) \
+               (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.ocm.b.c.p:{TAIL}={EM}/{LIB}mon) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}sys {EM}/lib/{M}/end_em)
        linker
 end

diff --git a/lib/z8000/descr b/lib/z8000/descr
index 09665ec..ce67b97 100644 (file)
--- a/lib/z8000/descr
+++ b/lib/z8000/descr
@@ -26,11 +26,12 @@ name asld
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i  IFILE={EM}/{RT}i
        args {IFILE?} (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
+               (.ocm:{TAIL}={EM}/{LIB}ocm) \
                (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.ocm.b.c.p:{TAIL}={EM}/{LIB}mon) \
                (.e:{TAIL}={EM}/{LIB}em {EM}/lib/z8000/end_em)
        linker
 end