From 7087ece457580d5e265e70a0117ef0c1e6e40f5b Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Tue, 22 Feb 2011 20:03:40 +0800
Subject: [PATCH] libstand: Make sure that -march=i386 is specified

This unbreaks the loader compiled by gcc44
---
 lib/libstand/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 390df95e6a..caff104279 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -18,13 +18,14 @@ WARNS?=		2
 # Mostly OK, some of the libc imports are a bit noisy
 CFLAGS+=	-ffreestanding
 
-.if ${MACHINE_ARCH} == "x86_64"
-CFLAGS+=	-m32 -mpreferred-stack-boundary=2
-.endif
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CFLAGS+=	-mpreferred-stack-boundary=2
+CPUTYPE=	i386
 .endif
 
+.if ${MACHINE_ARCH} == "x86_64"
+CFLAGS+=	-m32
+.endif
 
 # standalone components and stuff we have modified locally
 SRCS+=	__main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \
-- 
2.41.0