diff --git a/lib/arm/descr b/lib/arm/descr index aed887c33..83e2b0e09 100644 --- a/lib/arm/descr +++ b/lib/arm/descr @@ -40,6 +40,7 @@ name asld ({RTS}:.ocm.b={EM}/{RT}cc) \ ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p={EM}/{RT}pc) \ ({RTS}:.mod={EM}/{RT}m2) \ -o > < \ @@ -47,10 +48,11 @@ name asld (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ - (.mod.ocm.b.c.p.e:{TAIL}={EM}/{LIB}mon) \ - (.mod.ocm.b.c.p.e:{TAIL}={EM}/{LIB}fp) \ + (.mod.ocm.b.c.p.f.e:{TAIL}={EM}/{LIB}mon) \ + (.mod.ocm.b.c.p.f.e:{TAIL}={EM}/{LIB}fp) \ (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon2 {EM}/lib/{M}/end_em) linker end diff --git a/lib/descr/fe b/lib/descr/fe index 240e5e316..d85c0ff08 100644 --- a/lib/descr/fe +++ b/lib/descr/fe @@ -21,8 +21,10 @@ name cpp mapflag -ansi ANSI_C=.ansi args {CPP_F?} ({SUFFIX?}:.ocm=-I{EM}/include/occam) \ -D__{NAME} \ - ({ANSI_C?}:.ansi={SYSINCLUDES?} {ANSI_C_INCLUDES} {INCLUDES?}) \ - ({ANSI_C?.c}:{SUFFIX}={SYSINCLUDES?} {C_INCLUDES} {INCLUDES?}) \ + {SYSINCLUDES?} \ + ({ANSI_C?}:.ansi={ANSI_C_INCLUDES}) \ + {C_INCLUDES} \ + {INCLUDES?} \ ({ANSI_C?.xx}:.xx=-D{NAME} \ -DEM_WSIZE={w} -DEM_PSIZE={p} \ -DEM_SSIZE={s} -DEM_LSIZE={l} -DEM_FSIZE={f} -DEM_DSIZE={d}) \ @@ -32,6 +34,22 @@ name cpp stdout prep is end +name f77 + from .f + to .c + program {EM}/lib.bin/f2c + mapflag -ansi F2_F={F2_F?} -A + mapflag -w* F2_F={F2_F?} -w* + args \ + {F2_F?} + stdin + stdout + prep cond + rts .f + need .f + callname f77 + callname f2c +end name cem from .c to .k @@ -58,7 +76,7 @@ name cem {CPP_F?} \ {SYSINCLUDES?} \ ({ANSI_C?}:.ansi={ANSI_C_INCLUDES}) \ - ({ANSI_C?.c}:.c={C_INCLUDES}) \ + {C_INCLUDES} \ {INCLUDES?} \ ({ANSI_C?}:.ansi=-D__{NAME}) \ ({ANSI_C?.xx}:.xx=-D{NAME}) \ diff --git a/lib/em44/descr b/lib/em44/descr index db626fff3..1e2985f86 100644 --- a/lib/em44/descr +++ b/lib/em44/descr @@ -28,6 +28,7 @@ name asld ({RTS}:.ocm.b={EM}/{RT}cc) \ ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.mod={EM}/{RT}m2) \ ({RTS}:.p={EM}/{RT}pc) \ -o > < \ @@ -35,8 +36,9 @@ name asld (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ - (.p.b.ocm.mod.c.e:{TAIL}={EM}/{LIB}mon) + (.p.b.ocm.mod.c.f.e:{TAIL}={EM}/{LIB}mon) linker end diff --git a/lib/i386/descr b/lib/i386/descr index ce59ea800..6990bd44a 100644 --- a/lib/i386/descr +++ b/lib/i386/descr @@ -40,11 +40,13 @@ name led ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ ({RTS}:.mod={EM}/{RT}m2) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p={EM}/{RT}pc) \ -o > < \ (.p:{TAIL}={EM}/{LIB}pc) \ (.b:{TAIL}={EM}/{LIB}bc) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f {EM}/{LIB}ac) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ diff --git a/lib/m68020/descr b/lib/m68020/descr index 3d0363149..8a61e33a8 100644 --- a/lib/m68020/descr +++ b/lib/m68020/descr @@ -50,6 +50,7 @@ name led ({RTS}:.ocm.b={EM}/{RT}cc) \ ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p={EM}/{RT}pc) \ ({RTS}:.mod={EM}/{RT}m2) \ -o > < \ @@ -57,6 +58,7 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ diff --git a/lib/m68k4/descr b/lib/m68k4/descr index db209bda6..8b8bbe4e9 100644 --- a/lib/m68k4/descr +++ b/lib/m68k4/descr @@ -52,6 +52,7 @@ name led ({RTS}:.ocm.b={EM}/{RT}cc) \ ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p={EM}/{RT}pc) \ ({RTS}:.mod={EM}/{RT}m2) \ -o > < \ @@ -59,6 +60,7 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ diff --git a/lib/mantra/descr b/lib/mantra/descr index 14bc8af39..5bf130eca 100644 --- a/lib/mantra/descr +++ b/lib/mantra/descr @@ -54,11 +54,13 @@ name led ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ ({RTS}:.mod={EM}/{RT}m2) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p={EM}/{RT}pc) \ -o > < \ (.p:{TAIL}={EM}/{LIB}pc) \ (.b:{TAIL}={EM}/{LIB}bc) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ diff --git a/lib/ns/descr b/lib/ns/descr index 9b6680109..d143baf34 100644 --- a/lib/ns/descr +++ b/lib/ns/descr @@ -39,6 +39,7 @@ name led ({RTS}:.ocm.b={EM}/{RT}cc) \ ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p={EM}/{RT}pc) \ ({RTS}:.mod={EM}/{RT}m2) \ -o > < \ @@ -46,6 +47,7 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ (.e:{TAIL}={EM}/{LIB}mon {EM}/{LIB}mon2 {EM}/{LIB}em {EM}/lib/{M}/end_em) diff --git a/lib/pmds4/descr b/lib/pmds4/descr index af8c147df..e1f821944 100644 --- a/lib/pmds4/descr +++ b/lib/pmds4/descr @@ -54,6 +54,7 @@ name led ({RTS}:.ocm.b={EM}/{RT}cc) \ ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p={EM}/{RT}pc) \ ({RTS}:.mod={EM}/{RT}m2) \ -o > < \ @@ -61,6 +62,7 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ diff --git a/lib/sparc/descr b/lib/sparc/descr index fd95cb06e..2722b7cc6 100644 --- a/lib/sparc/descr +++ b/lib/sparc/descr @@ -40,6 +40,7 @@ name led ({RTS}:.ocm.b={EM}/{RT}cc) \ ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.mod={EM}/{RT}m2) \ ({RTS}:.p.8={EM}/{RT}pc) \ -o > < \ @@ -48,6 +49,7 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ {LIBDB?} \ diff --git a/lib/sun2/descr b/lib/sun2/descr index b6cd5d7f1..e787f7896 100644 --- a/lib/sun2/descr +++ b/lib/sun2/descr @@ -56,6 +56,7 @@ name led ({RTS}:.ocm.b={EM}/{RT}cc) \ ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p={EM}/{RT}pc) \ ({RTS}:.mod={EM}/{RT}m2) \ -o > < \ @@ -63,6 +64,7 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ diff --git a/lib/sun3/descr b/lib/sun3/descr index b6ee2ac7c..e2ee5e27c 100644 --- a/lib/sun3/descr +++ b/lib/sun3/descr @@ -58,6 +58,7 @@ name led ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ ({RTS}:.mod={EM}/{RT}m2) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p.8={EM}/{RT}pc) \ -o > < \ (.8:{TAIL}={EM}/{LIB}a68s) \ @@ -65,6 +66,7 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ diff --git a/lib/vax4/descr b/lib/vax4/descr index df4ef3c6d..a1a99ed3a 100644 --- a/lib/vax4/descr +++ b/lib/vax4/descr @@ -53,6 +53,7 @@ name led ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ ({RTS}:.mod={EM}/{RT}m2) \ + ({RTS}:.f={EM}/{RT}ac) \ ({RTS}:.p.8={EM}/{RT}pc) \ -o > < \ (.8:{TAIL}={EM}/{LIB}a68s) \ @@ -60,6 +61,7 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ + (.f:{TAIL}={EM}/{LIB}f77 {EM}/{LIB}ac) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ {LIBDB?} \