Adjust for amd64 boot.
authorSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Mon, 29 Dec 2008 18:42:20 +0000 (19:42 +0100)
committerSimon Schubert <corecode@dragonflybsd.org>
Tue, 6 Jan 2009 02:57:15 +0000 (03:57 +0100)
sys/boot/Makefile
sys/boot/pc32/Makefile.inc

index b7b87df..c6e2f3b 100644 (file)
@@ -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"
index d57f457..d0c3df2 100644 (file)
@@ -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