From 22a69383322d001fbbd918e44dbbd4015f469e1a Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Mon, 2 Feb 1987 17:40:30 +0000
Subject: [PATCH] *** empty log message ***

---
 lib/m68k4/descr             | 55 +++++++++++++++++++++++++------------
 mach/m68k4/libbc/Makefile   |  5 ++--
 mach/m68k4/libcc/Makefile   |  5 ++--
 mach/m68k4/libcc/compmodule |  8 ++++--
 mach/m68k4/libpc/Makefile   |  3 +-
 mach/m68k4/libpc/compmodule |  6 ++--
 mach/m68k4/libsys/LIST      |  4 ++-
 7 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/lib/m68k4/descr b/lib/m68k4/descr
index 4a2550e8f..a6def773a 100644
--- a/lib/m68k4/descr
+++ b/lib/m68k4/descr
@@ -1,4 +1,4 @@
-# $Revision 2.2$
+# $Revision$
 var w=4
 var p=4
 var s=2
@@ -7,31 +7,50 @@ var f=4
 var d=8
 var NAME=m68k4
 var M=m68k4
-var LIB=lib/m68k4/tail_
-var RT=lib/m68k4/head_
-var INCLUDES=-I{EM}/include -I/usr/include
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
+var CPP_F=-Dunix=unix -Dm68000=m68000
+var INCLUDES=-I{EM}/include/_tail_cc
+# 407 align is the default
+var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 name be
-	from .m
-	to .o
+	from .m.g
+	to .s
 	program {EM}/lib/{M}/cg
 	args <
 	stdout
 	need .e
 end
-name asld
-	from .s.a.o
-	to .out
+name asopt
+	from .s
+	to .so
+	program {EM}/lib/m68k2/top
+	args
+	optimizer
+	stdin
+	stdout
+end
+name as
+	from .s.so
+	to .o
 	program {EM}/lib/m68k2/as
-	mapflag -l* LNAME={EM}/{LIB}*
-	mapflag -d* LFLAG={LFLAG?} -d*
-	mapflag -s* LFLAG={LFLAG?} -s*
-	mapflag -n*
-	mapflag -i*
-	args {LFLAG?} (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
+	args - -o > <
 	prep cond
+end
+name led
+	from .o.a
+	to .out
+	program {EM}/lib/em_led
+	mapflag -l* LNAME={EM}/{LIB}*
+	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 {EM}/{LIB}mon {EM}/lib/{M}/end_em)
 	linker
 end
 name cv
diff --git a/mach/m68k4/libbc/Makefile b/mach/m68k4/libbc/Makefile
index a4a75655b..7e8bc3ed8 100644
--- a/mach/m68k4/libbc/Makefile
+++ b/mach/m68k4/libbc/Makefile
@@ -1,5 +1,6 @@
+SUF=o
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=m68k4" "SUF=o" "ASAR=aal"
+MACHDEF="MACH=m68k4" "SUF=$(SUF)" "ASAR=aal"
 BCDEF="PREF=bc" "SUB=" "SRC=lang/basic/lib"
 
 install:
@@ -11,7 +12,7 @@ cmp:
 	-../../compare tail_bc
 
 clean:
-		-rm -f *.old *.[ceo] tail* head*
+		-rm -f *.old *.[ce$(SUF)] tail* head*
 
 opr:
 	make pr | opr
diff --git a/mach/m68k4/libcc/Makefile b/mach/m68k4/libcc/Makefile
index 8f70d7a07..b3b95577c 100644
--- a/mach/m68k4/libcc/Makefile
+++ b/mach/m68k4/libcc/Makefile
@@ -1,5 +1,6 @@
+SUF=o
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=m68k4" "SUF=o"
+MACHDEF="MACH=m68k4 -DNOFLOAT" "SUF=$(SUF)" "ASAR=aal"
 STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio"
 GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen"
 MON="PREF=mon" "SRC=lang/cem/libcc/mon"
@@ -13,7 +14,7 @@ cpgen:
 cpmon:
 		make -f $(MAKEFILE) $(MON) $(MACHDEF) tailcp
 
-cmp:		cmpstdio cmpgen cmpmon
+cmp:		cmpstdio cmpgen
 
 cmpstdio:
 		make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail
diff --git a/mach/m68k4/libcc/compmodule b/mach/m68k4/libcc/compmodule
index 491f6d251..6327cb991 100755
--- a/mach/m68k4/libcc/compmodule
+++ b/mach/m68k4/libcc/compmodule
@@ -1,2 +1,6 @@
-${MACH?} -I../../../h ${MACHFL?} $1 1>&2
-echo `basename $1 $2`.o
+if ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
+then
+	echo `basename $1 $2`.o
+else
+	exit 1
+fi
diff --git a/mach/m68k4/libpc/Makefile b/mach/m68k4/libpc/Makefile
index 926013cae..c3c180fc1 100644
--- a/mach/m68k4/libpc/Makefile
+++ b/mach/m68k4/libpc/Makefile
@@ -1,5 +1,6 @@
+SUF=o
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=m68k4" "SUF=o"
+MACHDEF="MACH=m68k4" "SUF=$(SUF)" "ASAR=aal"
 PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc"
 
 install:
diff --git a/mach/m68k4/libpc/compmodule b/mach/m68k4/libpc/compmodule
index 491f6d251..a794a2257 100755
--- a/mach/m68k4/libpc/compmodule
+++ b/mach/m68k4/libpc/compmodule
@@ -1,2 +1,4 @@
-${MACH?} -I../../../h ${MACHFL?} $1 1>&2
-echo `basename $1 $2`.o
+if ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
+then echo `basename $1 $2`.o
+else exit 1
+fi
diff --git a/mach/m68k4/libsys/LIST b/mach/m68k4/libsys/LIST
index 2d595ec46..2abc65bd8 100644
--- a/mach/m68k4/libsys/LIST
+++ b/mach/m68k4/libsys/LIST
@@ -1,4 +1,4 @@
-tail_mon.a
+libmon_s.a
 exit.s
 _exit.s
 access.s
@@ -12,7 +12,9 @@ close.s
 creat.s
 dup.s
 dup2.s
+execle.s
 execl.s
+execv.s
 execve.s
 fork.s
 ftime.s
-- 
2.34.1