diff --git a/lang/basic/lib/pmfile b/lang/basic/lib/pmfile index 01d3d8fde..eb069d330 100644 --- a/lang/basic/lib/pmfile +++ b/lang/basic/lib/pmfile @@ -41,5 +41,5 @@ lang_basic_runtime = acklibrary { ackfile (d.."trap.c"), ackfile (d.."write.c"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_bc") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/libbasic.a") } diff --git a/lang/cem/libcc.ansi/pmfile b/lang/cem/libcc.ansi/pmfile index aef503ce3..6368244f5 100644 --- a/lang/cem/libcc.ansi/pmfile +++ b/lang/cem/libcc.ansi/pmfile @@ -6,13 +6,13 @@ local d = ROOTDIR.."lang/cem/libcc.ansi/" local crt = ackfile { ACKINCLUDES = {PARENT, "%ROOTDIR%h"}, file (d.."head_ac.e"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/head_ac") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/c-ansi.o") } local libc = acklibrary { ACKBUILDFLAGS = {PARENT, "-ansi"}, ACKINCLUDES = {PARENT, "%ROOTDIR%h", d.."headers"}, - outputs = {"%U%/tail_ac.a"}, + outputs = {"%U%/libc-ansi.a"}, -- assert @@ -260,7 +260,7 @@ local libc = acklibrary { ackfile (d.."time/misc.c"), install = { - pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_ac") + pm.install("%BINDIR%%PLATIND%/%PLATFORM%/libc-ansi.a") } } diff --git a/lang/cem/libcc/gen/pmfile b/lang/cem/libcc/gen/pmfile index ca72d8506..f190777a8 100644 --- a/lang/cem/libcc/gen/pmfile +++ b/lang/cem/libcc/gen/pmfile @@ -5,7 +5,7 @@ local d = ROOTDIR.."lang/cem/libcc/gen/" local head = acklibrary { ackfile (d.."head_cc.e"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/head_cc") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/c-knr.o") } local tail = acklibrary { @@ -83,7 +83,7 @@ local tail = acklibrary { ackfile (d.."modf.e"), ackfile (d.."setjmp.e"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_cc.2g") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/libc-knr.a") } lang_cem_gen_runtime = group { diff --git a/lang/cem/libcc/math/pmfile b/lang/cem/libcc/math/pmfile index 46c4e2a53..9ba570868 100644 --- a/lang/cem/libcc/math/pmfile +++ b/lang/cem/libcc/math/pmfile @@ -27,5 +27,5 @@ lang_cem_math_runtime = acklibrary { ackfile (d.."exp.c"), ackfile (d.."floor.c"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_m") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/libm-knr.a") } diff --git a/lang/cem/libcc/mon/pmfile b/lang/cem/libcc/mon/pmfile index 45ad605d8..43865f854 100644 --- a/lang/cem/libcc/mon/pmfile +++ b/lang/cem/libcc/mon/pmfile @@ -97,5 +97,5 @@ lang_cem_mon_runtime = acklibrary { ackfile (d.."_wait.e"), ackfile (d.."_write.e"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_mon") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/libmon.a") } diff --git a/lang/cem/libcc/stdio/pmfile b/lang/cem/libcc/stdio/pmfile index b7fd96134..577885838 100644 --- a/lang/cem/libcc/stdio/pmfile +++ b/lang/cem/libcc/stdio/pmfile @@ -54,5 +54,5 @@ lang_cem_stdio_runtime = acklibrary { ackfile (d.."timezone.c"), ackfile (d.."ungetc.c"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_cc.1s") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/libc-stdio-knr.a") } diff --git a/lang/m2/libm2/pmfile b/lang/m2/libm2/pmfile index 10b987e6e..f8f7c52ef 100644 --- a/lang/m2/libm2/pmfile +++ b/lang/m2/libm2/pmfile @@ -36,7 +36,7 @@ local headers = group { local head = ackfile { file (d.."head_m2.e"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/head_m2") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/modula2.o") } local tail = acklibrary { @@ -87,7 +87,7 @@ local tail = acklibrary { ackfile (d.."rckil.c"), ackfile (d.."EM.e"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_m2") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/libmodula2.a") } lang_m2_runtime = acklibrary { diff --git a/lang/occam/lib/pmfile b/lang/occam/lib/pmfile index 2970a29be..4ed36f62a 100644 --- a/lang/occam/lib/pmfile +++ b/lang/occam/lib/pmfile @@ -17,5 +17,5 @@ lang_occam_lib_runtime = acklibrary { ackfile (d.."par_misc.e"), ackfile (d.."parco.c"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_ocm") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/liboccam.a") } diff --git a/lang/pc/libpc/pmfile b/lang/pc/libpc/pmfile index 1d84e39eb..b63c635b2 100644 --- a/lang/pc/libpc/pmfile +++ b/lang/pc/libpc/pmfile @@ -6,7 +6,7 @@ local d = ROOTDIR.."lang/pc/libpc/" head = ackfile { file (d.."head_pc.e"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/head_pc") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/pascal.o") } tail = acklibrary { @@ -83,7 +83,7 @@ tail = acklibrary { ackfile (d.."rcka.c"), ackfile (d.."trp.e"), - install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/tail_pc") + install = pm.install("%BINDIR%%PLATIND%/%PLATFORM%/libpascal.a") } lang_pc_runtime = group { diff --git a/plat/pc86/descr b/plat/pc86/descr index 9427ee382..ee1cbd626 100644 --- a/plat/pc86/descr +++ b/plat/pc86/descr @@ -13,7 +13,7 @@ var PLATFORM=pc86 var PLATFORMDIR={EM}/lib/{PLATFORM} var CPP_F=-D__unix var ALIGN=-a0:1 -a1:1 -a2:1 -a3:1 -var C_LIB={PLATFORMDIR}/tail_cc.1s {PLATFORMDIR}/tail_cc.2g +var C_LIB={PLATFORMDIR}/libc-stdio-knr.a {PLATFORMDIR}/libc-knr.a var OLD_C_LIB={C_LIB} var MACHOPT_F=-m8 name be @@ -35,27 +35,27 @@ name led from .o.a to .out program {EM}/lib.bin/em_led - mapflag -l* LNAME={PLATFORMDIR}/tail_* + mapflag -l* LNAME={PLATFORMDIR}/lib* mapflag -i SEPID=-b1:0 mapflag -fp FLOATS={EM}/{ILIB}fp - mapflag -ansi C_LIB={PLATFORMDIR}/tail_ac + mapflag -ansi C_LIB={PLATFORMDIR}/libc-ansi.a args {ALIGN} {SEPID?} \ (.e:{HEAD}={PLATFORMDIR}/boot.o) \ - ({RTS}:.ocm.b={PLATFORMDIR}/head_cc) \ - ({RTS}{ANSI?}:.c={PLATFORMDIR}/head_cc) \ - ({RTS}{ANSI?}:.cansi={PLATFORMDIR}/head_ac) \ - ({RTS}:.mod={PLATFORMDIR}/head_m2) \ - ({RTS}:.p={PLATFORMDIR}/head_pc) \ + ({RTS}:.ocm.b={PLATFORMDIR}/c-knr.o) \ + ({RTS}{ANSI?}:.c={PLATFORMDIR}/c-knr.o) \ + ({RTS}{ANSI?}:.cansi={PLATFORMDIR}/c-ansi.o) \ + ({RTS}:.mod={PLATFORMDIR}/modula2.o) \ + ({RTS}:.p={PLATFORMDIR}/pascal.o) \ -o > < \ - (.p:{TAIL}={PLATFORMDIR}/tail_pc) \ - (.b:{TAIL}={PLATFORMDIR}/tail_bc) \ - (.mod:{TAIL}={PLATFORMDIR}/tail_m2) \ - (.ocm:{TAIL}={PLATFORMDIR}/tail_ocm) \ + (.p:{TAIL}={PLATFORMDIR}/libpascal.a) \ + (.b:{TAIL}={PLATFORMDIR}/libbasic.a) \ + (.mod:{TAIL}={PLATFORMDIR}/libmodula2.a) \ + (.ocm:{TAIL}={PLATFORMDIR}/liboccam.a) \ (.ocm.b:{TAIL}={OLD_C_LIB}) \ (.c:{TAIL}={C_LIB}) \ {FLOATS?} \ (.e:{TAIL}={PLATFORMDIR}/libsys.a \ - {PLATFORMDIR}/tail_mon \ + {PLATFORMDIR}/libmon.a \ {PLATFORMDIR}/libsys.a \ {PLATFORMDIR}/libem.a \ {PLATFORMDIR}/libend.a)