svn commit: r261556 - in projects/uefi: lib/libstand sys/boot/ficl sys/boot/i386 sys/boot/i386/boot2 sys/boot/pc98 sys/boot/usb sys/boot/userboot/ficl sys/boot/userboot/libstand sys/boot/zfs
Ed Maste
emaste at FreeBSD.org
Thu Feb 6 17:35:28 UTC 2014
Author: emaste
Date: Thu Feb 6 17:35:25 2014
New Revision: 261556
URL: http://svnweb.freebsd.org/changeset/base/261556
Log:
MFH r259913:
For libstand and sys/boot, split off gcc-only flags into CFLAGS.gcc.
Sponsored by: The FreeBSD Foundation
Modified:
projects/uefi/lib/libstand/Makefile
projects/uefi/sys/boot/ficl/Makefile
projects/uefi/sys/boot/i386/Makefile.inc
projects/uefi/sys/boot/i386/boot2/Makefile
projects/uefi/sys/boot/pc98/Makefile.inc
projects/uefi/sys/boot/usb/Makefile
projects/uefi/sys/boot/usb/Makefile.test
projects/uefi/sys/boot/userboot/ficl/Makefile
projects/uefi/sys/boot/userboot/libstand/Makefile
projects/uefi/sys/boot/zfs/Makefile
Directory Properties:
projects/uefi/ (props changed)
projects/uefi/sys/ (props changed)
projects/uefi/sys/boot/ (props changed)
Modified: projects/uefi/lib/libstand/Makefile
==============================================================================
--- projects/uefi/lib/libstand/Makefile Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/lib/libstand/Makefile Thu Feb 6 17:35:25 2014 (r261556)
@@ -24,7 +24,8 @@ CFLAGS+= -I${.CURDIR}
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
.endif
.if ${MACHINE_CPUARCH} == "i386"
-CFLAGS+= -march=i386 -mpreferred-stack-boundary=2
+CFLAGS+= -march=i386
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
.endif
.if ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -fPIC
Modified: projects/uefi/sys/boot/ficl/Makefile
==============================================================================
--- projects/uefi/sys/boot/ficl/Makefile Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/ficl/Makefile Thu Feb 6 17:35:25 2014 (r261556)
@@ -17,7 +17,7 @@ CFLAGS+= -ffreestanding
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
.if !defined(FICL64)
CFLAGS+= -march=i386
-CFLAGS+= -mpreferred-stack-boundary=2
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
.endif
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
.endif
Modified: projects/uefi/sys/boot/i386/Makefile.inc
==============================================================================
--- projects/uefi/sys/boot/i386/Makefile.inc Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/i386/Makefile.inc Thu Feb 6 17:35:25 2014 (r261556)
@@ -5,13 +5,15 @@
BINDIR?= /boot
LOADER_ADDRESS?=0x200000
-CFLAGS+= -ffreestanding -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
- -mno-sse3 -msoft-float
.if ${MACHINE_CPUARCH} == "i386"
-CFLAGS+= -march=i386 -mpreferred-stack-boundary=2
+CFLAGS+= -march=i386
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
.elif ${MACHINE_CPUARCH} == "amd64" && !defined(BUILDING_EFI)
-CFLAGS+= -march=i386 -mpreferred-stack-boundary=2
+CFLAGS+= -march=i386
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
.endif
+CFLAGS+= -ffreestanding
+CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
LDFLAGS+= -nostdlib
.if ${MACHINE_CPUARCH} == "amd64" && !defined(BUILDING_EFI)
Modified: projects/uefi/sys/boot/i386/boot2/Makefile
==============================================================================
--- projects/uefi/sys/boot/i386/boot2/Makefile Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/i386/boot2/Makefile Thu Feb 6 17:35:25 2014 (r261556)
@@ -23,10 +23,7 @@ BOOT2_UFS?= UFS1_AND_UFS2
#BOOT2_UFS?= UFS1_ONLY
CFLAGS= -Os \
- -fno-guess-branch-probability \
-fomit-frame-pointer \
- -fno-unit-at-a-time \
- -Wl,-mno-align-long-strings \
-mrtd \
-mregparm=3 \
-DUSE_XREAD \
@@ -43,6 +40,10 @@ CFLAGS= -Os \
-Winline --param max-inline-insns-single=100 \
${CLANG_OPT_SMALL}
+CFLAGS.gcc+= -fno-guess-branch-probability \
+ -fno-unit-at-a-time \
+ -Wl,-mno-align-long-strings \
+
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
Modified: projects/uefi/sys/boot/pc98/Makefile.inc
==============================================================================
--- projects/uefi/sys/boot/pc98/Makefile.inc Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/pc98/Makefile.inc Thu Feb 6 17:35:25 2014 (r261556)
@@ -5,8 +5,9 @@
BINDIR?= /boot
LOADER_ADDRESS?=0x200000
-CFLAGS+= -march=i386 -ffreestanding -mpreferred-stack-boundary=2 \
- -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
+CFLAGS+= -march=i386 -ffreestanding
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
+CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
CFLAGS+= -Os -DPC98
LDFLAGS+= -nostdlib
Modified: projects/uefi/sys/boot/usb/Makefile
==============================================================================
--- projects/uefi/sys/boot/usb/Makefile Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/usb/Makefile Thu Feb 6 17:35:25 2014 (r261556)
@@ -53,7 +53,7 @@ CFLAGS+= -g
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -march=i386
-CFLAGS+= -mpreferred-stack-boundary=2
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
.endif
.if ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -m32
Modified: projects/uefi/sys/boot/usb/Makefile.test
==============================================================================
--- projects/uefi/sys/boot/usb/Makefile.test Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/usb/Makefile.test Thu Feb 6 17:35:25 2014 (r261556)
@@ -40,7 +40,7 @@ CFLAGS+= -g
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -march=i386
-CFLAGS+= -mpreferred-stack-boundary=2
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
.endif
.if ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -m32
Modified: projects/uefi/sys/boot/userboot/ficl/Makefile
==============================================================================
--- projects/uefi/sys/boot/userboot/ficl/Makefile Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/userboot/ficl/Makefile Thu Feb 6 17:35:25 2014 (r261556)
@@ -16,7 +16,7 @@ CFLAGS+= -ffreestanding -fPIC
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2
.endif
.if ${MACHINE_CPUARCH} == "i386"
-CFLAGS+= -mpreferred-stack-boundary=2
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
CFLAGS+= -mno-sse3
.endif
.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
Modified: projects/uefi/sys/boot/userboot/libstand/Makefile
==============================================================================
--- projects/uefi/sys/boot/userboot/libstand/Makefile Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/userboot/libstand/Makefile Thu Feb 6 17:35:25 2014 (r261556)
@@ -28,7 +28,7 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/li
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2
.endif
.if ${MACHINE_CPUARCH} == "i386"
-CFLAGS+= -mpreferred-stack-boundary=2
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
CFLAGS+= -mno-sse3
.endif
.if ${MACHINE} == "pc98"
Modified: projects/uefi/sys/boot/zfs/Makefile
==============================================================================
--- projects/uefi/sys/boot/zfs/Makefile Thu Feb 6 15:55:29 2014 (r261555)
+++ projects/uefi/sys/boot/zfs/Makefile Thu Feb 6 17:35:25 2014 (r261556)
@@ -14,7 +14,7 @@ CFLAGS+= -ffreestanding
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
.if !defined(ZFS64)
CFLAGS+= -march=i386
-CFLAGS+= -mpreferred-stack-boundary=2
+CFLAGS.gcc+= -mpreferred-stack-boundary=2
.endif
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
.endif
More information about the svn-src-projects
mailing list