| Message ID | 20200116143029.31441-1-guoren@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V2,1/4] riscv: Separate patch for cflags and aflags | expand |
On Thu, Jan 16, 2020 at 8:01 PM <guoren@kernel.org> wrote: > > From: Guo Ren <ren_guo@c-sky.com> > > Use "subst fd" in Makefile is a hack way and it's not convenient > to add new ISA feature. Just separate them into riscv-march-cflags > and riscv-march-aflags. > > Signed-off-by: Guo Ren <ren_guo@c-sky.com> > Cc: Anup Patel <Anup.Patel@wdc.com> > --- > arch/riscv/Makefile | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile > index b9009a2fbaf5..6d09b53cf106 100644 > --- a/arch/riscv/Makefile > +++ b/arch/riscv/Makefile > @@ -35,12 +35,18 @@ else > endif > > # ISA string setting > -riscv-march-$(CONFIG_ARCH_RV32I) := rv32ima > -riscv-march-$(CONFIG_ARCH_RV64I) := rv64ima > -riscv-march-$(CONFIG_FPU) := $(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) > +riscv-march-cflags-$(CONFIG_ARCH_RV32I) := rv32ima > +riscv-march-cflags-$(CONFIG_ARCH_RV64I) := rv64ima > +riscv-march-$(CONFIG_FPU) := $(riscv-march-y)fd > +riscv-march-cflags-$(CONFIG_RISCV_ISA_C) := $(riscv-march-cflags-y)c > + > +riscv-march-aflags-$(CONFIG_ARCH_RV32I) := rv32ima > +riscv-march-aflags-$(CONFIG_ARCH_RV64I) := rv64ima > +riscv-march-aflags-$(CONFIG_FPU) := $(riscv-march-aflags-y)fd > +riscv-march-aflags-$(CONFIG_RISCV_ISA_C) := $(riscv-march-aflags-y)c > + > +KBUILD_CFLAGS += -march=$(riscv-march-cflags-y) > +KBUILD_AFLAGS += -march=$(riscv-march-aflags-y) > > KBUILD_CFLAGS += -mno-save-restore > KBUILD_CFLAGS += -DCONFIG_PAGE_OFFSET=$(CONFIG_PAGE_OFFSET) > -- > 2.17.0 > LGTM. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index b9009a2fbaf5..6d09b53cf106 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -35,12 +35,18 @@ else endif # ISA string setting -riscv-march-$(CONFIG_ARCH_RV32I) := rv32ima -riscv-march-$(CONFIG_ARCH_RV64I) := rv64ima -riscv-march-$(CONFIG_FPU) := $(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) +riscv-march-cflags-$(CONFIG_ARCH_RV32I) := rv32ima +riscv-march-cflags-$(CONFIG_ARCH_RV64I) := rv64ima +riscv-march-$(CONFIG_FPU) := $(riscv-march-y)fd +riscv-march-cflags-$(CONFIG_RISCV_ISA_C) := $(riscv-march-cflags-y)c + +riscv-march-aflags-$(CONFIG_ARCH_RV32I) := rv32ima +riscv-march-aflags-$(CONFIG_ARCH_RV64I) := rv64ima +riscv-march-aflags-$(CONFIG_FPU) := $(riscv-march-aflags-y)fd +riscv-march-aflags-$(CONFIG_RISCV_ISA_C) := $(riscv-march-aflags-y)c + +KBUILD_CFLAGS += -march=$(riscv-march-cflags-y) +KBUILD_AFLAGS += -march=$(riscv-march-aflags-y) KBUILD_CFLAGS += -mno-save-restore KBUILD_CFLAGS += -DCONFIG_PAGE_OFFSET=$(CONFIG_PAGE_OFFSET)