From 856ee446246f4967bcbaf8654e302d865c467e6b Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@sifive.com>
Date: Mon, 25 Mar 2019 14:33:03 -0700
Subject: Set ASFLAGS to work

This allows users to specify raw assembly files in their build scripts.

Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>
---
 debug.mk              | 2 ++
 release.mk            | 1 +
 scripts/standalone.mk | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/debug.mk b/debug.mk
index b57cfc0..dc77a57 100644
--- a/debug.mk
+++ b/debug.mk
@@ -3,10 +3,12 @@
 ###################################################
 
 # Set the optimization level
+RISCV_ASFLAGS += -O0
 RISCV_CFLAGS += -O0
 RISCV_CXXFLAGS += -O0
 
 # Enable debug
+RISCV_ASFLAGS += -g
 RISCV_CFLAGS += -g
 RISCV_CXXFLAGS += -g
 
diff --git a/release.mk b/release.mk
index ac7ec8a..11726ba 100644
--- a/release.mk
+++ b/release.mk
@@ -3,5 +3,6 @@
 ###################################################
 
 # Set the optimization level
+RISCV_ASFLAGS += -Os
 RISCV_CFLAGS += -Os
 RISCV_CXXFLAGS += -Os
diff --git a/scripts/standalone.mk b/scripts/standalone.mk
index 8098122..78328c5 100644
--- a/scripts/standalone.mk
+++ b/scripts/standalone.mk
@@ -86,12 +86,14 @@ SEGGER_JLINK_GDB_SERVER := JLinkGDBServer
 #############################################################
 
 # Set the arch, ABI, and code model
+RISCV_ASFLAGS  += -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -mcmodel=$(RISCV_CMODEL)
 RISCV_CFLAGS   += -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -mcmodel=$(RISCV_CMODEL)
 RISCV_CXXFLAGS += -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -mcmodel=$(RISCV_CMODEL)
 # Prune unused functions and data
 RISCV_CFLAGS   += -ffunction-sections -fdata-sections
 RISCV_CXXFLAGS += -ffunction-sections -fdata-sections
 # Include the Metal headers
+RISCV_ASFLAGS  += -I$(abspath $(BSP_DIR)/install/include/)
 RISCV_CFLAGS   += -I$(abspath $(BSP_DIR)/install/include/)
 RISCV_CXXFLAGS += -I$(abspath $(BSP_DIR)/install/include/)
 
@@ -142,6 +144,7 @@ $(PROGRAM_ELF): \
 		AR=$(RISCV_AR) \
 		CC=$(RISCV_GCC) \
 		CXX=$(RISCV_GXX) \
+		ASFLAGS="$(RISCV_ASFLAGS)" \
 		CFLAGS="$(RISCV_CFLAGS)" \
 		CXXFLAGS="$(RISCV_CXXFLAGS)" \
 		LDFLAGS="$(RISCV_LDFLAGS)" \
-- 
cgit v1.2.1-18-gbd029