Module Name: src
Committed By: ryo
Date: Sat Oct 9 07:01:35 UTC 2021
Modified Files:
src/distrib/sets/lists/debug: module.ad.aarch64
src/distrib/sets/lists/modules: ad.aarch64
src/sys/compat/linux/arch/aarch64: linux_machdep.c
src/sys/modules: Makefile
src/sys/modules/compat_linux: Makefile
Log Message:
Modularize compat_linux(8) for aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug/module.ad.aarch64
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/modules/ad.aarch64
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/linux/arch/aarch64/linux_machdep.c
cvs rdiff -u -r1.257 -r1.258 src/sys/modules/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/compat_linux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/module.ad.aarch64
diff -u src/distrib/sets/lists/debug/module.ad.aarch64:1.2 src/distrib/sets/lists/debug/module.ad.aarch64:1.3
--- src/distrib/sets/lists/debug/module.ad.aarch64:1.2 Sun Nov 1 18:51:34 2020
+++ src/distrib/sets/lists/debug/module.ad.aarch64 Sat Oct 9 07:01:34 2021
@@ -1,6 +1,8 @@
-# $NetBSD: module.ad.aarch64,v 1.2 2020/11/01 18:51:34 pgoyette Exp $
+# $NetBSD: module.ad.aarch64,v 1.3 2021/10/09 07:01:34 ryo Exp $
./usr/libdata/debug/@MODULEDIR@/bpfjit modules-base-kernel kmod,sljit,debug
./usr/libdata/debug/@MODULEDIR@/bpfjit/bpfjit.kmod.debug modules-base-kernel kmod,sljit,debug
+./usr/libdata/debug/@MODULEDIR@/compat_linux modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/compat_linux/compat_linux.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/compat_netbsd32 modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_09 modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/modules/ad.aarch64
diff -u src/distrib/sets/lists/modules/ad.aarch64:1.8 src/distrib/sets/lists/modules/ad.aarch64:1.9
--- src/distrib/sets/lists/modules/ad.aarch64:1.8 Sun Nov 1 18:51:34 2020
+++ src/distrib/sets/lists/modules/ad.aarch64 Sat Oct 9 07:01:34 2021
@@ -1,6 +1,8 @@
-# $NetBSD: ad.aarch64,v 1.8 2020/11/01 18:51:34 pgoyette Exp $
+# $NetBSD: ad.aarch64,v 1.9 2021/10/09 07:01:34 ryo Exp $
./@MODULEDIR@/bpfjit modules-base-kernel kmod,sljit
./@MODULEDIR@/bpfjit/bpfjit.kmod modules-base-kernel kmod,sljit
+./@MODULEDIR@/compat_linux modules-base-kernel kmod
+./@MODULEDIR@/compat_linux/compat_linux.kmod modules-base-kernel kmod
./@MODULEDIR@/compat_netbsd32 modules-base-kernel kmod
./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod modules-base-kernel kmod
./@MODULEDIR@/compat_netbsd32_09 modules-base-kernel kmod
Index: src/sys/compat/linux/arch/aarch64/linux_machdep.c
diff -u src/sys/compat/linux/arch/aarch64/linux_machdep.c:1.1 src/sys/compat/linux/arch/aarch64/linux_machdep.c:1.2
--- src/sys/compat/linux/arch/aarch64/linux_machdep.c:1.1 Thu Sep 23 06:56:27 2021
+++ src/sys/compat/linux/arch/aarch64/linux_machdep.c Sat Oct 9 07:01:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.1 2021/09/23 06:56:27 ryo Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.2 2021/10/09 07:01:34 ryo Exp $ */
/*-
* Copyright (c) 2021 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.1 2021/09/23 06:56:27 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.2 2021/10/09 07:01:34 ryo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,6 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#include <compat/linux/common/linux_ioctl.h>
#include <compat/linux/common/linux_prctl.h>
#include <compat/linux/common/linux_machdep.h>
+#include <compat/linux/common/linux_ipc.h>
+#include <compat/linux/common/linux_sem.h>
#include <compat/linux/linux_syscall.h>
#include <compat/linux/linux_syscallargs.h>
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.257 src/sys/modules/Makefile:1.258
--- src/sys/modules/Makefile:1.257 Sun Oct 3 17:27:02 2021
+++ src/sys/modules/Makefile Sat Oct 9 07:01:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.257 2021/10/03 17:27:02 brad Exp $
+# $NetBSD: Makefile,v 1.258 2021/10/09 07:01:34 ryo Exp $
.include <bsd.own.mk>
@@ -361,6 +361,10 @@ SUBDIR+= lm_wbsio
SUBDIR+= wbsio
.endif
+.if ${MACHINE_CPU} == "aarch64"
+SUBDIR+= compat_linux
+.endif
+
.if ${MACHINE_CPU} == "m68k"
SUBDIR+= compat_aoutm68k
#SUBDIR+= compat_linux
Index: src/sys/modules/compat_linux/Makefile
diff -u src/sys/modules/compat_linux/Makefile:1.5 src/sys/modules/compat_linux/Makefile:1.6
--- src/sys/modules/compat_linux/Makefile:1.5 Sun Feb 17 04:05:45 2019
+++ src/sys/modules/compat_linux/Makefile Sat Oct 9 07:01:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/02/17 04:05:45 rin Exp $
+# $NetBSD: Makefile,v 1.6 2021/10/09 07:01:35 ryo Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -14,6 +14,15 @@ SRCS+= linux_ipc.c linux_misc.c linux_mt
SRCS+= linux_sg.c linux_signal.c linux_signo.c linux_socket.c
SRCS+= linux_sysctl.c linux_termios.c linux_time.c linux_mod.c
+.if ${MACHINE_CPU} == "aarch64"
+CPPFLAGS+= -DEXEC_ELF64
+.PATH: ${S}/arch/aarch64/aarch64
+.PATH: ${S}/compat/linux/arch/aarch64
+SRCS+= linux_machdep.c linux_syscalls.c linux_sysent.c linux_commons.c
+SRCS+= linux_exec_elf64.c
+SRCS+= linux_sigcode.c linux_syscall.c
+.endif
+
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS+= -DEXEC_ELF32 -DEXEC_AOUT
.PATH: ${S}/arch/i386/i386
