[Midnightbsd-cvs] src [8402] trunk/sys/boot: use march=i386 for both i386 and amd64

[laffer1 at midnightbsd.org]

Revision: 8402
          http://svnweb.midnightbsd.org/src/?rev=8402
Author:   laffer1
Date:     2016-09-18 15:33:26 -0400 (Sun, 18 Sep 2016)
Log Message:
-----------
use march=i386 for both i386 and amd64

Modified Paths:
--------------
    trunk/sys/boot/ficl/Makefile
    trunk/sys/boot/i386/Makefile.inc
    trunk/sys/boot/userboot/ficl/Makefile
    trunk/sys/boot/zfs/Makefile

Modified: trunk/sys/boot/ficl/Makefile
===================================================================
--- trunk/sys/boot/ficl/Makefile	2016-09-18 19:32:55 UTC (rev 8401)
+++ trunk/sys/boot/ficl/Makefile	2016-09-18 19:33:26 UTC (rev 8402)
@@ -8,6 +8,7 @@
 CLEANFILES=	softcore.c testmain testmain.o
 CFLAGS+=	-ffreestanding
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=	-march=i386
 CFLAGS+=	-mpreferred-stack-boundary=2
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 .endif
@@ -33,7 +34,7 @@
 #SOFTWORDS+=	oo.fr classes.fr
 
 .if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=	-m32 -march=i386 -I.
+CFLAGS+=	-m32 -I.
 .endif
 
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/${MACHINE_CPUARCH:S/amd64/i386/} \

Modified: trunk/sys/boot/i386/Makefile.inc
===================================================================
--- trunk/sys/boot/i386/Makefile.inc	2016-09-18 19:32:55 UTC (rev 8401)
+++ trunk/sys/boot/i386/Makefile.inc	2016-09-18 19:33:26 UTC (rev 8402)
@@ -6,12 +6,12 @@
 BINDIR?=	/boot
 
 LOADER_ADDRESS?=0x200000
-CFLAGS+=	-ffreestanding -mpreferred-stack-boundary=2 \
+CFLAGS+=	-march=i386 -ffreestanding -mpreferred-stack-boundary=2 \
 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 LDFLAGS+=	-nostdlib
 
 .if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=	-m32 -march=i386
+CFLAGS+=	-m32
 ACFLAGS+=	-m32
 LDFLAGS+=	-m elf_i386_fbsd
 AFLAGS+=	--32

Modified: trunk/sys/boot/userboot/ficl/Makefile
===================================================================
--- trunk/sys/boot/userboot/ficl/Makefile	2016-09-18 19:32:55 UTC (rev 8401)
+++ trunk/sys/boot/userboot/ficl/Makefile	2016-09-18 19:33:26 UTC (rev 8402)
@@ -12,6 +12,7 @@
 CLEANFILES=	softcore.c testmain testmain.o
 CFLAGS+=	-ffreestanding -fPIC
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+#CFLAGS+=	-march=i386
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
 .endif
 .if ${MACHINE_CPUARCH} == "i386"
@@ -46,7 +47,7 @@
 #SOFTWORDS+=	oo.fr classes.fr
 
 #.if ${MACHINE_CPUARCH} == "amd64"
-#CFLAGS+=	-m32 -march=i386 -I.
+#CFLAGS+=	-m32 -I.
 #.endif
 
 .if ${MACHINE_ARCH} == "powerpc64"

Modified: trunk/sys/boot/zfs/Makefile
===================================================================
--- trunk/sys/boot/zfs/Makefile	2016-09-18 19:32:55 UTC (rev 8401)
+++ trunk/sys/boot/zfs/Makefile	2016-09-18 19:33:26 UTC (rev 8402)
@@ -12,6 +12,7 @@
 
 CFLAGS+=	-ffreestanding
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=	-march=i386
 CFLAGS+=	-mpreferred-stack-boundary=2
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 .endif
@@ -19,7 +20,7 @@
 CFLAGS+=	-msoft-float
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=	-m32 -march=i386
+CFLAGS+=	-m32
 .endif
 
 CFLAGS+=	-Wformat -Wall