[src/pgoyette-compat]: src/sys/compat/linux32/common Restore the MD-vs-REQ re...

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

details:   https://anonhg.NetBSD.org/src/rev/1a3d48ae3010
branches:  pgoyette-compat
changeset: 447802:1a3d48ae3010
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Jan 24 06:48:27 2019 +0000

description:
Restore the MD-vs-REQ requirements structure, just in case

diffstat:

 sys/compat/linux32/common/linux32_mod.c |  17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 7b414722241a -r 1a3d48ae3010 sys/compat/linux32/common/linux32_mod.c
--- a/sys/compat/linux32/common/linux32_mod.c   Thu Jan 24 06:23:26 2019 +0000
+++ b/sys/compat/linux32/common/linux32_mod.c   Thu Jan 24 06:48:27 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux32_mod.c,v 1.11.2.4 2019/01/24 06:23:26 pgoyette Exp $    */
+/*     $NetBSD: linux32_mod.c,v 1.11.2.5 2019/01/24 06:48:27 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.2.4 2019/01/24 06:23:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.5 2019/01/24 06:48:27 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -51,11 +51,16 @@
 #include <compat/linux32/common/linux32_sysctl.h>
 #include <compat/linux32/common/linux32_exec.h>
 
-#define        REQ1    "exec_elf32,compat_netbsd32,compat_linux"
-#define        REQ2    ",sysv_ipc,compat_netbsd32_sysvipc,compat_sysv_50"
-#define        REQ3    ",compat_netbsd32_50,compat_netbsd32_43"
+#if defined(EXEC_ELF32)
+# define       MD1     ",exec_elf32,compat_netbsd32,compat_netbsd32_sysvipc"
+#else
+# define       MD1     ""
+#endif
 
-MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3);
+#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)