Adapted to using the new linker.

diff --git a/lib/m68k2/descr b/lib/m68k2/descr
index d173268..ba06644 100644 (file)
--- a/lib/m68k2/descr
+++ b/lib/m68k2/descr
@@ -11,6 +11,8 @@ var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
 var CPP_F=-Dunix
 var INCLUDES=-I{EM}/include -I/usr/include
+# 407 align is the default
+var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 name be
        from .m.g
        to .s
@@ -19,18 +21,27 @@ name be
        stdout
        need .e
 end
-name asld
-       from .s.a
-       to .out
+name as
+       from .s
+       to .o
        program {EM}/lib/{M}/as
+       args - -o > <
+       prep cond
+end
+name led
+       from .o.a
+       to .out
+       program {EM}/lib/em_led
        mapflag -l* LNAME={EM}/{LIB}*
-       args (.e:{HEAD}={EM}/{RT}em) \
+       mapflag -i ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
+       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 > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
                (.b:{TAIL}={EM}/{LIB}bc) \
                (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-               (.e:{TAIL}={EM}/{LIB}em.rt {EM}/{LIB}mon {EM}/lib/{M}/end_em.s)
-       prep cond
+               (.e:{TAIL}={EM}/{LIB}em.rt {EM}/{LIB}mon {EM}/lib/{M}/end_em)
        linker
 end
 name cv