Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e8be5302 authored by Alan Kao's avatar Alan Kao Committed by Palmer Dabbelt
Browse files

Cleanup ISA string setting 



This patch cleanup the MARCH string passing to both compiler and
assembler.  Note that the CFLAGS should not contain "fd" before we
have mechnisms like kernel_fpu_begin/end in other architectures.

Signed-off-by: default avatarAlan Kao <alankao@andestech.com>
Cc: Greentime Hu <greentime@andestech.com>
Cc: Vincent Chen <vincentc@andestech.com>
Cc: Zong Li <zong@andestech.com>
Cc: Nick Hu <nickhu@andestech.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 007f5c35

arch/riscv/Makefile

+8 −11
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ ifeq ($(CONFIG_ARCH_RV64I),y) 
	

	KBUILD_CFLAGS	+= $(call cc-ifversion, -ge, 0500, -DCONFIG_ARCH_SUPPORTS_INT128)



	KBUILD_MARCH = rv64im

	KBUILD_LDFLAGS += -melf64lriscv

else

	BITS := 32
@@ -36,22 +35,20 @@ else 


	KBUILD_CFLAGS += -mabi=ilp32

	KBUILD_AFLAGS += -mabi=ilp32

	KBUILD_MARCH = rv32im

	KBUILD_LDFLAGS += -melf32lriscv

endif



KBUILD_CFLAGS += -Wall



ifeq ($(CONFIG_RISCV_ISA_A),y)

	KBUILD_ARCH_A = a

endif

ifeq ($(CONFIG_RISCV_ISA_C),y)

	KBUILD_ARCH_C = c

endif



KBUILD_AFLAGS += -march=$(KBUILD_MARCH)$(KBUILD_ARCH_A)fd$(KBUILD_ARCH_C)

# ISA string setting

riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32im

riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64im

riscv-march-$(CONFIG_RISCV_ISA_A)	:= $(riscv-march-y)a

riscv-march-y				:= $(riscv-march-y)fd

riscv-march-$(CONFIG_RISCV_ISA_C)	:= $(riscv-march-y)c

KBUILD_CFLAGS += -march=$(subst fd,,$(riscv-march-y))

KBUILD_AFLAGS += -march=$(riscv-march-y)



KBUILD_CFLAGS += -march=$(KBUILD_MARCH)$(KBUILD_ARCH_A)$(KBUILD_ARCH_C)

KBUILD_CFLAGS += -mno-save-restore

KBUILD_CFLAGS += -DCONFIG_PAGE_OFFSET=$(CONFIG_PAGE_OFFSET)