From owner-svn-src-head@freebsd.org  Thu Aug 11 13:42:33 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 260DABB5958;
 Thu, 11 Aug 2016 13:42:33 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EA75D13C7;
 Thu, 11 Aug 2016 13:42:32 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7BDgWOr016536;
 Thu, 11 Aug 2016 13:42:32 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7BDgWww016534;
 Thu, 11 Aug 2016 13:42:32 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201608111342.u7BDgWww016534@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Thu, 11 Aug 2016 13:42:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303959 - in head: share/mk sys/modules/dtrace/dtrace
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Aug 2016 13:42:33 -0000

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