D16436.id45819.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D16436.id45819.diff
View Options

	Index: share/mk/bsd.cpu.mk
	===================================================================
	--- share/mk/bsd.cpu.mk
	+++ share/mk/bsd.cpu.mk
	@@ -367,9 +367,9 @@

	.if ${MACHINE_CPUARCH} == "riscv"
	.if ${MACHINE_ARCH:Mriscv*sf}
	-CFLAGS += -march=rv64imac -mabi=lp64
	+CFLAGS += -march=rv64ima -mabi=lp64
	.else
	-CFLAGS += -march=rv64imafdc -mabi=lp64d
	+CFLAGS += -march=rv64imafd -mabi=lp64d
	.endif
	.endif

	Index: stand/defs.mk
	===================================================================
	--- stand/defs.mk
	+++ stand/defs.mk
	@@ -103,7 +103,7 @@
	.if ${MACHINE_CPUARCH} == "aarch64"
	CFLAGS+= -mgeneral-regs-only -fPIC
	.elif ${MACHINE_CPUARCH} == "riscv"
	-CFLAGS+= -march=rv64imac -mabi=lp64
	+CFLAGS+= -march=rv64ima -mabi=lp64
	.else
	CFLAGS+= -msoft-float
	.endif
	Index: sys/conf/kern.mk
	===================================================================
	--- sys/conf/kern.mk
	+++ sys/conf/kern.mk
	@@ -131,7 +131,7 @@
	.endif

	.if ${MACHINE_CPUARCH} == "riscv"
	-CFLAGS.gcc+= -mcmodel=medany -march=rv64imafdc -mabi=lp64
	+CFLAGS.gcc+= -mcmodel=medany -march=rv64imafd -mabi=lp64
	INLINE_LIMIT?= 8000
	.endif

	Index: sys/riscv/riscv/swtch.S
	===================================================================
	--- sys/riscv/riscv/swtch.S
	+++ sys/riscv/riscv/swtch.S
	@@ -208,6 +208,7 @@
	#endif

	ret
	+ .align 3 /* Make ld (gnu linker) happy */
	.Lcpu_throw_panic_str:
	.asciz "cpu_throw: %p\0"
	END(cpu_throw)