From owner-svn-src-head@freebsd.org Wed Apr 5 17:56:22 2017 Return-Path: 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 94D22D30243; Wed, 5 Apr 2017 17:56:22 +0000 (UTC) (envelope-from bdrewery@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 64DAD9DE; Wed, 5 Apr 2017 17:56:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v35HuL9L089447; Wed, 5 Apr 2017 17:56:21 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v35HuLpB089446; Wed, 5 Apr 2017 17:56:21 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201704051756.v35HuLpB089446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 5 Apr 2017 17:56:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316534 - head/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.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Apr 2017 17:56:22 -0000 Author: bdrewery Date: Wed Apr 5 17:56:21 2017 New Revision: 316534 URL: https://svnweb.freebsd.org/changeset/base/316534 Log: Stop building assym.o into the module. DTrace includes assym.s, to build this we build assym.o, however this is unneeded as assym.s only contains macros. Remove the need to build this by removing it from OBJS, but keep assym.s in the module dependencies via DPSRCS. This fixes the build when there is no assembler, e.g. on arm64 without the external binutils. Submitted by: andrew MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D10041 Modified: head/sys/modules/dtrace/dtrace/Makefile Modified: head/sys/modules/dtrace/dtrace/Makefile ============================================================================== --- head/sys/modules/dtrace/dtrace/Makefile Wed Apr 5 17:56:17 2017 (r316533) +++ head/sys/modules/dtrace/dtrace/Makefile Wed Apr 5 17:56:21 2017 (r316534) @@ -27,7 +27,7 @@ CFLAGS+= -I${SYSDIR}/cddl/contrib/openso SRCS+= bus_if.h device_if.h vnode_if.h # Needed for dtrace_asm.S -SRCS+= assym.s +DPSRCS+= assym.s # These are needed for assym.s SRCS+= opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h @@ -55,20 +55,6 @@ EXPORT_SYMS= dtrace_register \ dtrace_asm.o: assym.s -.if ${MACHINE_CPUARCH} == "arm" -assym.o: assym.s - ${AS} -meabi=5 -o assym.o assym.s -.endif - -.if ${MACHINE_CPUARCH} == "riscv" -assym.o: assym.s -.if ${TARGET_ARCH:Mriscv*sf} - ${AS} -mfloat-abi=soft -o assym.o assym.s -.else - ${AS} -mfloat-abi=double -o assym.o assym.s -.endif -.endif - .include CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h