summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2016-01-20 01:09:53 +0000
committerjhb <jhb@FreeBSD.org>2016-01-20 01:09:53 +0000
commit77733541d454c3b987e985b85df345fc8c7f205d (patch)
tree06645c8b5fb21159a6ab7cfe6514945bca030b0f /sys/kern
parent2651e6b1c65c3a49c9390393bd44d1fc1d428f42 (diff)
downloadFreeBSD-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/kern')
-rw-r--r--sys/kern/makesyscalls.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 8be4896..1d3af65 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -410,6 +410,10 @@ s/\$//g
printf("\t\tuarg[%d] = (intptr_t) p->%s; /* %s */\n", \
i - 1, \
argname[i], arg) > systrace
+ else if (arg == "union l_semun")
+ printf("\t\tuarg[%d] = p->%s.buf; /* %s */\n", \
+ i - 1, \
+ argname[i], arg) > systrace
else if (substr(arg, 1, 1) == "u" || arg == "size_t")
printf("\t\tuarg[%d] = p->%s; /* %s */\n", \
i - 1, \
OpenPOWER on IntegriCloud