summaryrefslogtreecommitdiff
path: root/sys/compat/linux32
diff options
context:
space:
mode:
authorpgoyette <pgoyette@NetBSD.org>2019-01-27 02:08:33 +0000
committerpgoyette <pgoyette@NetBSD.org>2019-01-27 02:08:33 +0000
commitcc17ee2ece085d7d746bcd8fa9be19170855aaac (patch)
tree5be40613f405cb081b2c44410b1506781927f8e3 /sys/compat/linux32
parent10dd4cc92542aa04b0e59469a484a48e4c3cdd24 (diff)
Merge the [pgoyette-compat] branch
Diffstat (limited to 'sys/compat/linux32')
-rw-r--r--sys/compat/linux32/common/linux32_mod.c13
-rw-r--r--sys/compat/linux32/files.linux326
2 files changed, 12 insertions, 7 deletions
diff --git a/sys/compat/linux32/common/linux32_mod.c b/sys/compat/linux32/common/linux32_mod.c
index 0f69a15d1c8..de14ce1bc84 100644
--- a/sys/compat/linux32/common/linux32_mod.c
+++ b/sys/compat/linux32/common/linux32_mod.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_mod.c,v 1.11 2017/12/10 00:43:05 kre Exp $ */
+/* $NetBSD: linux32_mod.c,v 1.12 2019/01/27 02:08:40 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11 2017/12/10 00:43:05 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.12 2019/01/27 02:08:40 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -52,12 +52,15 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11 2017/12/10 00:43:05 kre Exp $")
#include <compat/linux32/common/linux32_exec.h>
#if defined(EXEC_ELF32)
-# define MD1 ",exec_elf32,compat_netbsd32,compat_netbsd32_sysvipc"
+# define MD1 ",exec_elf32,compat_netbsd32,compat_netbsd32_sysvipc"
#else
-# define MD1 ""
+# define MD1 ""
#endif
-MODULE(MODULE_CLASS_EXEC, compat_linux32, "compat_linux" MD1);
+#define REQ1 "compat_linux,sysv_ipc,compat_sysv_50"
+#define REQ2 ",compat_netbsd32_50,compat_netbsd32_43"
+
+MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 MD1);
static struct execsw linux32_execsw[] = {
#if defined(EXEC_ELF32)
diff --git a/sys/compat/linux32/files.linux32 b/sys/compat/linux32/files.linux32
index d998b006add..908075715b2 100644
--- a/sys/compat/linux32/files.linux32
+++ b/sys/compat/linux32/files.linux32
@@ -1,4 +1,4 @@
-# $NetBSD: files.linux32,v 1.6 2014/11/17 01:01:57 uebayasi Exp $
+# $NetBSD: files.linux32,v 1.7 2019/01/27 02:08:40 pgoyette Exp $
#
# Config file description for machine-independent Linux 32 bit compat code.
# Included by ports that need it.
@@ -6,7 +6,9 @@
# ports should define any machine-specific files they need in their
# own file lists.
-define compat_linux32
+define compat_linux32 : exec_elf32, compat_netbsd32,
+ compat_netbsd32_sysv_ipc, compat_linux,
+ compat_sysv
file compat/linux32/common/linux32_dirent.c compat_linux32
file compat/linux32/common/linux32_exec.c compat_linux32
file compat/linux32/common/linux32_exec_elf32.c compat_linux32 & exec_elf32