Author: avg
Date: Sun Nov 18 12:28:29 2012
New Revision: 243219
URL: http://svnweb.freebsd.org/changeset/base/243219
Log:
MFC r241785: boot: use -march=i386 for both i386 and amd64 builds
Modified:
stable/9/sys/boot/ficl/Makefile
stable/9/sys/boot/i386/Makefile.inc
stable/9/sys/boot/userboot/ficl/Makefile
stable/9/sys/boot/zfs/Makefile
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/boot/ (props changed)
Modified: stable/9/sys/boot/ficl/Makefile
==============================================================================
--- stable/9/sys/boot/ficl/Makefile Sun Nov 18 12:20:23 2012
(r243218)
+++ stable/9/sys/boot/ficl/Makefile Sun Nov 18 12:28:29 2012
(r243219)
@@ -8,6 +8,7 @@ SRCS= ${BASE_SRCS} sysdep.c softcore.c
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
@@ -39,7 +40,7 @@ SOFTWORDS= softcore.fr jhlocal.fr marker
#SOFTWORDS+= oo.fr classes.fr
.if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+= -m32 -march=i386 -I.
+CFLAGS+= -m32 -I.
.endif
.if ${MACHINE_ARCH} == "powerpc64"
Modified: stable/9/sys/boot/i386/Makefile.inc
==============================================================================
--- stable/9/sys/boot/i386/Makefile.inc Sun Nov 18 12:20:23 2012
(r243218)
+++ stable/9/sys/boot/i386/Makefile.inc Sun Nov 18 12:28:29 2012
(r243219)
@@ -5,12 +5,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: stable/9/sys/boot/userboot/ficl/Makefile
==============================================================================
--- stable/9/sys/boot/userboot/ficl/Makefile Sun Nov 18 12:20:23 2012
(r243218)
+++ stable/9/sys/boot/userboot/ficl/Makefile Sun Nov 18 12:28:29 2012
(r243219)
@@ -12,6 +12,7 @@ SRCS= ${BASE_SRCS} sysdep.c softcore.c
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= softcore.fr jhlocal.fr marker
#SOFTWORDS+= oo.fr classes.fr
#.if ${MACHINE_CPUARCH} == "amd64"
-#CFLAGS+= -m32 -march=i386 -I.
+#CFLAGS+= -m32 -I.
#.endif
.if ${MACHINE_ARCH} == "powerpc64"
Modified: stable/9/sys/boot/zfs/Makefile
==============================================================================
--- stable/9/sys/boot/zfs/Makefile Sun Nov 18 12:20:23 2012
(r243218)
+++ stable/9/sys/boot/zfs/Makefile Sun Nov 18 12:28:29 2012
(r243219)
@@ -12,6 +12,7 @@ CFLAGS+= -I${.CURDIR}/../../cddl/boot/zf
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+= -mno-mmx -mno-3dnow -mno-sse -m
CFLAGS+= -msoft-float
.endif
.if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+= -m32 -march=i386
+CFLAGS+= -m32
.endif
CFLAGS+= -Wformat -Wall
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
