From f09c2e014f0443e18efc23ade886034d9bfb83d9 Mon Sep 17 00:00:00 2001
From: Thomas Veerman <thomas@minix3.org>
Date: Wed, 6 Jun 2012 11:27:00 +0000
Subject: [PATCH] Use MACHINE_ARCH instead of ARCH

---
 commands/Makefile                         | 2 +-
 drivers/memory/Makefile                   | 2 +-
 kernel/Makefile                           | 6 +++---
 kernel/arch/i386/Makefile.inc             | 2 +-
 lib/libc/arch/i386/sys-minix/Makefile.inc | 2 +-
 lib/libcompat_minix/Makefile              | 1 -
 servers/vm/Makefile                       | 4 ++--
 servers/vm/arch/i386/Makefile.inc         | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/commands/Makefile b/commands/Makefile
index 0a133ab6f..9ac6b4003 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -35,7 +35,7 @@ SUBDIR=	add_route arp ash at awk \
 	xargs yacc yes zdump zmodem pkgin_cd \
 	mktemp worldstone updateboot update_bootcfg
 
-.if ${ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
 SUBDIR+=	atnormalize dosread fdisk loadfont \
 	autopart part partition playwave  \
 	recwave repartition screendump
diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index dbe250135..24f68b5a2 100644
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -25,7 +25,7 @@ touch-genfiles:
 # but bsd.own.mk has to be upgraded for that.
 .mfs.o:
 	${_MKTARGET_CREATE}
-	${OBJCOPY} -Ibinary -B${ARCH} -Oelf32-${ARCH}-minix $< $@
+	${OBJCOPY} -Ibinary -B${MACHINE_ARCH} -Oelf32-${MACHINE_ARCH}-minix $< $@
 
 ${RAMDISK_PATH}/image: .PHONY
 	${MAKE} -C ${RAMDISK_PATH} image
diff --git a/kernel/Makefile b/kernel/Makefile
index d3b89326f..fb3c22ee0 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -3,7 +3,7 @@
 
 PROG=	kernel
 
-.include "arch/${ARCH}/Makefile.inc"
+.include "arch/${MACHINE_ARCH}/Makefile.inc"
 
 SRCS+=	clock.c cpulocals.c interrupt.c main.c proc.c start.c system.c \
 	table.c utility.c 
@@ -14,7 +14,7 @@ LDADD+=	-ltimers -lsys -lexec
 CFLAGS += -D__kernel__
 
 CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE
-LDFLAGS+= -T ${.CURDIR}/arch/${ARCH}/kernel.lds
+LDFLAGS+= -T ${.CURDIR}/arch/${MACHINE_ARCH}/kernel.lds
 LDFLAGS+= -nostdlib -L${DESTDIR}/${LIBDIR}
 LDADD+= -lminlib
 DPADD+= ${LIBMINLIB}
@@ -25,7 +25,7 @@ LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Gener
 DPADD+=	${LIBC}
 .endif
 
-CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${NETBSDSRCDIR}
+CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}/include -I${NETBSDSRCDIR}
 
 BINDIR=	/usr/sbin
 MAN=
diff --git a/kernel/arch/i386/Makefile.inc b/kernel/arch/i386/Makefile.inc
index 53bbfb13f..172803a19 100644
--- a/kernel/arch/i386/Makefile.inc
+++ b/kernel/arch/i386/Makefile.inc
@@ -2,7 +2,7 @@
 # Makefile for arch-dependent kernel code
 .include <bsd.own.mk>
 
-HERE=${.CURDIR}/arch/${ARCH}
+HERE=${.CURDIR}/arch/${MACHINE_ARCH}
 .PATH:	${HERE}
 SRCS+=	mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \
 	do_iopenable.c do_readbios.c do_sdevio.c exception.c i8259.c io_inb.S \
diff --git a/lib/libc/arch/i386/sys-minix/Makefile.inc b/lib/libc/arch/i386/sys-minix/Makefile.inc
index 6cf381dae..82b6ee2ed 100644
--- a/lib/libc/arch/i386/sys-minix/Makefile.inc
+++ b/lib/libc/arch/i386/sys-minix/Makefile.inc
@@ -1,5 +1,5 @@
 # rts sources
-.PATH: ${.CURDIR}/arch/${ARCH}/sys-minix
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/sys-minix
 
 SRCS+=   \
 	__sigreturn.S \
diff --git a/lib/libcompat_minix/Makefile b/lib/libcompat_minix/Makefile
index 1f545ead2..2ee3492e4 100644
--- a/lib/libcompat_minix/Makefile
+++ b/lib/libcompat_minix/Makefile
@@ -2,7 +2,6 @@
 
 LIB=	compat_minix
 CPPFLAGS+= -D_MINIX_COMPAT
-MACHINE_ARCH= ${ARCH}
 USE_SHLIBDIR= yes
 
 .PATH: 	${.CURDIR}
diff --git a/servers/vm/Makefile b/servers/vm/Makefile
index a2f27fd5f..993af5bc9 100644
--- a/servers/vm/Makefile
+++ b/servers/vm/Makefile
@@ -13,8 +13,8 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}
+CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 CPPFLAGS+=	-I${NETBSDSRCDIR}
 
-.include "arch/${ARCH}/Makefile.inc"
+.include "arch/${MACHINE_ARCH}/Makefile.inc"
 .include <minix.bootprog.mk>
diff --git a/servers/vm/arch/i386/Makefile.inc b/servers/vm/arch/i386/Makefile.inc
index 34b9b5a10..530df1a1f 100644
--- a/servers/vm/arch/i386/Makefile.inc
+++ b/servers/vm/arch/i386/Makefile.inc
@@ -1,5 +1,5 @@
 .include <bsd.own.mk>
 
 #Arch-specific sources
-.PATH: ${.CURDIR}/arch/${ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
 SRCS+=	vm.c pagetable.c #util.S