aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2020-12-05 14:53:24 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2020-12-05 14:53:24 +0000
commitdf4ca45cf943fb62c7771e479f5f999570ec6928 (patch)
tree50d2190127b4e76e8cca3c881c4f897a280df989
parent4f1efa309ca48a088595dd57969ae6a397dd49d1 (diff)
downloadsrc-df4ca45cf943fb62c7771e479f5f999570ec6928.tar.gz
src-df4ca45cf943fb62c7771e479f5f999570ec6928.zip
Fix i386 linux module after r367395.
In r367395 parts of machine dependent linux_dummy.c were moved to a new machine independent file sys/compat/linux/linux_dummy.c and the existing linux_dummy.c was renamed to linux_dummy_machdep.c. Add linux_dummy_machdep.c to the linux module for i386. Rename sys/amd64/linux32/linux_dummy.c for consistency. Add the new linux_dummy.c to the linux module for i386.
Notes
Notes: svn path=/head/; revision=368372
-rw-r--r--sys/amd64/linux32/linux32_dummy_machdep.c (renamed from sys/amd64/linux32/linux32_dummy.c)0
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/modules/linux/Makefile4
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy_machdep.c
index 5eb54fefd276..5eb54fefd276 100644
--- a/sys/amd64/linux32/linux32_dummy.c
+++ b/sys/amd64/linux32/linux32_dummy_machdep.c
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 9ad1b238ec69..983fea2cb8c2 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -405,7 +405,7 @@ compat/linsysfs/linsysfs.c optional linsysfs
#
# Linux/i386 binary support
#
-amd64/linux32/linux32_dummy.c optional compat_linux32
+amd64/linux32/linux32_dummy_machdep.c optional compat_linux32
amd64/linux32/linux32_machdep.c optional compat_linux32
amd64/linux32/linux32_support.s optional compat_linux32 \
dependency "linux32_assym.h"
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 0873e22c0832..49d787e2cb99 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -13,7 +13,7 @@ CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32
VDSO= linux${SFX}_vdso
KMOD= linux
-SRCS= linux_fork.c linux${SFX}_dummy.c linux_file.c linux_event.c \
+SRCS= linux_fork.c linux${SFX}_dummy_machdep.c linux_file.c linux_event.c \
linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \
linux${SFX}_machdep.c linux_misc.c linux_signal.c \
linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
@@ -41,7 +41,7 @@ OBJS= ${VDSO}.so
.if ${MACHINE_CPUARCH} == "i386"
SRCS+= linux_ptrace.c imgact_linux.c linux_util.c linux_mib.c linux_mmap.c \
- linux_emul.c linux_errno.c opt_cpu.h linux.c
+ linux_dummy.c linux_emul.c linux_errno.c opt_cpu.h linux.c
.endif
.if ${MACHINE_CPUARCH} == "i386"