Experimental diff for building Fuzix-Compiler-Kit on OpenBSD/amd64

obsd-Fuzix-Compiler-Kit.diff

diff --git a/Makefile b/Makefile
index 2b2c860..15d3111 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+CC=cc
+
 all: cc cc0 \
      cc1.8080 cc1.z80 cc1.thread cc1.byte cc1.6502 \
      cc1.65c816 cc1.z8 cc1.1802 cc1.6800 cc1.6809 \
@@ -8,7 +10,7 @@ all: cc cc0 \
      cc2.8070 cc2.8086 \
      cc2.ee200 cc2.nova \
      copt \
-     support6303 support6502 support65c816 support6800 support6803 \
+     support6303 support6502 support6800 support6803 \
      support6809 support68hc11 support8080 support8085 supportz80 \
      supportz8 supportsuper8 supportee200 supportnova supportnova3 \
      test
@@ -71,100 +73,100 @@ $(OBJS3): $(INC1) $(INC2)
 backend-super8.o: backend-super8.c backend-z8.c
 
 cc:	cc.o
-	gcc -g3 $< -o cc
+	$(CC) -g3 $< -o cc
 
 cc0:	$(OBJS0)
-	gcc -g3 $(OBJS0) -o cc0
+	$(CC) -g3 $(OBJS0) -o cc0
 
 cc1.8080:$(OBJS1) target-8080.o
-	gcc -g3 $(OBJS1) target-8080.o -o cc1.8080
+	$(CC) -g3 $(OBJS1) target-8080.o -o cc1.8080
 
 cc1.8086:$(OBJS1) target-8086.o
-	gcc -g3 $(OBJS1) target-8086.o -o cc1.8086
+	$(CC) -g3 $(OBJS1) target-8086.o -o cc1.8086
 
 cc1.z80:$(OBJS1) target-z80.o
-	gcc -g3 $(OBJS1) target-z80.o -o cc1.z80
+	$(CC) -g3 $(OBJS1) target-z80.o -o cc1.z80
 
 cc1.thread:$(OBJS1) target-threadcode.o
-	gcc -g3 $(OBJS1) target-threadcode.o -o cc1.thread
+	$(CC) -g3 $(OBJS1) target-threadcode.o -o cc1.thread
 
 cc1.byte:$(OBJS1) target-bytecode.o
-	gcc -g3 $(OBJS1) target-bytecode.o -o cc1.byte
+	$(CC) -g3 $(OBJS1) target-bytecode.o -o cc1.byte
 
 cc1.6502:$(OBJS1) target-6502.o
-	gcc -g3 $(OBJS1) target-6502.o -o cc1.6502
+	$(CC) -g3 $(OBJS1) target-6502.o -o cc1.6502
 
 cc1.65c816:$(OBJS1) target-65c816.o
-	gcc -g3 $(OBJS1) target-65c816.o -o cc1.65c816
+	$(CC) -g3 $(OBJS1) target-65c816.o -o cc1.65c816
 
 cc1.z8:$(OBJS1) target-z8.o
-	gcc -g3 $(OBJS1) target-z8.o -o cc1.z8
+	$(CC) -g3 $(OBJS1) target-z8.o -o cc1.z8
 
 cc1.super8:$(OBJS1) target-super8.o
-	gcc -g3 $(OBJS1) target-super8.o -o cc1.super8
+	$(CC) -g3 $(OBJS1) target-super8.o -o cc1.super8
 
 cc1.1802:$(OBJS1) target-1802.o
-	gcc -g3 $(OBJS1) target-1802.o -o cc1.1802
+	$(CC) -g3 $(OBJS1) target-1802.o -o cc1.1802
 
 cc1.6800:$(OBJS1) target-6800.o
-	gcc -g3 $(OBJS1) target-6800.o -o cc1.6800
+	$(CC) -g3 $(OBJS1) target-6800.o -o cc1.6800
 
 cc1.6809:$(OBJS1) target-6800.o
-	gcc -g3 $(OBJS1) target-6800.o -o cc1.6809
+	$(CC) -g3 $(OBJS1) target-6800.o -o cc1.6809
 
 cc1.8070:$(OBJS1) target-8070.o
-	gcc -g3 $(OBJS1) target-8070.o -o cc1.8070
+	$(CC) -g3 $(OBJS1) target-8070.o -o cc1.8070
 
 cc1.ee200:$(OBJS1) target-ee200.o
-	gcc -g3 $(OBJS1) target-ee200.o -o cc1.ee200
+	$(CC) -g3 $(OBJS1) target-ee200.o -o cc1.ee200
 
 cc1.nova:$(OBJS1) target-nova.o
-	gcc -g3 $(OBJS1) target-nova.o -o cc1.nova
+	$(CC) -g3 $(OBJS1) target-nova.o -o cc1.nova
 
 cc2:	$(OBJS2)
-	gcc -g3 $(OBJS2) -o cc2
+	$(CC) -g3 $(OBJS2) -o cc2
 
 cc2.8080:	$(OBJS3)
-	gcc -g3 $(OBJS3) -o cc2.8080
+	$(CC) -g3 $(OBJS3) -o cc2.8080
 
 cc2.8086:	$(OBJS4)
-	gcc -g3 $(OBJS4) -o cc2.8086
+	$(CC) -g3 $(OBJS4) -o cc2.8086
 
 cc2.z80:	$(OBJS5)
