Author: avg
Date: Sun Jan 15 21:43:24 2012
New Revision: 230162
URL: http://svn.freebsd.org/changeset/base/230162

Log:
  MFC r225530: gpt/zfs boot blocks: reduce optimizing CFLAGS to -O1

Modified:
  stable/8/sys/boot/i386/gptboot/Makefile
  stable/8/sys/boot/i386/gptzfsboot/Makefile
  stable/8/sys/boot/i386/zfsboot/Makefile
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/boot/i386/gptboot/Makefile
==============================================================================
--- stable/8/sys/boot/i386/gptboot/Makefile     Sun Jan 15 21:39:38 2012        
(r230161)
+++ stable/8/sys/boot/i386/gptboot/Makefile     Sun Jan 15 21:43:24 2012        
(r230162)
@@ -20,12 +20,7 @@ GPTBOOT_UFS?=        UFS1_AND_UFS2
 #GPTBOOT_UFS?= UFS1_ONLY
 
 CFLAGS=        -DBOOTPROG=\"gptboot\" \
-       -Os \
-       -fno-guess-branch-probability \
-       -fomit-frame-pointer \
-       -fno-unit-at-a-time \
-       -mno-align-long-strings \
-       -mrtd \
+       -O1 \
        -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
        -DGPT \
        -D${GPTBOOT_UFS} \

Modified: stable/8/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- stable/8/sys/boot/i386/gptzfsboot/Makefile  Sun Jan 15 21:39:38 2012        
(r230161)
+++ stable/8/sys/boot/i386/gptzfsboot/Makefile  Sun Jan 15 21:43:24 2012        
(r230162)
@@ -17,12 +17,7 @@ ORG1=        0x7c00
 ORG2=  0x0
 
 CFLAGS=        -DBOOTPROG=\"gptzfsboot\" \
-       -Os \
-       -fno-guess-branch-probability \
-       -fomit-frame-pointer \
-       -fno-unit-at-a-time \
-       -mno-align-long-strings \
-       -mrtd \
+       -O1 \
        -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
        -DGPT -DBOOT2 \
        -DSIOPRT=${BOOT_COMCONSOLE_PORT} \

Modified: stable/8/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- stable/8/sys/boot/i386/zfsboot/Makefile     Sun Jan 15 21:39:38 2012        
(r230161)
+++ stable/8/sys/boot/i386/zfsboot/Makefile     Sun Jan 15 21:43:24 2012        
(r230162)
@@ -15,12 +15,7 @@ ORG1=        0x7c00
 ORG2=  0x2000
 
 CFLAGS=        -DBOOTPROG=\"zfsboot\" \
-       -Os -g \
-       -fno-guess-branch-probability \
-       -fomit-frame-pointer \
-       -fno-unit-at-a-time \
-       -mno-align-long-strings \
-       -mrtd \
+       -O1 \
        -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
        -DBOOT2 \
        -DSIOPRT=${BOOT_COMCONSOLE_PORT} \
@@ -81,17 +76,10 @@ zfsboot.bin: zfsboot.out
 zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
        ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
-zfsboot.o: zfsboot.s
-
 SRCS=  zfsboot.c
 
-zfsboot.s: zfsboot.c ${.CURDIR}/../../zfs/zfsimpl.c
-       ${CC} ${CFLAGS} -S -o zfsboot.s.tmp ${.CURDIR}/zfsboot.c
-       sed -e '/align/d' -e '/nop/d' < zfsboot.s.tmp > zfsboot.s
-       rm -f zfsboot.s.tmp
-
 .if ${MACHINE_ARCH} == "amd64"
-beforedepend zfsboot.s: machine
+beforedepend zfsboot.o: machine
 CLEANFILES+=   machine
 machine:
        ln -sf ${.CURDIR}/../../../i386/include machine
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to