From 4a0fbe2a1c7e535aacbf53e56a2322b1a97ac2ef Mon Sep 17 00:00:00 2001
From: Alasdair Armstrong
Date: Fri, 29 Jun 2018 22:04:55 +0100
Subject: Try to fix some tricky C compilation bugs, break everything instead

---
 mips/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mips/Makefile')

diff --git a/mips/Makefile b/mips/Makefile
index a8bce143..593ea6d1 100644
--- a/mips/Makefile
+++ b/mips/Makefile
@@ -21,7 +21,7 @@ mips.c: $(MIPS_PRE) $(MIPS_TLB) $(MIPS_SAILS) $(MIPS_MAIN) Makefile ../sail
 C_WARNINGS=-Wall -Wno-unused-but-set-variable -Wno-unused-label -Wno-maybe-uninitialized -Wno-return-type
 C_OPT=-O2
 GCOV_FLAGS=
-mips_c: mips.c ../lib/sail.h ../lib/*.c Makefile 
+mips_c: mips.c ../lib/sail.h ../lib/*.c Makefile
 	gcc $(C_OPT) $(C_WARNINGS) $(GCOV_FLAGS) -g -I ../lib $< ../lib/*.c -lgmp -lz -o $@
 
 # Note that for coverage purposes O1 appears optimal. O0 means lots of obviously dead code but O2 risks reducing granularity too much.
-- 
cgit v1.2.3


From dafb09e7c26840dce3d522fef3cf359729ca5b61 Mon Sep 17 00:00:00 2001
From: Alasdair
Date: Tue, 24 Jul 2018 01:09:14 +0100
Subject: Now builds mips spec again.

Some more testing needed to make sure it runs FreeBSD properly and CHERI before merging
---
 mips/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mips/Makefile')

diff --git a/mips/Makefile b/mips/Makefile
index 593ea6d1..fa1f9fa0 100644
--- a/mips/Makefile
+++ b/mips/Makefile
@@ -18,7 +18,7 @@ mips: $(MIPS_PRE) $(MIPS_TLB) $(MIPS_SAILS) $(MIPS_MAIN) ../sail
 mips.c: $(MIPS_PRE) $(MIPS_TLB) $(MIPS_SAILS) $(MIPS_MAIN) Makefile ../sail
 	$(SAIL) -O -memo_z3 -c $(filter %.sail, $^) 1> $@
 
-C_WARNINGS=-Wall -Wno-unused-but-set-variable -Wno-unused-label -Wno-maybe-uninitialized -Wno-return-type
+C_WARNINGS=-Wall -Wno-unused-but-set-variable -Wno-unused-label -Wno-maybe-uninitialized
 C_OPT=-O2
 GCOV_FLAGS=
 mips_c: mips.c ../lib/sail.h ../lib/*.c Makefile
-- 
cgit v1.2.3