From b1a5542ecf734403bbf439ab7585a5102bd423b8 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 25 Jan 2017 20:03:25 +0000
Subject: Final commit

---
 Makefile | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7071797..7232feb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,23 @@
-EXE:=test acker copyfile e fsieve hamming invperm lqueen mulmat nfib pascal reverse revtwice rfib sieve squeen str_arit stwice tak twice war_seq
+EXE:=test acker array copyfile e fac fsieve hamming invperm length lqueen mulmat nfib pascal reverse revtwice rfib sieve squeen str_arit stwice tak twice war_seq
 OBJ:=$(addsuffix .o,$(EXE))
 ASM:=$(addsuffix .s,$(EXE))
 DEPS_O:=_system.o cgopts.o
-SECONDARY:=_system.s
+SECONDARY:=_system.s $(addsuffix .abc,$(EXE))
 CC:=gcc
 
 CLM:=clm
 CG:=/home/pi/cg/cg
 AS:=as
 
-ASFLAGS:=-g -march=armv8-a+crc -mfpu=crypto-neon-fp-armv8 -mfloat-abi=hard --gstabs
-CFLAGS:=-g -march=armv8-a+crc -mfpu=crypto-neon-fp-armv8 -mfloat-abi=hard -mtune=cortex-a53 -Wall
+ASFLAGS:=-march=armv7-a --gstabs
+CFLAGS:=-march=armv7-a -Wall -Wl,-Map=lastmap.map
 
 RTS:=/home/pi/rts/_startup.o
 
+arm:
+	$(eval CG:=/home/pi/clean/exe/cg.old)
+	$(eval RTS=/home/pi/rts/_startup.arm.o)
+
 all: all_exe all_asm all_obj
 
 all_exe: $(EXE)
@@ -22,9 +26,18 @@ all_asm: $(ASM)
 
 all_obj: $(OBJ)
 
-$(OBJ): %.o: %.s
+%.o: %.s
 	$(AS) -o $@ $< $(ASFLAGS)
 
+ffi: %: %.o $(DEPS_O) ffi_c.o
+	$(CC) -o $@\
+		$(RTS)\
+		$(DEPS_O)\
+		$<\
+		ffi_c.o\
+		-lc -lm\
+		$(CFLAGS)
+
 $(EXE): %: %.o $(DEPS_O)
 	$(CC) -o $@\
 		$(RTS)\
@@ -33,8 +46,8 @@ $(EXE): %: %.o $(DEPS_O)
 		-lc -lm\
 		$(CFLAGS)
 
-$(DEPS_O): %.o: %.s
-	$(CC) -c -o $@ $< $(CFLAGS)
+#$(DEPS_O): %.o: %.s
+#	$(CC) -c -o $@ $< $(CFLAGS)
 
 %.s: %.abc
 	$(CG) $(basename $@) -s $@
-- 
cgit v1.2.3