svn commit: r316534 - head/sys/modules/dtrace/dtrace

[Bryan Drewery]

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 <bsd.kmod.mk>
 
 CFLAGS+=	-include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h