D23076.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D23076.diff
View Options

	Index: head/share/mk/bsd.cpu.mk
	===================================================================
	--- head/share/mk/bsd.cpu.mk
	+++ head/share/mk/bsd.cpu.mk
	@@ -375,10 +375,6 @@
	.else
	CFLAGS += -march=rv64imafdc -mabi=lp64d
	.endif
	-
	-.if ${LINKER_FEATURES:U:Mriscv-relaxations} == ""
	-CFLAGS += -mno-relax
	-.endif
	.endif

	# NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
	Index: head/share/mk/bsd.lib.mk
	===================================================================
	--- head/share/mk/bsd.lib.mk
	+++ head/share/mk/bsd.lib.mk
	@@ -98,6 +98,10 @@
	STATIC_CXXFLAGS+= -ftls-model=initial-exec
	.endif

	+.if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} == ""
	+CFLAGS += -mno-relax
	+.endif
	+
	.include <bsd.libnames.mk>

	# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
	Index: head/share/mk/bsd.prog.mk
	===================================================================
	--- head/share/mk/bsd.prog.mk
	+++ head/share/mk/bsd.prog.mk
	@@ -57,6 +57,10 @@
	.endif
	.endif

	+.if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} == ""
	+CFLAGS += -mno-relax
	+.endif
	+
	.if defined(CRUNCH_CFLAGS)
	CFLAGS+=${CRUNCH_CFLAGS}
	.else