-	gcc -g3 $(OBJS5) -o cc2.z80
+	$(CC) -g3 $(OBJS5) -o cc2.z80
 
 cc2.thread:	$(OBJS9)
-	gcc -g3 $(OBJS9) -o cc2.thread
+	$(CC) -g3 $(OBJS9) -o cc2.thread
 
 cc2.6502:	$(OBJS11)
-	gcc -g3 $(OBJS11) -o cc2.6502
+	$(CC) -g3 $(OBJS11) -o cc2.6502
 
 cc2.65c816:	$(OBJS12)
-	gcc -g3 $(OBJS12) -o cc2.65c816
+	$(CC) -g3 $(OBJS12) -o cc2.65c816
 
 cc2.z8:		$(OBJS13)
-	gcc -g3 $(OBJS13) -o cc2.z8
+	$(CC) -g3 $(OBJS13) -o cc2.z8
 
 cc2.super8:	$(OBJS14)
-	gcc -g3 $(OBJS14) -o cc2.super8
+	$(CC) -g3 $(OBJS14) -o cc2.super8
 
 cc2.1802:	$(OBJS15)
-	gcc -g3 $(OBJS15) -o cc2.1802
+	$(CC) -g3 $(OBJS15) -o cc2.1802
 
 cc2.6800:	$(OBJS16)
-	gcc -g3 $(OBJS16) -o cc2.6800
+	$(CC) -g3 $(OBJS16) -o cc2.6800
 
 cc2.6809:	$(OBJS17)
-	gcc -g3 $(OBJS17) -o cc2.6809
+	$(CC) -g3 $(OBJS17) -o cc2.6809
 
 cc2.8070:	$(OBJS8)
-	gcc -g3 $(OBJS8) -o cc2.8070
+	$(CC) -g3 $(OBJS8) -o cc2.8070
 
 cc2.ee200:	$(OBJS7)
-	gcc -g3 $(OBJS7) -o cc2.ee200
+	$(CC) -g3 $(OBJS7) -o cc2.ee200
 
 cc2.nova:	$(OBJS10)
-	gcc -g3 $(OBJS10) -o cc2.nova
+	$(CC) -g3 $(OBJS10) -o cc2.nova
 
 support6303:
 	(cd support6303; make)
@@ -372,9 +374,9 @@ libinst:
 	cp support6502/lib6502.a $(CCROOT)/lib/6502/lib6502.a
 #	cp support6502/lib65c02.a $(CCROOT)/lib/6502/lib65c02.a
 	ar cq $(CCROOT)/lib/6502/libc.a
-	cp support65c816/crt0.o $(CCROOT)/lib/65c816/
-	cp support65c816/lib65c816.a $(CCROOT)/lib/65c816/lib65c816.a
-	ar cq $(CCROOT)/lib/65c816/libc.a
+#	cp support65c816/crt0.o $(CCROOT)/lib/65c816/
+#	cp support65c816/lib65c816.a $(CCROOT)/lib/65c816/lib65c816.a
+#	ar cq $(CCROOT)/lib/65c816/libc.a
 	cp support6303/crt0.o $(CCROOT)/lib/6303/
 	cp support6303/lib6303.a $(CCROOT)/lib/6303/lib6303.a
 	ar cq $(CCROOT)/lib/6800/libc.a
diff --git a/cpp b/cpp
index 2bbe953..ecea7cd 100755
--- a/cpp
+++ b/cpp
@@ -1,4 +1,4 @@
 #!/bin/sh
 # Temporary until we get our own cpp
 #
-/lib/cpp -undef -nostdinc $*
+/usr/bin/cpp -undef -nostdinc -notraditional $*
diff --git a/test/Makefile b/test/Makefile
index 3498c38..236350e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,5 @@
-all: emu6502 emu65c816 emu6800 emu85 emuz8 emuz80 byte1802 emu6809 ee200 nova \
+#all: emu6502 emu65c816 emu6800 emu85 emuz8 emuz80 byte1802 emu6809 ee200 nova \
+all: emu6502 emu6800 emu85 emuz8 emuz80 byte1802 emu6809 ee200 nova \
      testcrt0.o testcrtz80.o testcrt0_6502.o testcrt0_65c816.o \
      testcrt0_6303.o testcrt0_6803.o testcrt0_6809.o testcrt0_z8.o \
      testcrt0_byte1802.o testcrt0_ee200.o testcrt0_nova.o testcrt0_nova3.o
@@ -106,5 +107,5 @@ clean:
 	rm -f emu6502 byte1802 emu65c816 emuz8 emu6809 ee200 nova
 	rm -f wtests/*.o
 	(cd libz80; make clean)
-	(cd lib65c816; make clean)
+#	(cd lib65c816; make clean)
 
diff --git a/test/libz80/codegen/Makefile b/test/libz80/codegen/Makefile
index 8dbf031..097e2ce 100644
--- a/test/libz80/codegen/Makefile
+++ b/test/libz80/codegen/Makefile
@@ -1,7 +1,9 @@
+CC=cc
+
 all: mktables
 
 mktables: mktables.c
-	gcc -g -o mktables mktables.c
+	$(CC) -g -o mktables mktables.c
 	
 force: clean opcodes