svn commit: r303959 - in head: share/mk sys/modules/dtrace/dtrace

[Ruslan Bukin]

Author: br
Date: Thu Aug 11 13:42:31 2016
New Revision: 303959
URL: https://svnweb.freebsd.org/changeset/base/303959

Log:
  Revert r303911 "Remove extra -msoft-float flags settings."
  This was not properly tested.

Modified:
  head/share/mk/bsd.cpu.mk
  head/sys/modules/dtrace/dtrace/Makefile

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Thu Aug 11 12:37:11 2016	(r303958)
+++ head/share/mk/bsd.cpu.mk	Thu Aug 11 13:42:31 2016	(r303959)
@@ -327,6 +327,11 @@ CFLAGS += -mfloat-abi=softfp
 .endif
 .endif
 
+.if ${MACHINE_CPUARCH} == "riscv"
+CFLAGS += -msoft-float
+ACFLAGS += -msoft-float
+.endif
+
 # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
 
 .if !defined(NO_CPU_CFLAGS)

Modified: head/sys/modules/dtrace/dtrace/Makefile
==============================================================================
--- head/sys/modules/dtrace/dtrace/Makefile	Thu Aug 11 12:37:11 2016	(r303958)
+++ head/sys/modules/dtrace/dtrace/Makefile	Thu Aug 11 13:42:31 2016	(r303959)
@@ -58,6 +58,11 @@ assym.o: assym.s
 	${AS} -meabi=5 -o assym.o assym.s
 .endif
 
+.if ${MACHINE_CPUARCH} == "riscv"
+assym.o: assym.s
+	${AS} -msoft-float -o assym.o assym.s
+.endif
+
 .include <bsd.kmod.mk>
 
 CFLAGS+=	-include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h