[src/trunk]: src/sys/modules/compat_linux Modularize compat_linux(8) for aarc...

[ryo <ryo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef62a610da92
branches:  trunk
changeset: 1024075:ef62a610da92
user:      ryo <ryo%NetBSD.org@localhost>
date:      Sat Oct 09 07:01:34 2021 +0000

description:
Modularize compat_linux(8) for aarch64.

diffstat:

 distrib/sets/lists/debug/module.ad.aarch64    |   4 +++-
 distrib/sets/lists/modules/ad.aarch64         |   4 +++-
 sys/compat/linux/arch/aarch64/linux_machdep.c |   6 ++++--
 sys/modules/Makefile                          |   6 +++++-
 sys/modules/compat_linux/Makefile             |  11 ++++++++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diffs (98 lines):

diff -r e8ed3ae2ea59 -r ef62a610da92 distrib/sets/lists/debug/module.ad.aarch64
--- a/distrib/sets/lists/debug/module.ad.aarch64        Fri Oct 08 23:55:44 2021 +0000
+++ b/distrib/sets/lists/debug/module.ad.aarch64        Sat Oct 09 07:01:34 2021 +0000
@@ -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
diff -r e8ed3ae2ea59 -r ef62a610da92 distrib/sets/lists/modules/ad.aarch64
--- a/distrib/sets/lists/modules/ad.aarch64     Fri Oct 08 23:55:44 2021 +0000
+++ b/distrib/sets/lists/modules/ad.aarch64     Sat Oct 09 07:01:34 2021 +0000
@@ -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
diff -r e8ed3ae2ea59 -r ef62a610da92 sys/compat/linux/arch/aarch64/linux_machdep.c
--- a/sys/compat/linux/arch/aarch64/linux_machdep.c     Fri Oct 08 23:55:44 2021 +0000
+++ b/sys/compat/linux/arch/aarch64/linux_machdep.c     Sat Oct 09 07:01:34 2021 +0000
@@ -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 <ryo%nerv.org@localhost>
@@ -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 @@
 #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>
 
diff -r e8ed3ae2ea59 -r ef62a610da92 sys/modules/Makefile
--- a/sys/modules/Makefile      Fri Oct 08 23:55:44 2021 +0000
+++ b/sys/modules/Makefile      Sat Oct 09 07:01:34 2021 +0000
@@ -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+=       wbsio
 .endif
 
+.if ${MACHINE_CPU} == "aarch64"
+SUBDIR+=       compat_linux
+.endif
+
 .if ${MACHINE_CPU} == "m68k"
 SUBDIR+=       compat_aoutm68k
 #SUBDIR+=      compat_linux
diff -r e8ed3ae2ea59 -r ef62a610da92 sys/modules/compat_linux/Makefile
--- a/sys/modules/compat_linux/Makefile Fri Oct 08 23:55:44 2021 +0000
+++ b/sys/modules/compat_linux/Makefile Sat Oct 09 07:01:34 2021 +0000
@@ -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_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