[src/trunk]: src/sys/arch/arm/arm Stop turning on EABI flag to core files dum...

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

details:   https://anonhg.NetBSD.org/src/rev/8c9f3b46cd11
branches:  trunk
changeset: 945944:8c9f3b46cd11
user:      rin <rin%NetBSD.org@localhost>
date:      Tue Nov 10 21:38:03 2020 +0000

description:
Stop turning on EABI flag to core files dumped by OABI binaries.
This seems a bug introduced in rev 1.5:

http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/arm/arm/core_machdep.c#rev1.5

diffstat:

 sys/arch/arm/arm/core_machdep.c |  20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diffs (64 lines):

diff -r 0963659033e1 -r 8c9f3b46cd11 sys/arch/arm/arm/core_machdep.c
--- a/sys/arch/arm/arm/core_machdep.c   Tue Nov 10 20:52:28 2020 +0000
+++ b/sys/arch/arm/arm/core_machdep.c   Tue Nov 10 21:38:03 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: core_machdep.c,v 1.9 2019/11/20 19:37:51 pgoyette Exp $        */
+/*     $NetBSD: core_machdep.c,v 1.10 2020/11/10 21:38:03 rin Exp $    */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -37,11 +37,10 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.9 2019/11/20 19:37:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.10 2020/11/10 21:38:03 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
-#include "opt_compat_netbsd32.h"
 #else
 #define EXEC_ELF32 1
 #endif
@@ -61,9 +60,6 @@
 
 #ifdef EXEC_ELF32
 #include <sys/exec_elf.h>
-#ifdef COMPAT_NETBSD32
-#include <compat/netbsd32/netbsd32_exec.h>
-#endif
 #endif
 
 #include <machine/reg.h>
@@ -120,21 +116,16 @@
 void
 arm_netbsd_elf32_coredump_setup(struct lwp *l, void *arg)
 {
-#if defined(__ARMEB__) || defined(__ARM_EABI__) || defined(COMPAT_NETBSD32)
+#if defined(__ARMEB__) || defined(__ARM_EABI__)
        Elf_Ehdr * const eh = arg;
-#if defined(__ARM_EABI__) || defined(COMPAT_NETBSD32)
+#endif
+#ifdef __ARM_EABI__
        struct proc * const p = l->l_proc;
 
-#ifdef __ARM_EABI__
        if (p->p_emul == &emul_netbsd) {
                eh->e_flags |= EF_ARM_EABI_VER5;
        }
-#elif defined(COMPAT_NETBSD32)
-       if (p->p_emul == &emul_netbsd32) {
-               eh->e_flags |= EF_ARM_EABI_VER5;
-       }
 #endif
-#endif /* __ARM_EABI__ || COMPAT_NETBSD32 */
 #ifdef __ARMEB__
         if (CPU_IS_ARMV7_P()
            || (CPU_IS_ARMV6_P()
@@ -142,6 +133,5 @@
                eh->e_flags |= EF_ARM_BE8;
        }
 #endif
-#endif
 }
 #endif