amd64 and CPUTYPE: i386 loader unusable

[Dmitry Morozovsky]

Dear colleagues,

marck at gwhx:/usr/src> uname -a
FreeBSD gwhx.rinet.ru 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Tue Mar  1 
08:22:54 UTC 2005     marck at gwhx.rinet.ru:/usr/obj/lh/src/sys/MINI  amd64

defining CPUTYPE=athlon64 in /etc/make conf renders loader unusable: it builds 
with athlon64 optimization, and crashes (reboots) immediately. The following 
patch fixes the problem for me.

Index: sys/boot/i386/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/sys/boot/i386/Makefile.inc,v
retrieving revision 1.9
diff -u -r1.9 Makefile.inc
--- sys/boot/i386/Makefile.inc  9 Feb 2004 14:11:55 -0000       1.9
+++ sys/boot/i386/Makefile.inc  1 Mar 2005 15:32:44 -0000
@@ -9,6 +9,7 @@
 LDFLAGS+=      -nostdlib
 
 .if ${MACHINE_ARCH} == "amd64"
+CPUTYPE=       i686
 CFLAGS+=       -m32
 LDFLAGS+=      -m elf_i386_fbsd
 AFLAGS+=       --32


Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck at rinet.ru ***
------------------------------------------------------------------------