From d47ff437ed491a2725872133c1279f1a0a912f65 Mon Sep 17 00:00:00 2001 From: bjh21 Date: Sat, 17 Feb 2001 21:18:40 +0000 Subject: [PATCH] Make both ARM ports support both NLIST_AOUT and NLIST_ELF32. --- lib/libc/gen/nlist_private.h | 7 +++---- usr.sbin/kvm_mkdb/extern.h | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/libc/gen/nlist_private.h b/lib/libc/gen/nlist_private.h index d1aac8aa372d..0591f6c55d52 100644 --- a/lib/libc/gen/nlist_private.h +++ b/lib/libc/gen/nlist_private.h @@ -1,4 +1,4 @@ -/* $NetBSD: nlist_private.h,v 1.10 2000/06/14 17:25:04 cgd Exp $ */ +/* $NetBSD: nlist_private.h,v 1.11 2001/02/17 21:18:40 bjh21 Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou @@ -37,13 +37,12 @@ #if defined(__alpha__) # define NLIST_ECOFF # define NLIST_ELF64 -#elif defined(__arm26__) -# define NLIST_ELF32 #elif defined(__mips__) # define NLIST_AOUT # define NLIST_ECOFF # define NLIST_ELF32 -#elif defined(__i386__) || defined (__m68k__) || defined(__powerpc__) +#elif defined(__arm__) || defined(__i386__) || defined (__m68k__) || \ + defined(__powerpc__) # define NLIST_AOUT # define NLIST_ELF32 #elif defined(__sparc__) diff --git a/usr.sbin/kvm_mkdb/extern.h b/usr.sbin/kvm_mkdb/extern.h index afc716284329..d2384809b693 100644 --- a/usr.sbin/kvm_mkdb/extern.h +++ b/usr.sbin/kvm_mkdb/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.12 2000/06/14 06:49:25 cgd Exp $ */ +/* $NetBSD: extern.h,v 1.13 2001/02/17 21:18:41 bjh21 Exp $ */ /*- * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -39,13 +39,12 @@ #if defined(__alpha__) # define NLIST_ECOFF # define NLIST_ELF64 -#elif defined(__arm26__) -# define NLIST_ELF32 #elif defined(__mips__) # define NLIST_AOUT # define NLIST_ECOFF # define NLIST_ELF32 -#elif defined(__i386__) || defined(__m68k__) || defined(__powerpc__) +#elif defined(__arm__) || defined(__i386__) || defined(__m68k__) || \ + defined(__powerpc__) # define NLIST_AOUT # define NLIST_ELF32 #elif defined(__sparc__)