diff --git a/lib/6500/descr b/lib/6500/descr index 2da78ec7c..af83d0c82 100644 --- a/lib/6500/descr +++ b/lib/6500/descr @@ -9,7 +9,9 @@ var NAME=m6500 var M=6500 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ -var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon +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 be from .m.g to .s @@ -25,8 +27,11 @@ name asld program {EM}/lib/{M}/as mapflag -l* LNAME={EM}/{LIB}* mapflag -i IFILE={EM}/{RT}i + mapflag -ansi C_LIB={EM}/{LIB}ac args {IFILE?} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -34,7 +39,8 @@ name asld (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.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 diff --git a/lib/arm/descr b/lib/arm/descr index 7c816b396..37c2bc699 100644 --- a/lib/arm/descr +++ b/lib/arm/descr @@ -9,7 +9,9 @@ var NAME=arm var M=arm var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ -var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon +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 be from .m.g to .s @@ -33,8 +35,11 @@ name asld outfile a.out program {EM}/lib/{M}/as mapflag -l* LNAME={EM}/{LIB}* + mapflag -ansi C_LIB={EM}/{LIB}ac args (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -42,7 +47,8 @@ name asld (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ (.mod.ocm.b.c.p:{TAIL}={EM}/{LIB}mon) \ (.mod.ocm.b.c.p:{TAIL}={EM}/{LIB}fp) \ (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}ros {EM}/lib/{M}/end_em) diff --git a/lib/em22/descr b/lib/em22/descr index e8863edc9..981b5534f 100644 --- a/lib/em22/descr +++ b/lib/em22/descr @@ -11,7 +11,9 @@ var LIB=lib/em22/tail_ var RT=lib/em22/head_ var SIZE_FLAG= var CPP_F=-Dunix -var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon +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 asld from .k.m.a.g to .out @@ -21,8 +23,11 @@ name asld mapflag -+* ASS_F={ASS_F?} -+* mapflag --* ASS_F={ASS_F?} --* mapflag -s* SIZE_FLAG=-s* + mapflag -ansi C_LIB={EM}/{LIB}ac args {SIZE_FLAG} \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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={EM}/{RT}pc) \ -o > < \ @@ -30,7 +35,8 @@ name asld (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ (.b.c.ocm.mod.p.e:{TAIL}={EM}/{LIB}mon) linker end diff --git a/lib/em24/descr b/lib/em24/descr index b1277a214..90cce99db 100644 --- a/lib/em24/descr +++ b/lib/em24/descr @@ -11,7 +11,9 @@ var LIB=lib/em24/tail_ var RT=lib/em24/head_ var SIZE_FLAG= var CPP_F=-Dunix -var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon +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 asld from .k.m.a.g to .out @@ -21,8 +23,11 @@ name asld mapflag -+* ASS_F={ASS_F?} -+* mapflag --* ASS_F={ASS_F?} --* mapflag -s* SIZE_FLAG=-s* + mapflag -ansi C_LIB={EM}/{LIB}ac args {SIZE_FLAG} \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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={EM}/{RT}pc) \ -o > < \ @@ -30,7 +35,8 @@ name asld (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ (.p.b.mod.ocm.c.e:{TAIL}={EM}/{LIB}mon) linker end diff --git a/lib/em44/descr b/lib/em44/descr index 7524a6b97..fdc9721bf 100644 --- a/lib/em44/descr +++ b/lib/em44/descr @@ -11,7 +11,9 @@ var LIB=lib/em44/tail_ var RT=lib/em44/head_ var SIZE_FLAG= var CPP_F=-Dunix -var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon +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 asld from .k.m.a.g to .out @@ -21,8 +23,11 @@ name asld mapflag -+* ASS_F={ASS_F?} -+* mapflag --* ASS_F={ASS_F?} --* mapflag -s* SIZE_FLAG=-s* + mapflag -ansi C_LIB={EM}/{LIB}ac args {SIZE_FLAG} \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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={EM}/{RT}pc) \ -o > < \ @@ -30,7 +35,8 @@ name asld (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ (.p.b.ocm.mod.c.e:{TAIL}={EM}/{LIB}mon) linker end diff --git a/lib/i386/descr b/lib/i386/descr index 904621567..4cc77793c 100644 --- a/lib/i386/descr +++ b/lib/i386/descr @@ -10,8 +10,9 @@ var M=i386 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ var CPP_F=-Dunix -D__USG -var INCLUDES=-I{EM}/include/_tail_cc var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 -b1:0x1880000 +var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g +var OLD_C_LIB={C_LIB} name be from .m.g to .s @@ -33,8 +34,11 @@ name led program {EM}/lib/em_led mapflag -l* LNAME={EM}/{LIB}* mapflag -fp FLOATS={EM}/{LIB}fp + mapflag -ansi C_LIB={EM}/{LIB}ac args {ALIGN} {SEPID?} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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={EM}/{RT}pc) \ -o > < \ @@ -42,7 +46,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.mod:{TAIL}={EM}/{LIB}m2) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {FLOATS?} \ (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em) linker diff --git a/lib/i80/descr b/lib/i80/descr index 0887100cb..a4efba12d 100644 --- a/lib/i80/descr +++ b/lib/i80/descr @@ -10,7 +10,9 @@ var M=i80 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ var CPP_F= -var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon +var INCLUDES=-I{EM}/include/_tail_mon +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 @@ -32,8 +34,11 @@ name led to .out program {EM}/lib/em_led mapflag -l* LNAME={EM}/{LIB}* + mapflag -ansi C_LIB={EM}/{LIB}ac args -b0:0x1000 {ALIGN} {SEPID?} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -41,8 +46,9 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ - (.ocm.b.c.p:{TAIL}={EM}/{LIB}mon) \ + (.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) linker end diff --git a/lib/i86/descr b/lib/i86/descr index 428feb5e5..859ac7e0d 100644 --- a/lib/i86/descr +++ b/lib/i86/descr @@ -10,8 +10,9 @@ var M=i86 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ var CPP_F=-Dunix -D__USG -var INCLUDES=-I{EM}/include/_tail_cc 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 @@ -34,8 +35,11 @@ name led mapflag -l* LNAME={EM}/{LIB}* mapflag -i SEPID=-b1:0 mapflag -fp FLOATS={EM}/{ILIB}fp + mapflag -ansi C_LIB={EM}/{LIB}ac args {ALIGN} {SEPID?} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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={EM}/{RT}pc) \ -o > < \ @@ -43,7 +47,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.mod:{TAIL}={EM}/{LIB}m2) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {FLOATS?} \ (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em) linker diff --git a/lib/m68020/descr b/lib/m68020/descr index fd200eb35..d2266ffe9 100644 --- a/lib/m68020/descr +++ b/lib/m68020/descr @@ -10,7 +10,8 @@ var M=m68020 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ var CPP_F=-Dunix -D__USG -var INCLUDES=-I{EM}/include/_tail_cc +var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g +var OLD_C_LIB={C_LIB} # 410 align is the default var ALIGN=-a0:4 -a1:4 -a2:0x10000 -a3:4 name be @@ -43,8 +44,11 @@ name led program {EM}/lib/em_led mapflag -l* LNAME={EM}/{LIB}* mapflag -fp LIBFP={EM}/{LIB}fp + mapflag -ansi C_LIB={EM}/{LIB}ac args {ALIGN} (.e:{HEAD}= {EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -52,7 +56,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em) linker diff --git a/lib/m68k2/descr b/lib/m68k2/descr index 2ddba6c0e..6a93a6680 100644 --- a/lib/m68k2/descr +++ b/lib/m68k2/descr @@ -10,7 +10,8 @@ var M=m68k2 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ var CPP_F=-Dunix -Dm68000 -var INCLUDES=-I{EM}/include/_tail_cc +var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g +var OLD_C_LIB={C_LIB} # 407 align is the default var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 name be @@ -46,8 +47,11 @@ name led 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 -ansi C_LIB={EM}/{LIB}ac args -b0:0x20000 {ALIGN} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -55,7 +59,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em) linker diff --git a/lib/m68k4/descr b/lib/m68k4/descr index 835cffddf..2bb52087f 100644 --- a/lib/m68k4/descr +++ b/lib/m68k4/descr @@ -10,7 +10,8 @@ var M=m68k4 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ var CPP_F=-Dunix -Dm68000 -var INCLUDES=-I{EM}/include/_tail_cc +var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g +var OLD_C_LIB={C_LIB} # 407 align is the default var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 name be @@ -46,8 +47,11 @@ name led 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 -ansi C_LIB={EM}/{LIB}ac args -b0:0x20000 {ALIGN} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -55,7 +59,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em) linker diff --git a/lib/mantra/descr b/lib/mantra/descr index 73bb6bc53..8d03b9a13 100644 --- a/lib/mantra/descr +++ b/lib/mantra/descr @@ -12,7 +12,8 @@ var RT=lib/{M}/head_ var NLIB=lib/mantra/tail_ var NRT=lib/mantra/head_ var CPP_F=-Dunix -D__USG -Dmc68000 -var INCLUDES=-I{EM}/include/_tail_cc +var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g +var OLD_C_LIB={C_LIB} # 407 align is the default var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 name be @@ -48,8 +49,11 @@ name led 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 -ansi C_LIB={EM}/{LIB}ac args -b0:0x80000 {ALIGN} (.e:{HEAD}={EM}/{NRT}em) \ - ({RTS}:.ocm.b.c={EM}/{NRT}cc) \ + ({RTS}:.ocm.b={EM}/{RT}cc) \ + ({RTS}{ANSI?}:.c={EM}/{RT}cc) \ + ({RTS}{ANSI?}:.cansi={EM}/{RT}ac) \ ({RTS}:.mod={EM}/{NRT}m2) \ ({RTS}:.p={EM}/{RT}pc) \ -o > < \ @@ -57,7 +61,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.mod:{TAIL}={EM}/{NLIB}m2) \ (.ocm:{TAIL}={EM}/{NLIB}ocm) \ - (.ocm.b.c:{TAIL}={EM}/{NLIB}cc.1s {EM}/{NLIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ (.e:{TAIL}={EM}/{LIB}em {EM}/{NLIB}mon {EM}/lib/{M}/end_em) linker diff --git a/lib/minix/descr b/lib/minix/descr index 1b685a30c..afcb912b6 100644 --- a/lib/minix/descr +++ b/lib/minix/descr @@ -12,9 +12,11 @@ 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 -I{EM}/include/_tail_cc +var INCLUDES=-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 OLD_C_LIB={C_LIB} name be from .m.g to .s @@ -37,12 +39,18 @@ name led mapflag -l* LNAME={EM}/{MLIB}* mapflag -i SEPID=-b1:0 mapflag -fp LIBFP={EM}/{LIB}fp - args {ALIGN} {SEPID?} (.e:{HEAD}={EM}/{MRT}em) \ -({RTS}:.ocm.b.c={EM}/{MRT}cc) ({RTS}:.p={EM}/{MRT}pc) -o > < \ + mapflag -ansi C_LIB={EM}/{MLIB}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) \ (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{MLIB}ocm) \ - (.ocm.b.c:{TAIL}={EM}/{MLIB}cc.1s {EM}/{MLIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ (.e:{TAIL}={EM}/{MLIB}mon {EM}/lib/minix/end_em) linker diff --git a/lib/minixST/descr b/lib/minixST/descr index 823e7f879..b461b0866 100644 --- a/lib/minixST/descr +++ b/lib/minixST/descr @@ -12,8 +12,10 @@ 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 -I{EM}/include/_tail_cc +var INCLUDES=-I{EM}/lib/minixST/include var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 +var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g +var OLD_C_LIB={C_LIB} name be from .m.g to .s @@ -36,8 +38,11 @@ name led mapflag -l* LNAME={EM}/{LIB}* # mapflag -i SEPID=-b1:0 mapflag -fp LIBFP={EM}/{LIB}fp + mapflag -ansi C_LIB={EM}/{LIB}ac args {ALIGN} {SEPID?} -c (.e:{HEAD}={EM}/{MRT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -45,9 +50,10 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {LIBFP?} \ - (.e:{TAIL}={EM}/{MLIB}mon {EM}/lib/minixST/end_em) + (.e:{TAIL}={EM}/{MLIB}mon {EM}/{LIB}em {EM}/lib/minixST/end_em) linker end name cv diff --git a/lib/ns/descr b/lib/ns/descr index 16f7808a9..c0e2a7ce0 100644 --- a/lib/ns/descr +++ b/lib/ns/descr @@ -10,7 +10,8 @@ var NAME=NS var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ var CPP_F=-Dunix -var INCLUDES=-I{EM}/include/_tail_cc +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 @@ -32,8 +33,11 @@ name led to .out program {EM}/lib/em_led mapflag -l* LNAME={EM}/{LIB}* + mapflag -ansi C_LIB={EM}/{LIB}ac args {ALIGN} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -41,7 +45,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ (.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 e008995cc..b58066884 100644 --- a/lib/pdp/descr +++ b/lib/pdp/descr @@ -10,7 +10,8 @@ var NAME=pdp var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ var CPP_F=-Dunix -var INCLUDES=-I{EM}/include/_tail_cc +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 @@ -44,8 +45,11 @@ name led mapflag -i SEPID=-b1:0 mapflag -n ALIGN=-a0:1 -a1:0x2000 -a2:1 -a3:1 mapflag -nr ALIGN=-a0:1 -a1:1 -a2:0x2000 -a3:1 + mapflag -ansi C_LIB={EM}/{LIB}ac args {ALIGN} {SEPID?} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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={EM}/{RT}pc) \ -o > < \ @@ -53,7 +57,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em) linker end diff --git a/lib/pmds/descr b/lib/pmds/descr index 3e88eed19..a7cd20f68 100644 --- a/lib/pmds/descr +++ b/lib/pmds/descr @@ -9,7 +9,8 @@ var NAME=m68k2 var M=m68k2 var LIB=lib/m68k2/tail_ var RT=lib/m68k2/head_ -var INCLUDES=-I{EM}/include/_tail_cc +var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g +var OLD_C_LIB={C_LIB} var CPP_F=-Dunix -Dm68000 # 407 align is the default var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 @@ -46,8 +47,11 @@ name led 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 -ansi C_LIB={EM}/{LIB}ac args {ALIGN} (.e:{HEAD}={EM}/lib/pmds/head_em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -55,7 +59,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.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) linker diff --git a/lib/pmds4/descr b/lib/pmds4/descr index 3e992c1c5..f7da7caf9 100644 --- a/lib/pmds4/descr +++ b/lib/pmds4/descr @@ -9,8 +9,9 @@ var NAME=m68k4 var M=m68k4 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ -var INCLUDES=-I{EM}/include/_tail_cc var CPP_F=-Dunix -Dm68000 +var C_LIB={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g +var OLD_C_LIB={C_LIB} # 407 align is default var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 name be @@ -46,8 +47,11 @@ name led 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 -ansi C_LIB={EM}/{LIB}ac args {ALIGN} (.e:{HEAD}={EM}/lib/pmds4/head_em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -55,7 +59,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.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) linker diff --git a/lib/sun2/descr b/lib/sun2/descr index 7c8d79d76..92b50c4b6 100644 --- a/lib/sun2/descr +++ b/lib/sun2/descr @@ -8,14 +8,14 @@ var d=8 var NAME=sun var M=m68k4 var P=sun2 -# I am not sure about the next line. It is the sun3 one. -var CC_ALIGN=-Vw{w}.{s}i{w}.{s}p{p}.{s}s{s}.{s}l{l}.{s}f{f}.{w}d{d}.{w}S{s}U{s} +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 INCLUDES=-I{EM}/include/_tail_cc +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 var ALIGN=-a0:4 -a1:4 -a2:0x20000 -a3:4 -b0:0x2020 name be @@ -52,8 +52,11 @@ name led 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 -ansi C_LIB={EM}/{LIB}ac args {ALIGN} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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) \ -o > < \ @@ -61,7 +64,8 @@ name led (.b:{TAIL}={EM}/{PLIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.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) linker diff --git a/lib/xenix3/descr b/lib/xenix3/descr index fff2d8ad6..d869c4ba3 100644 --- a/lib/xenix3/descr +++ b/lib/xenix3/descr @@ -13,7 +13,8 @@ var ILIB=lib/i86/tail_ var RT=lib/{IM}/head_ var IRT=lib/i86/head_ var CPP_F=-Dunix -D__USG -var INCLUDES=-I{EM}/include/_tail_cc +var C_LIB={EM}/{ILIB}cc.1s {EM}/{ILIB}cc.2g +var OLD_C_LIB={C_LIB} var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2 name be from .m.g @@ -37,8 +38,11 @@ name led mapflag -l* LNAME={EM}/{ILIB}* mapflag -i SEPID=-b1:0 mapflag -fp FLOATS={EM}/{ILIB}fp + mapflag -ansi C_LIB={EM}/{ILIB}ac args {ALIGN} {SEPID?} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{IRT}cc) \ + ({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) \ -o > < \ @@ -46,7 +50,8 @@ name led (.b:{TAIL}={EM}/{ILIB}bc) \ (.mod:{TAIL}={EM}/{ILIB}m2) \ (.ocm:{TAIL}={EM}/{ILIB}ocm) \ - (.ocm.b.c:{TAIL}={EM}/{ILIB}cc.1s {EM}/{ILIB}cc.2g) \ + (.ocm.b:{TAIL}={OLD_C_LIB}) \ + (.c:{TAIL}={C_LIB}) \ {FLOATS?} \ (.e:{TAIL}={EM}/{ILIB}em {EM}/{LIB}mon {EM}/lib/i86/end_em) linker diff --git a/lib/z80/descr b/lib/z80/descr index a40c917d6..80bfcacf2 100644 --- a/lib/z80/descr +++ b/lib/z80/descr @@ -9,7 +9,9 @@ var NAME=z80 var M=z80 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ -var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon +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 be from .m.g to .s @@ -31,8 +33,11 @@ name led outfile a.out program {EM}/lib/em_led mapflag -l* LNAME={EM}/{LIB}* + mapflag -ansi C_LIB={EM}/{LIB}ac args -b0:0x1000 ( .e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -40,7 +45,8 @@ name led (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.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) linker diff --git a/lib/z8000/descr b/lib/z8000/descr index 6c19d2c06..ce0852450 100644 --- a/lib/z8000/descr +++ b/lib/z8000/descr @@ -9,7 +9,9 @@ var NAME=z8000 var M=z8000 var LIB=lib/{M}/tail_ var RT=lib/{M}/head_ -var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon +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 be from .m.g to .s @@ -25,8 +27,11 @@ name asld program {EM}/lib/{M}/as mapflag -l* LNAME={EM}/{LIB}* mapflag -i IFILE={EM}/{RT}i + mapflag -ansi C_LIB={EM}/{LIB}ac args {IFILE?} (.e:{HEAD}={EM}/{RT}em) \ - ({RTS}:.ocm.b.c={EM}/{RT}cc) \ + ({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 > < \ @@ -34,7 +39,8 @@ name asld (.b:{TAIL}={EM}/{LIB}bc) \ (.ocm:{TAIL}={EM}/{LIB}ocm) \ (.mod:{TAIL}={EM}/{LIB}m2) \ - (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \ + (.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) linker