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.2.1
retrieving revision 1.7
diff -u -p -r1.6.2.1 -r1.7
--- src/compat/archdirs.mk	2015/06/01 19:38:35	1.6.2.1
+++ src/compat/archdirs.mk	2014/09/10 22:43:36	1.7
@@ -1,4 +1,4 @@
-#	$NetBSD: archdirs.mk,v 1.6.2.1 2015/06/01 19:38:35 snj Exp $
+#	$NetBSD: archdirs.mk,v 1.7 2014/09/10 22:43:36 matt Exp $
 
 # list of subdirs used per-platform
 
@@ -10,10 +10,18 @@ ARCHDIR_SUBDIR=	sparc64/sparc
 ARCHDIR_SUBDIR=	amd64/i386
 .endif
 
-.if !empty(MACHINE_ARCH:Mearm*)
+.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
+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