[src/trunk]: src/compat Fix broken subdir selection after arm architecture ex...

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

details:   https://anonhg.NetBSD.org/src/rev/169fed00813b
branches:  trunk
changeset: 338453:169fed00813b
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 25 12:42:26 2015 +0000

description:
Fix broken subdir selection after arm architecture explosion

diffstat:

 compat/archdirs.mk |  16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diffs (33 lines):

diff -r e01c5aa5cb7b -r 169fed00813b compat/archdirs.mk
--- a/compat/archdirs.mk        Mon May 25 10:40:23 2015 +0000
+++ b/compat/archdirs.mk        Mon May 25 12:42:26 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: archdirs.mk,v 1.8 2014/09/19 17:38:46 matt Exp $
+#      $NetBSD: archdirs.mk,v 1.9 2015/05/25 12:42:26 martin Exp $
 
 # list of subdirs used per-platform
 
@@ -10,18 +10,14 @@
 ARCHDIR_SUBDIR=        amd64/i386
 .endif
 
-.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
+.if !empty(MACHINE_ARCH:Mearmhf*) || !empty(MACHINE_ARCH:Mearmv?hf*)
+ARCHDIR_SUBDIR=        arm/oabi arm/eabi
+.elif !empty(MACHINE_ARCH:Mearm*)
+ARCHDIR_SUBDIR=        arm/oabi
+.elif !empty(MACHINE_ARCH:Marm)
 ARCHDIR_SUBDIR=        arm/eabi
 .endif
 
-.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
-ARCHDIR_SUBDIR=        arm/oabi
-.endif
-
-.if (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
-ARCHDIR_SUBDIR=        arm/oabi arm/eabi
-.endif
-
 .if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
 ARCHDIR_SUBDIR=        mips64/64 mips64/o32
 .endif