Adapted to get .o files.

diff --git a/mach/i86/libcc/Makefile b/mach/i86/libcc/Makefile
index 08395ba..c80e2a6 100644 (file)
--- a/mach/i86/libcc/Makefile
+++ b/mach/i86/libcc/Makefile
@@ -1,10 +1,10 @@
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=i86" "SUF=s"
+MACHDEF="MACH=l86" "SUF=o" "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"
 
-install:       cpstdio cpgen cpmon
+install:       cpstdio cpgen
 
 cpstdio:
                make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tailcp
@@ -13,19 +13,19 @@ cpgen:
 cpmon:
                make -f $(MAKEFILE) $(MON) $(MACHDEF) tailcp
 
-cmp:           cmpstdio cmpgen cmpmon
+cmp:           cmpstdio cmpgen
 
 cmpstdio:
                make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail
-               ../../compare tail_cc.1s
+               -../../compare tail_cc.1s
 cmpgen:
                make -f $(MAKEFILE) $(GEN) $(MACHDEF) head
-               ../../compare head_cc
+               -../../compare head_cc
                make -f $(MAKEFILE) $(GEN) $(MACHDEF) tail
-               ../../compare tail_cc.2g
+               -../../compare tail_cc.2g
 cmpmon:
                make -f $(MAKEFILE) $(MON) $(MACHDEF) tail
-               ../../compare tail_mon
+               -../../compare tail_mon
 
 clean:
                -rm -f *.old *.[ce$(SUF)] tail* head*

diff --git a/mach/i86/libcc/compmodule b/mach/i86/libcc/compmodule
index 2bcf66c..6327cb9 100755 (executable)
--- a/mach/i86/libcc/compmodule
+++ b/mach/i86/libcc/compmodule
@@ -1,2 +1,6 @@
-${MACH?ack} -I../../../h ${MACHFL?} $1 1>&2
-echo `basename $1 $2`.s
+if ${MACH?} -I../../../h ${MACHFL?} $1 1>&2
+then
+       echo `basename $1 $2`.o
+else
+       exit 1
+fi