From 5cc76c436fa1234323bad51d72d1291d95991da6 Mon Sep 17 00:00:00 2001
From: Kimplul <kimi.h.kuparinen@gmail.com>
Date: Fri, 30 Aug 2024 18:52:55 +0300
Subject: specify mabi and march

---
 arch/riscv64/source.mk              | 2 +-
 tests/common/arch/riscv64/source.mk | 1 +
 tests/scripts/makefile              | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 tests/common/arch/riscv64/source.mk

diff --git a/arch/riscv64/source.mk b/arch/riscv64/source.mk
index f849432..54fcb08 100644
--- a/arch/riscv64/source.mk
+++ b/arch/riscv64/source.mk
@@ -2,7 +2,7 @@ KERNEL_LOCAL	!= echo $(ARCH_SOURCE)/kernel/*.[cS]
 KERNEL_SOURCES	:= $(KERNEL_SOURCES) $(KERNEL_LOCAL)
 
 # this doesn't work for rv32, but fine for now */
-ARCH_CFLAGS	:= $(ARCH_CFLAGS) -mcmodel=medany
+ARCH_CFLAGS	:= $(ARCH_CFLAGS) -mcmodel=medany -march=rv64imac_zicsr -mabi=lp64
 
 include $(ARCH_SOURCE)/asm/source.mk
 
diff --git a/tests/common/arch/riscv64/source.mk b/tests/common/arch/riscv64/source.mk
new file mode 100644
index 0000000..517c1c7
--- /dev/null
+++ b/tests/common/arch/riscv64/source.mk
@@ -0,0 +1 @@
+ARCH_FLAGS += -march=rv64imac -mabi=lp64
diff --git a/tests/scripts/makefile b/tests/scripts/makefile
index 7b861e2..ed2b2b4 100644
--- a/tests/scripts/makefile
+++ b/tests/scripts/makefile
@@ -9,11 +9,13 @@ COMPILER	!= [ "$(LLVM)" != "0" ] \
 			&& echo clang --target="$(CROSS_COMPILE)" \
 			|| echo $(CROSS_COMPILE)gcc
 
-OBFLAGS		:= -ffreestanding -nostdlib -std=c17 -g
+include common/arch/$(ARCH)/source.mk
+
+OBFLAGS		:= -ffreestanding -nostdlib -std=c17 -g -O2
 INCLUDEFLAGS	:= -I ../include -I.
 WARNFLAGS	:= -Wall -Wextra
 DEPFLAGS	= -MT $@ -MMD -MP -MF $@.d
-COMPILE_TEST	= $(COMPILER) $(WARNFLAGS) $(INCLUDEFLAGS) $(DEPFLAGS) $(OBFLAGS)
+COMPILE_TEST	= $(COMPILER) $(WARNFLAGS) $(INCLUDEFLAGS) $(DEPFLAGS) $(OBFLAGS) $(ARCH_FLAGS)
 
 GEN_INITRD	:= cpio -H newc -o >
 QEMU		:= qemu-system-$(ARCH) -machine virt -kernel ../kmi.bin \
-- 
cgit v1.3