svn commit: r335892 - head/share/mk
John Baldwin
jhb at FreeBSD.org
Tue Jul 3 15:24:10 UTC 2018
Author: jhb
Date: Tue Jul 3 15:24:09 2018
New Revision: 335892
URL: https://svnweb.freebsd.org/changeset/base/335892
Log:
Don't specify the desired march/mabi for RISC-V in ACFLAGS.
ACFLAGS is only used in addition to CFLAGS, so setting the options in
both was redundant. However, ACFLAGS is added to the command line
after CFLAGS, so the settings from ACFLAGS were applied for assembly
files in kernel modules after the kernel-specific march/abi in CFLAGS.
As a result, the hard-float ACFLAGS in bsd.cpu.mk was overriding the
soft-float CFLAGS.gcc in sys/conf/kern.mk. In particular,
dtrace_asm.o was compiled as hard-float and the linker refused to link
dtrace.ko since its object files contained a mix of hard and soft
float.
Reviewed by: br
Sponsored by: DARPA / AFRL
Differential Revision: https://reviews.freebsd.org/D16054
Modified:
head/share/mk/bsd.cpu.mk
Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk Tue Jul 3 14:57:11 2018 (r335891)
+++ head/share/mk/bsd.cpu.mk Tue Jul 3 15:24:09 2018 (r335892)
@@ -368,10 +368,8 @@ CFLAGS += -mcpu=8540 -Wa,-me500 -mspe=yes -mabi=spe -m
.if ${MACHINE_CPUARCH} == "riscv"
.if ${MACHINE_ARCH:Mriscv*sf}
CFLAGS += -march=rv64imac -mabi=lp64
-ACFLAGS += -march=rv64imac -mabi=lp64
.else
CFLAGS += -march=rv64imafdc -mabi=lp64d
-ACFLAGS += -march=rv64imafdc -mabi=lp64d
.endif
.endif
More information about the svn-src-all
mailing list