From 9c0e1d45c511d65609532dd5607de79535cebdff Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 5 Apr 2017 17:56:21 +0000 Subject: [PATCH] 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 --- sys/modules/dtrace/dtrace/Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile index 40a0e6d08b2..b9553c6be1b 100644 --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -27,7 +27,7 @@ CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/intel \ 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