Sun Nov 8 02:02:37 2015 UTC ()
Pull up following revision(s) (requested by pgoyette in ticket #1020):
	sys/compat/netbsd32/netbsd32_mod.c: revision 1.6
	sys/compat/netbsd32/netbsd32_mod.c: revision 1.7
	sys/compat/netbsd32/netbsd32_mod.c: revision 1.8
	sys/compat/netbsd32/netbsd32_mod.c: revision 1.9
	sys/compat/linux/common/linux_mod.c: revision 1.5
Add an additional dependency on compat_sysv
Add another dependency for nfsserver
And yet another dependency, this time on mq
Ooops, spell the module name in full. "mqueue" vs "mq"
we need compat_sysv now.


(riz)
diff -r1.4 -r1.4.4.1 src/sys/compat/linux/common/linux_mod.c
diff -r1.5 -r1.5.2.1 src/sys/compat/netbsd32/netbsd32_mod.c
cvs diff -r1.4 -r1.4.4.1 src/sys/compat/linux/common/linux_mod.c (expand / switch to unified diff)

--- src/sys/compat/linux/common/linux_mod.c 2014/03/07 01:33:43 1.4
+++ src/sys/compat/linux/common/linux_mod.c 2015/11/08 02:02:37 1.4.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: linux_mod.c,v 1.4 2014/03/07 01:33:43 christos Exp $ */ 1/* $NetBSD: linux_mod.c,v 1.4.4.1 2015/11/08 02:02:37 riz Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 2008 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software developed for The NetBSD Foundation 7 * This code is derived from software developed for The NetBSD Foundation
8 * by Andrew Doran. 8 * by Andrew Doran.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.4 2014/03/07 01:33:43 christos Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.4.4.1 2015/11/08 02:02:37 riz Exp $");
34 34
35#ifdef _KERNEL_OPT 35#ifdef _KERNEL_OPT
36#include "opt_execfmt.h" 36#include "opt_execfmt.h"
37#endif 37#endif
38 38
39#ifndef ELFSIZE 39#ifndef ELFSIZE
40#define ELFSIZE ARCH_ELFSIZE 40#define ELFSIZE ARCH_ELFSIZE
41#endif 41#endif
42 42
43#include <sys/param.h> 43#include <sys/param.h>
44#include <sys/module.h> 44#include <sys/module.h>
45#include <sys/exec.h> 45#include <sys/exec.h>
46#include <sys/signalvar.h> 46#include <sys/signalvar.h>
@@ -55,27 +55,28 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c, @@ -55,27 +55,28 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c,
55# define MD1 "" 55# define MD1 ""
56#endif 56#endif
57#if defined(EXEC_ELF64) 57#if defined(EXEC_ELF64)
58# define MD2 ",exec_elf64" 58# define MD2 ",exec_elf64"
59#else 59#else
60# define MD2 "" 60# define MD2 ""
61#endif 61#endif
62#if defined(EXEC_AOUT) 62#if defined(EXEC_AOUT)
63# define MD3 ",exec_aout" 63# define MD3 ",exec_aout"
64#else 64#else
65# define MD3 "" 65# define MD3 ""
66#endif 66#endif
67 67
68MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio" MD1 MD2 MD3); 68MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio,compat_sysv"
 69 MD1 MD2 MD3);
69 70
70static struct execsw linux_execsw[] = { 71static struct execsw linux_execsw[] = {
71#if defined(EXEC_ELF32) && ELFSIZE == 32 72#if defined(EXEC_ELF32) && ELFSIZE == 32
72 { 73 {
73 .es_hdrsz = sizeof (Elf32_Ehdr), 74 .es_hdrsz = sizeof (Elf32_Ehdr),
74 .es_makecmds = exec_elf32_makecmds, 75 .es_makecmds = exec_elf32_makecmds,
75 .u = { 76 .u = {
76 .elf_probe_func = linux_elf32_probe, 77 .elf_probe_func = linux_elf32_probe,
77 }, 78 },
78 .es_emul = &emul_linux, 79 .es_emul = &emul_linux,
79 .es_prio = EXECSW_PRIO_ANY, 80 .es_prio = EXECSW_PRIO_ANY,
80 .es_arglen = LINUX_ELF_AUX_ARGSIZ, 81 .es_arglen = LINUX_ELF_AUX_ARGSIZ,
81 .es_copyargs = linux_elf32_copyargs, 82 .es_copyargs = linux_elf32_copyargs,
cvs diff -r1.5 -r1.5.2.1 src/sys/compat/netbsd32/netbsd32_mod.c (expand / switch to unified diff)

--- src/sys/compat/netbsd32/netbsd32_mod.c 2014/07/22 08:18:33 1.5
+++ src/sys/compat/netbsd32/netbsd32_mod.c 2015/11/08 02:02:36 1.5.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: netbsd32_mod.c,v 1.5 2014/07/22 08:18:33 maxv Exp $ */ 1/* $NetBSD: netbsd32_mod.c,v 1.5.2.1 2015/11/08 02:02:36 riz Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 2008 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software developed for The NetBSD Foundation 7 * This code is derived from software developed for The NetBSD Foundation
8 * by Andrew Doran. 8 * by Andrew Doran.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,33 +20,33 @@ @@ -20,33 +20,33 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.5 2014/07/22 08:18:33 maxv Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.5.2.1 2015/11/08 02:02:36 riz Exp $");
34 34
35#ifdef _KERNEL_OPT 35#ifdef _KERNEL_OPT
36#include "opt_execfmt.h" 36#include "opt_execfmt.h"
37# define DEPS1 "compat" 37# define DEPS1 "compat,compat_sysv,nfsserver,mqueue"
38#else 38#else
39# define DEPS1 "compat,ksem" 39# define DEPS1 "compat,compat_sysv,nfsserver,mqueue,ksem"
40#endif 40#endif
41 41
42#ifndef ELFSIZE 42#ifndef ELFSIZE
43#define ELFSIZE ARCH_ELFSIZE 43#define ELFSIZE ARCH_ELFSIZE
44#endif 44#endif
45 45
46#include <sys/param.h> 46#include <sys/param.h>
47#include <sys/module.h> 47#include <sys/module.h>
48#include <sys/exec.h> 48#include <sys/exec.h>
49#include <sys/exec_elf.h> 49#include <sys/exec_elf.h>
50 50
51#include <compat/netbsd32/netbsd32_sysctl.h> 51#include <compat/netbsd32/netbsd32_sysctl.h>
52#include <compat/netbsd32/netbsd32_exec.h> 52#include <compat/netbsd32/netbsd32_exec.h>