From 690eda7bb4bfdbe1d2c85b4aeacd0229017495ab Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Mon, 8 Jun 2015 04:08:30 +0000
Subject: [PATCH] Avoid defining MLIBDIR.  Use ${MLIBDIR:Unone} instead.

---
 lib/libarch/Makefile            | 4 ++--
 lib/libarch/i386/Makefile.inc   | 6 ++----
 lib/libarch/x86_64/Makefile.inc | 6 ++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/libarch/Makefile b/lib/libarch/Makefile
index 03135693bd2f..ba45d2b9a23d 100644
--- a/lib/libarch/Makefile
+++ b/lib/libarch/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2014/08/10 23:25:49 matt Exp $
+#	$NetBSD: Makefile,v 1.29 2015/06/08 04:08:30 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -18,7 +18,7 @@ LIBC_MACHINE_CPU?=	${MACHINE_CPU}
 
 # Build the library if SRCS is now defined ...
 .if defined(SRCS)
-.if defined(MLIBDIR) && ${MLIBDIR} != "none" && ${LIBC_MACHINE_CPU} != "arm"
+.if defined(MLIBDIR) && ${LIBC_MACHINE_CPU} != "arm"
 LIB=	${MLIBDIR}
 .else
 LIB=	${LIBC_MACHINE_CPU}
diff --git a/lib/libarch/i386/Makefile.inc b/lib/libarch/i386/Makefile.inc
index f2d8b8bf5292..90e4e2d09bde 100644
--- a/lib/libarch/i386/Makefile.inc
+++ b/lib/libarch/i386/Makefile.inc
@@ -1,8 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.14 2009/12/13 08:25:20 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.15 2015/06/08 04:08:30 matt Exp $
 
-MLIBDIR?=	none
-
-.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR} == "i386")
+.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR:Unone} == "i386")
 SRCS+=	i386_get_ldt.c i386_set_ldt.c \
 	i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
 	i386_vm86.c i386_pmc.c i386_mtrr.c
diff --git a/lib/libarch/x86_64/Makefile.inc b/lib/libarch/x86_64/Makefile.inc
index bfbf19c8d1f4..6286c30e1acc 100644
--- a/lib/libarch/x86_64/Makefile.inc
+++ b/lib/libarch/x86_64/Makefile.inc
@@ -1,8 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/12/13 08:25:20 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2015/06/08 04:08:30 matt Exp $
 
-MLIBDIR?=	none
-
-.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR} != "i386")
+.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386")
 SRCS+=	x86_64_mtrr.c x86_64_iopl.c
 .endif