From dc92fe358eefd060b024002cd8d4d6929950d3b3 Mon Sep 17 00:00:00 2001
From: keie <none@none>
Date: Tue, 26 Mar 1985 14:48:32 +0000
Subject: [PATCH] *** empty log message ***

---
 lib/m68k2/descr             |  8 +++++++-
 lib/m68k4/descr             | 12 ++++++------
 mach/m68k4/libbc/Makefile   |  2 +-
 mach/m68k4/libbc/compmodule |  2 +-
 mach/m68k4/libcc/Makefile   |  2 +-
 mach/m68k4/libcc/compmodule |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/m68k2/descr b/lib/m68k2/descr
index ca4448634..d173268cd 100644
--- a/lib/m68k2/descr
+++ b/lib/m68k2/descr
@@ -22,7 +22,6 @@ end
 name asld
 	from .s.a
 	to .out
-	outfile a.out
 	program {EM}/lib/{M}/as
 	mapflag -l* LNAME={EM}/{LIB}*
 	args (.e:{HEAD}={EM}/{RT}em) \
@@ -34,3 +33,10 @@ name asld
 	prep cond
 	linker
 end
+name cv
+	from .out
+	to .cv
+	program {EM}/lib/{M}/cv
+	args < >
+	outfile a.out
+end
diff --git a/lib/m68k4/descr b/lib/m68k4/descr
index 8b372bf40..4a2550e8f 100644
--- a/lib/m68k4/descr
+++ b/lib/m68k4/descr
@@ -1,15 +1,15 @@
-# $Header$
+# $Revision 2.2$
 var w=4
 var p=4
-var s=4
+var s=2
 var l=4
 var f=4
 var d=8
 var NAME=m68k4
 var M=m68k4
-var LIB=mach/m68k4/lib/tail_
-var RT=mach/m68k4/lib/head_
-var INCLUDES=-I{EM}/include
+var LIB=lib/m68k4/tail_
+var RT=lib/m68k4/head_
+var INCLUDES=-I{EM}/include -I/usr/include
 name be
 	from .m
 	to .o
@@ -30,7 +30,7 @@ name asld
 	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}/end_em)
+(.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
 	prep cond
 	linker
 end
diff --git a/mach/m68k4/libbc/Makefile b/mach/m68k4/libbc/Makefile
index 6428b15d4..9745cc472 100644
--- a/mach/m68k4/libbc/Makefile
+++ b/mach/m68k4/libbc/Makefile
@@ -1,5 +1,5 @@
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=m68k4" "SUF=s"
+MACHDEF="MACH=m68k4" "SUF=o"
 BCDEF="PREF=bc" "SUB=" "SRC=lang/basic/lib"
 
 install:
diff --git a/mach/m68k4/libbc/compmodule b/mach/m68k4/libbc/compmodule
index 284613267..491f6d251 100755
--- a/mach/m68k4/libbc/compmodule
+++ b/mach/m68k4/libbc/compmodule
@@ -1,2 +1,2 @@
 ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
-echo `basename $1 $2`.s
+echo `basename $1 $2`.o
diff --git a/mach/m68k4/libcc/Makefile b/mach/m68k4/libcc/Makefile
index c7f69beaa..8f70d7a07 100644
--- a/mach/m68k4/libcc/Makefile
+++ b/mach/m68k4/libcc/Makefile
@@ -1,5 +1,5 @@
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=m68k4" "SUF=s"
+MACHDEF="MACH=m68k4" "SUF=o"
 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"
diff --git a/mach/m68k4/libcc/compmodule b/mach/m68k4/libcc/compmodule
index 284613267..491f6d251 100755
--- a/mach/m68k4/libcc/compmodule
+++ b/mach/m68k4/libcc/compmodule
@@ -1,2 +1,2 @@
 ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
-echo `basename $1 $2`.s
+echo `basename $1 $2`.o
-- 
2.34.1