From 6855cddc0ff7bcc06e71aa24a0417fc0656e75fb Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Mon, 12 Dec 2016 22:51:27 -0800
Subject: [PATCH] Pass newly updated -march, -mabi options to gcc

---
 debug/targets.py |  4 ++--
 isa/Makefile     | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/debug/targets.py b/debug/targets.py
index 8c725c4..c431a67 100644
--- a/debug/targets.py
+++ b/debug/targets.py
@@ -39,9 +39,9 @@ class Target(object):
                     prefix=binary_name + "_")
             binary_name = self.temporary_binary.name
             Target.temporary_files.append(self.temporary_binary)
-        march = "RV%dIMA" % self.xlen
+        march = "rv%dima" % self.xlen
         if self.use_fpu:
-            march += "FD"
+            march += "fd"
         testlib.compile(sources +
                 ("programs/entry.S", "programs/init.c",
                     "-I", "../env",
diff --git a/isa/Makefile b/isa/Makefile
index b8de54d..1afa4d6 100644
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -68,22 +68,22 @@ tests += $$($(1)_tests)
 
 endef
 
-$(eval $(call compile_template,rv32ui,-m32))
-$(eval $(call compile_template,rv32uc,-m32))
-$(eval $(call compile_template,rv32um,-m32))
-$(eval $(call compile_template,rv32ua,-m32))
-$(eval $(call compile_template,rv32uf,-m32))
-$(eval $(call compile_template,rv32si,-m32))
-$(eval $(call compile_template,rv32mi,-m32))
+$(eval $(call compile_template,rv32ui,-march=rv32g -mabi=ilp32))
+$(eval $(call compile_template,rv32uc,-march=rv32g -mabi=ilp32))
+$(eval $(call compile_template,rv32um,-march=rv32g -mabi=ilp32))
+$(eval $(call compile_template,rv32ua,-march=rv32g -mabi=ilp32))
+$(eval $(call compile_template,rv32uf,-march=rv32g -mabi=ilp32))
+$(eval $(call compile_template,rv32si,-march=rv32g -mabi=ilp32))
+$(eval $(call compile_template,rv32mi,-march=rv32g -mabi=ilp32))
 ifeq ($(XLEN),64)
-$(eval $(call compile_template,rv64ui))
-$(eval $(call compile_template,rv64uc))
-$(eval $(call compile_template,rv64um))
-$(eval $(call compile_template,rv64ua))
-$(eval $(call compile_template,rv64uf))
-$(eval $(call compile_template,rv64ud))
-$(eval $(call compile_template,rv64si))
-$(eval $(call compile_template,rv64mi))
+$(eval $(call compile_template,rv64ui,-march=rv64g -mabi=lp64))
+$(eval $(call compile_template,rv64uc,-march=rv64g -mabi=lp64))
+$(eval $(call compile_template,rv64um,-march=rv64g -mabi=lp64))
+$(eval $(call compile_template,rv64ua,-march=rv64g -mabi=lp64))
+$(eval $(call compile_template,rv64uf,-march=rv64g -mabi=lp64))
+$(eval $(call compile_template,rv64ud,-march=rv64g -mabi=lp64))
+$(eval $(call compile_template,rv64si,-march=rv64g -mabi=lp64))
+$(eval $(call compile_template,rv64mi,-march=rv64g -mabi=lp64))
 endif
 
 tests_dump = $(addsuffix .dump, $(tests))
-- 
2.30.2