[src/trunk]: src/sys/arch/i386/stand More complete fix for overriding CPUFLAG...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3b0ff709bec6
branches:  trunk
changeset: 569750:3b0ff709bec6
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Sep 03 21:55:17 2004 +0000

description:
More complete fix for overriding CPUFLAGS and also apply fix to bootxx,
from Valeriy Ushakov.

diffstat:

 sys/arch/i386/stand/boot/Makefile.boot     |  10 +++++-----
 sys/arch/i386/stand/bootxx/Makefile.bootxx |   9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (82 lines):

diff -r c0a708894544 -r 3b0ff709bec6 sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Fri Sep 03 18:25:04 2004 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Fri Sep 03 21:55:17 2004 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.boot,v 1.17 2004/09/03 18:25:04 thorpej Exp $
+# $NetBSD: Makefile.boot,v 1.18 2004/09/03 21:55:17 thorpej Exp $
 
 S=     ${.CURDIR}/../../../../../
 
 NOMAN=
-STRIPFLAG=
 BINDIR= /usr/mdec
 BINMODE= 0444
 PROG?= boot
@@ -18,6 +17,8 @@
 
 .include <bsd.own.mk>
 
+STRIPFLAG=     # nothing
+
 LIBCRT0=       # nothing
 LIBCRTBEGIN=   # nothing
 LIBCRTEND=     # nothing
@@ -35,18 +36,17 @@
 #CPPFLAGS+= -DDEBUG_MEMSIZE
 
 # Make sure we override any optimization options specified by the user
-CPUFLAGS=      # nothing
 COPTS=  -Os
 
 .if ${MACHINE} == "amd64"
 LD+=  -m elf_i386
 AFLAGS+=   -m32
-COPTS+=    -m32
+CPUFLAGS=  -m32
 LIBKERN_ARCH=i386
 KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
 CPPFLAGS+= -DBOOT_ELF64
 .else
-COPTS+=    -mcpu=i386
+CPUFLAGS=  -mcpu=i386
 .endif
 
 COPTS+=    -ffreestanding
diff -r c0a708894544 -r 3b0ff709bec6 sys/arch/i386/stand/bootxx/Makefile.bootxx
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx        Fri Sep 03 18:25:04 2004 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx        Fri Sep 03 21:55:17 2004 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.bootxx,v 1.14 2004/06/21 18:20:08 jmc Exp $
+# $NetBSD: Makefile.bootxx,v 1.15 2004/09/03 21:55:17 thorpej Exp $
 
 S=     ${.CURDIR}/../../../../../
 
 NOMAN=
-STRIPFLAG=
 PROG?= bootxx_${FS}
 BINDIR= /usr/mdec
 BINMODE= 0444
@@ -20,6 +19,8 @@
 
 .include <bsd.own.mk>
 
+STRIPFLAG=     # nothing
+
 LIBCRT0=       # nothing
 LIBCRTBEGIN=   # nothing
 LIBCRTEND=     # nothing
@@ -51,12 +52,12 @@
 .if ${MACHINE} == "amd64"
 LD+=  -m elf_i386
 AFLAGS+=   -m32
-COPTS+=    -m32
+CPUFLAGS=  -m32
 LIBKERN_ARCH=i386
 KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
 CPPFLAGS+= -DBOOT_ELF64
 .else
-COPTS+=    -mcpu=i386
+CPUFLAGS=  -mcpu=i386
 .endif
 
 COPTS+=    -ffreestanding