Index: sys/boot/Makefile.inc
===================================================================
--- sys/boot/Makefile.inc
+++ sys/boot/Makefile.inc
@@ -4,6 +4,9 @@
 
 SSP_CFLAGS=
 
+# Optimize binaries for size to give more room on freebsd-boot partitions, etc.
+CFLAGS+=	-Os
+
 .if ${MACHINE_CPUARCH} == "arm"
 # Do not generate movt/movw, because the relocation fixup for them does not
 # translate to the -Bsymbolic -pie format required by self_reloc() in loader(8).
Index: sys/boot/arm/at91/Makefile.inc
===================================================================
--- sys/boot/arm/at91/Makefile.inc
+++ sys/boot/arm/at91/Makefile.inc
@@ -8,7 +8,7 @@
 # tsc, bwct, kb920x, centipad are the supported flavors
 BOOT_FLAVOR?=kb920x
 
-CFLAGS=-Os -mcpu=arm9 -ffreestanding \
+CFLAGS= -mcpu=arm9 -ffreestanding \
 	-I${.CURDIR}/../libat91 \
 	-I${.CURDIR}/../../../.. \
 	-I${.CURDIR}/../../../../arm \
Index: sys/boot/arm/ixp425/Makefile.inc
===================================================================
--- sys/boot/arm/ixp425/Makefile.inc
+++ sys/boot/arm/ixp425/Makefile.inc
@@ -8,7 +8,7 @@
 # Both Avila and Pronghorn Metro are supported by ixp425
 BOOT_FLAVOR=ixp425
 
-CFLAGS+=-Os -ffreestanding \
+CFLAGS+=-ffreestanding \
 	-I${.CURDIR}/../../../.. \
 	-I${.CURDIR}/../../../../arm \
 	-DCPU_XSCALE_IXP425 \
Index: sys/boot/i386/boot2/Makefile
===================================================================
--- sys/boot/i386/boot2/Makefile
+++ sys/boot/i386/boot2/Makefile
@@ -38,7 +38,7 @@
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Winline
 
-CFLAGS.gcc+=	-Os \
+CFLAGS.gcc+=	\
 		-fno-guess-branch-probability \
 		-fno-unit-at-a-time \
 		--param max-inline-insns-single=100
Index: sys/boot/i386/kgzldr/Makefile
===================================================================
--- sys/boot/i386/kgzldr/Makefile
+++ sys/boot/i386/kgzldr/Makefile
@@ -7,7 +7,6 @@
 MAN=
 
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
-CFLAGS=	-Os
 CFLAGS+=-DKZIP
 NO_SHARED=
 LDFLAGS=-Wl,-r
Index: sys/boot/powerpc/ps3/Makefile
===================================================================
--- sys/boot/powerpc/ps3/Makefile
+++ sys/boot/powerpc/ps3/Makefile
@@ -11,7 +11,7 @@
 
 # Architecture-specific loader code
 SRCS=		start.S conf.c metadata.c vers.c main.c devicename.c ppc64_elf_freebsd.c
-SRCS+=		lv1call.S ps3cons.c font.h ps3mmu.c ps3net.c ps3repo.c \
+SRCS+=		lshrdi3.c lv1call.S ps3cons.c font.h ps3mmu.c ps3net.c ps3repo.c \
 		ps3stor.c ps3disk.c ps3cdrom.c
 SRCS+=		ucmpdi2.c
 
Index: sys/boot/sparc64/boot1/Makefile
===================================================================
--- sys/boot/sparc64/boot1/Makefile
+++ sys/boot/sparc64/boot1/Makefile
@@ -11,7 +11,7 @@
 
 CFLAGS.clang+=-mcmodel=small
 CFLAGS.gcc+=-mcmodel=medlow
-CFLAGS+=-Os -I${.CURDIR}/../../common
+CFLAGS+=-I${.CURDIR}/../../common
 LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N
 
 # Construct boot1. sunlabel expects it to contain zeroed-out space for the