Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/arm If neither COMPAT_NETBSD32 nor MODULAR is d...



details:   https://anonhg.NetBSD.org/src/rev/3ff267f9ea68
branches:  trunk
changeset: 1016215:3ff267f9ea68
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Nov 12 01:03:22 2020 +0000

description:
If neither COMPAT_NETBSD32 nor MODULAR is defined, there's
no chance for lwp to be running under COMPAT_NETBSD32.

Suggested by mrg.

diffstat:

 sys/arch/arm/arm/cpu_exec.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r d4154b733d8f -r 3ff267f9ea68 sys/arch/arm/arm/cpu_exec.c
--- a/sys/arch/arm/arm/cpu_exec.c       Thu Nov 12 00:44:22 2020 +0000
+++ b/sys/arch/arm/arm/cpu_exec.c       Thu Nov 12 01:03:22 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_exec.c,v 1.11 2020/11/10 21:40:07 rin Exp $        */
+/*     $NetBSD: cpu_exec.c,v 1.12 2020/11/12 01:03:22 rin Exp $        */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.11 2020/11/10 21:40:07 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.12 2020/11/12 01:03:22 rin Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -55,7 +55,11 @@
        const Elf_Ehdr * const eh = eh0;
        const bool elf_aapcs_p =
            (eh->e_flags & EF_ARM_EABIMASK) >= EF_ARM_EABI_VER4;
+#if defined(COMPAT_NETBSD32) || defined(MODULAR)
        const bool netbsd32_p = (epp->ep_esch->es_emul != &emul_netbsd);
+#else
+       const bool netbsd32_p = false;
+#endif
 #ifdef __ARM_EABI__
        const bool aapcs_p = true;
 #else



Home | Main Index | Thread Index | Old Index