From eb45cc97a2342bb292960372d5b1e4185514e265 Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Thu, 24 Feb 2011 14:13:24 +0800
Subject: [PATCH] mk: Add FORCE_CPUTYPE which overrides user's CPUTYPE or
 forcefully sets CPUTYPE

---
 lib/libstand/Makefile      | 2 +-
 share/mk/bsd.cpu.mk        | 4 ++++
 share/mk/bsd.init.mk       | 2 +-
 sys/boot/Makefile          | 5 -----
 sys/boot/pc32/Makefile     | 3 ---
 sys/boot/pc32/Makefile.inc | 2 +-
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index caff104279..46ee091df7 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -20,7 +20,7 @@ CFLAGS+=	-ffreestanding
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CFLAGS+=	-mpreferred-stack-boundary=2
-CPUTYPE=	i386
+FORCE_CPUTYPE=	i386
 .endif
 
 .if ${MACHINE_ARCH} == "x86_64"
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 376f3ff556..e2cb7ab244 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -28,6 +28,10 @@ HOST_CCVER?= ${_DEFAULT_CCVER}
 _DEFAULT_BINUTILSVER=	binutils217
 HOST_BINUTILSVER?=	${_DEFAULT_BINUTILSVER}
 
+.if defined(FORCE_CPUTYPE)
+CPUTYPE= ${FORCE_CPUTYPE}
+.endif
+
 .if defined(CCVER_BSD_CPU_MK)
 .  if ${CCVER_BSD_CPU_MK} != ""
 .    include "${CCVER_BSD_CPU_MK}"
diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index 85d9d7c7fd..65ee05ea17 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -10,7 +10,7 @@ __<bsd.init.mk>__:
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
-.if ${CCVER} != ${_CCVER}
+.if ${CCVER} != ${_CCVER} || defined(FORCE_CPUTYPE)
 .include <bsd.cpu.mk>
 .endif
 .include <bsd.own.mk>
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index f0f99eaf13..783c5e4072 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -5,11 +5,6 @@
 .MAKEFLAGS:  MACHINE_ARCH=i386 MACHINE_PLATFORM=pc32 REALLY_X86_64=true
 .endif
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-CPUTYPE=	i386
-.makeenv CPUTYPE
-.endif
-
 # Build DLoader
 SUBDIR+=		dloader
 
diff --git a/sys/boot/pc32/Makefile b/sys/boot/pc32/Makefile
index 7eee5ab99b..dabf338da5 100644
--- a/sys/boot/pc32/Makefile
+++ b/sys/boot/pc32/Makefile
@@ -1,6 +1,3 @@
-CPUTYPE=	i386
-.makeenv CPUTYPE
-
 SUBDIR=		mbr boot0 btx boot2 cdboot kgzldr libi386 loader loader_tftp \
 		boot0sio
 
diff --git a/sys/boot/pc32/Makefile.inc b/sys/boot/pc32/Makefile.inc
index 2819c3f931..62ca9928fe 100644
--- a/sys/boot/pc32/Makefile.inc
+++ b/sys/boot/pc32/Makefile.inc
@@ -7,7 +7,7 @@ LOADER_ADDRESS?=	0x200000
 CFLAGS+=		-ffreestanding -mpreferred-stack-boundary=2
 
 # override CPU type, so that gcc doesn't insert mmx/sse instructions
-CPUTYPE=		i386
+FORCE_CPUTYPE=		i386
 
 WARNS?=	1
 
-- 
2.41.0