d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop building assym.o into the module.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2017-04-05 17:56:21 +00:00
parent f8a35ad1bd
commit 9c0e1d45c5
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/modules/dtrace/dtrace/Makefile
View File

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