summaryrefslogtreecommitdiffstats
path: root/sys/modules/dtrace/Makefile
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2015-10-22 21:28:20 +0000
committerjhb <jhb@FreeBSD.org>2015-10-22 21:28:20 +0000
commit9740ac3060b33574f581db8a7ee96240749c81ed (patch)
tree24a943ba920de041a337bc369f1a55629ba2a11d /sys/modules/dtrace/Makefile
parent2705fe5cc132ba44ee6bdb210ae3bff5be670722 (diff)
downloadFreeBSD-src-9740ac3060b33574f581db8a7ee96240749c81ed.zip
FreeBSD-src-9740ac3060b33574f581db8a7ee96240749c81ed.tar.gz
Rename remaining linux32 symbols such as linux_sysent[] and
linux_syscallnames[] from linux_* to linux32_* to avoid conflicts with linux64.ko. While here, add support for linux64 binaries to systrace. - Update NOPROTO entries in amd64/linux/syscalls.master to match the main table to fix systrace build. - Add a special case for union l_semun arguments to the systrace generation. - The systrace_linux32 module now only builds the systrace_linux32.ko. module on amd64. - Add a new systrace_linux module that builds on both i386 and amd64. For i386 it builds the existing systrace_linux.ko. For amd64 it builds a systrace_linux.ko for 64-bit binaries. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D3954
Diffstat (limited to 'sys/modules/dtrace/Makefile')
-rw-r--r--sys/modules/dtrace/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile
index 7be4c32..e5264db 100644
--- a/sys/modules/dtrace/Makefile
+++ b/sys/modules/dtrace/Makefile
@@ -13,7 +13,10 @@ SUBDIR= dtmalloc \
systrace
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-SUBDIR+= fasttrap fbt systrace_linux32
+SUBDIR+= fasttrap fbt systrace_linux
+.endif
+.if ${MACHINE_CPUARCH} == "amd64"
+SUBDIR+= systrace_linux32
.endif
.if ${MACHINE_CPUARCH} == "powerpc"
SUBDIR+= fbt fasttrap
OpenPOWER on IntegriCloud