From: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Date: Mon, 29 Dec 2008 18:42:20 +0000 (+0100)
Subject: Adjust for amd64 boot.
X-Git-Tag: v2.3.0~96
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/99e55ac46520b7d8e2593af9aa213ffac955ab73

Adjust for amd64 boot.
---

diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index b7b87df84f..c6e2f3b373 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -2,7 +2,7 @@
 # $DragonFly: src/sys/boot/Makefile,v 1.5 2007/05/18 07:41:40 dillon Exp $
 
 .if ${MACHINE_ARCH} == "amd64"
-.MAKEFLAGS:  MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true
+.MAKEFLAGS:  MACHINE_ARCH=i386 MACHINE_PLATFORM=pc32 REALLY_AMD64=true
 .endif
 
 .if !defined(NOFORTH) && ${MACHINE_ARCH} != "powerpc"
diff --git a/sys/boot/pc32/Makefile.inc b/sys/boot/pc32/Makefile.inc
index d57f457157..d0c3df231f 100644
--- a/sys/boot/pc32/Makefile.inc
+++ b/sys/boot/pc32/Makefile.inc
@@ -13,6 +13,6 @@ CFLAGS+=		-ffreestanding -mpreferred-stack-boundary=2
 .if defined(REALLY_AMD64) && !defined(__been_to_Makefile_inc)
 __been_to_Makefile_inc=	1
 CFLAGS+=		-m32
-LDFLAGS+=		-m elf_i386_fbsd
+LDFLAGS+=		-m elf_i386
 AFLAGS+=		--32
 .endif