scripts,isa: merge riscv{32,64}.mk into riscv.mk

NJU-ProjectN · Jul 2, 2023 · ad8f8fb · ad8f8fb
1 parent 6d79d0e
commit ad8f8fb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/scripts/isa/riscv.mk b/scripts/isa/riscv.mk
@@ -0,0 +1,5 @@
+CROSS_COMPILE := riscv64-linux-gnu-
+COMMON_CFLAGS := -fno-pic -march=rv64g -mcmodel=medany -mstrict-align
+CFLAGS        += $(COMMON_CFLAGS) -static
+ASFLAGS       += $(COMMON_CFLAGS) -O0
+LDFLAGS       += -melf64lriscv
diff --git a/scripts/isa/riscv32.mk b/scripts/isa/riscv32.mk
diff --git a/scripts/isa/riscv64.mk b/scripts/isa/riscv64.mk
diff --git a/scripts/riscv32-nemu.mk b/scripts/riscv32-nemu.mk
@@ -1,6 +1,8 @@
-include $(AM_HOME)/scripts/isa/riscv32.mk
+include $(AM_HOME)/scripts/isa/riscv.mk
 include $(AM_HOME)/scripts/platform/nemu.mk
 CFLAGS  += -DISA_H=\"riscv/riscv.h\"
+COMMON_CFLAGS += -march=rv32im_zicsr -mabi=ilp32e  # overwrite
+LDFLAGS       += -melf32lriscv                     # overwrite
 
 AM_SRCS += riscv/nemu/start.S \
            riscv/nemu/cte.c \

diff --git a/scripts/riscv64-nemu.mk b/scripts/riscv64-nemu.mk
@@ -1,4 +1,4 @@
-include $(AM_HOME)/scripts/isa/riscv64.mk
+include $(AM_HOME)/scripts/isa/riscv.mk
 include $(AM_HOME)/scripts/platform/nemu.mk
 CFLAGS  += -DISA_H=\"riscv/riscv.h\"
 

diff --git a/scripts/riscv64-npc.mk b/scripts/riscv64-npc.mk
@@ -1,4 +1,4 @@
-include $(AM_HOME)/scripts/isa/riscv64.mk
+include $(AM_HOME)/scripts/isa/riscv.mk
 
 AM_SRCS := riscv/npc/start.S \
            riscv/npc/trm.c \

diff --git a/scripts/spike.mk b/scripts/spike.mk
@@ -1,4 +1,4 @@
-include $(AM_HOME)/scripts/isa/riscv64.mk
+include $(AM_HOME)/scripts/isa/riscv.mk
 
 AM_SRCS := riscv/spike/trm.c \
            riscv/spike/ioe.c \