diff options
author | jhb <jhb@FreeBSD.org> | 2016-01-20 01:09:53 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2016-01-20 01:09:53 +0000 |
commit | 77733541d454c3b987e985b85df345fc8c7f205d (patch) | |
tree | 06645c8b5fb21159a6ab7cfe6514945bca030b0f /sys/modules/dtrace/Makefile | |
parent | 2651e6b1c65c3a49c9390393bd44d1fc1d428f42 (diff) | |
download | FreeBSD-src-77733541d454c3b987e985b85df345fc8c7f205d.zip FreeBSD-src-77733541d454c3b987e985b85df345fc8c7f205d.tar.gz |
MFC 289769,289822,290143,290144:
Rename remaining linux32 symbols from linux_* to linux32_*.
289769:
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.
289822:
Fix build for the KTR-enabled kernels.
290143:
Fix build with DEBUG defined.
290144:
Update for LINUX32 rename. The assembler didn't complain about undefined
symbols but just used 0 after the rename.
Diffstat (limited to 'sys/modules/dtrace/Makefile')
-rw-r--r-- | sys/modules/dtrace/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 1b12371..9f3c993 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -16,7 +16,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 |