diff options
author | John Baldwin <jhb@FreeBSD.org> | 2015-10-22 21:28:20 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2015-10-22 21:28:20 +0000 |
commit | 2f99bcce1ebf7f5723f98529176226dd9118e2a5 (patch) | |
tree | 24a943ba920de041a337bc369f1a55629ba2a11d /sys/modules | |
parent | 5047105b71920e328a9cc3f033e4f777c0467fe4 (diff) | |
download | src-2f99bcce1ebf7f5723f98529176226dd9118e2a5.tar.gz src-2f99bcce1ebf7f5723f98529176226dd9118e2a5.zip |
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
Notes
Notes:
svn path=/head/; revision=289769
Diffstat (limited to 'sys/modules')
-rw-r--r-- | sys/modules/dtrace/Makefile | 5 | ||||
-rw-r--r-- | sys/modules/dtrace/systrace_linux/Makefile | 18 | ||||
-rw-r--r-- | sys/modules/dtrace/systrace_linux32/Makefile | 6 |
3 files changed, 23 insertions, 6 deletions
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 7be4c32889c5..e5264db1a10b 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 diff --git a/sys/modules/dtrace/systrace_linux/Makefile b/sys/modules/dtrace/systrace_linux/Makefile new file mode 100644 index 000000000000..1cf5e3170516 --- /dev/null +++ b/sys/modules/dtrace/systrace_linux/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev/systrace + +KMOD= systrace_linux + +SRCS= systrace.c +SRCS+= vnode_if.h + +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} -DLINUX_SYSTRACE + +.include <bsd.kmod.mk> + +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h diff --git a/sys/modules/dtrace/systrace_linux32/Makefile b/sys/modules/dtrace/systrace_linux32/Makefile index b3eedeea1d53..db798c39b256 100644 --- a/sys/modules/dtrace/systrace_linux32/Makefile +++ b/sys/modules/dtrace/systrace_linux32/Makefile @@ -4,18 +4,14 @@ SYSDIR?= ${.CURDIR}/../../.. .PATH: ${SYSDIR}/cddl/dev/systrace -.if ${MACHINE} == "amd64" KMOD= systrace_linux32 -.else -KMOD= systrace_linux -.endif SRCS= systrace.c SRCS+= vnode_if.h CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ - -I${SYSDIR} -DLINUX_SYSTRACE + -I${SYSDIR} -DLINUX32_SYSTRACE .include <bsd.kmod.mk> |