From cc17ee2ece085d7d746bcd8fa9be19170855aaac Mon Sep 17 00:00:00 2001 From: pgoyette Date: Sun, 27 Jan 2019 02:08:33 +0000 Subject: Merge the [pgoyette-compat] branch --- sys/compat/linux/common/linux_exec_elf32.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'sys/compat/linux/common/linux_exec_elf32.c') diff --git a/sys/compat/linux/common/linux_exec_elf32.c b/sys/compat/linux/common/linux_exec_elf32.c index 2850b514dc5..96d188215a7 100644 --- a/sys/compat/linux/common/linux_exec_elf32.c +++ b/sys/compat/linux/common/linux_exec_elf32.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_elf32.c,v 1.97 2018/07/15 21:31:00 christos Exp $ */ +/* $NetBSD: linux_exec_elf32.c,v 1.98 2019/01/27 02:08:40 pgoyette Exp $ */ /*- * Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.97 2018/07/15 21:31:00 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.98 2019/01/27 02:08:40 pgoyette Exp $"); #ifndef ELFSIZE /* XXX should die */ @@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.97 2018/07/15 21:31:00 christ #include #include #include +#include #include #include @@ -334,11 +335,8 @@ ELFNAME2(linux,go_rt0_signature)(struct lwp *l, struct exec_package *epp, Elf_Eh goto out; #if (ELFSIZE == 32) - extern const char machine32[] __weak; - if (machine32 != NULL) - m = machine32; - else - m = machine; + extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook; + MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m); #else m = machine; #endif -- cgit