Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/compat/archdirs.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/compat/archdirs.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -p -r1.6 -r1.6.2.1
--- src/compat/archdirs.mk	2014/08/11 04:33:30	1.6
+++ src/compat/archdirs.mk	2015/06/01 19:38:35	1.6.2.1
@@ -1,4 +1,4 @@
-#	$NetBSD: archdirs.mk,v 1.6 2014/08/11 04:33:30 matt Exp $
+#	$NetBSD: archdirs.mk,v 1.6.2.1 2015/06/01 19:38:35 snj Exp $
 
 # list of subdirs used per-platform
 
@@ -10,18 +10,10 @@ ARCHDIR_SUBDIR=	sparc64/sparc
 ARCHDIR_SUBDIR=	amd64/i386
 .endif
 
-.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
-ARCHDIR_SUBDIR=	arm/eabi
-.endif
-
-.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
+.if !empty(MACHINE_ARCH:Mearm*)
 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
@@ -32,7 +24,7 @@ ARCHDIR_SUBDIR= powerpc64/powerpc
 
 .if (${MACHINE_ARCH} == "aarch64")
 ARCHDIR_SUBDIR+= arm/eabi
-#ARCHDIR_SUBDIR+= arm/eabihf
+ARCHDIR_SUBDIR+= arm/eabihf
 ARCHDIR_SUBDIR+= arm/oabi
 .elif (${MACHINE_ARCH} == "aarch64eb")
 ARCHDIR_SUBDIR= arm/eabi