Page MenuHomeFreeBSD
Files F105784888

D7826.diff
No OneTemporary
Actions

D7826.diff
View Options

Index: head/sys/boot/efi/boot1/Makefile
===================================================================
--- head/sys/boot/efi/boot1/Makefile
+++ head/sys/boot/efi/boot1/Makefile
@@ -28,6 +28,8 @@
.if ${MK_ZFS} != "no"
SRCS+= zfs_module.c
SRCS+= skein.c skein_block.c
+# Do not unroll skein loops, reduce code size
+CFLAGS+= -DSKEIN_LOOP=111
.PATH: ${.CURDIR}/../../../crypto/skein
.endif
Index: head/sys/boot/efi/loader/Makefile
===================================================================
--- head/sys/boot/efi/loader/Makefile
+++ head/sys/boot/efi/loader/Makefile
@@ -25,6 +25,8 @@
SRCS+= zfs.c
.PATH: ${.CURDIR}/../../zfs
SRCS+= skein.c skein_block.c
+# Do not unroll skein loops, reduce code size
+CFLAGS+= -DSKEIN_LOOP=111
.PATH: ${.CURDIR}/../../../crypto/skein
# Disable warnings that are currently incompatible with the zfs boot code
Index: head/sys/boot/i386/gptzfsboot/Makefile
===================================================================
--- head/sys/boot/i386/gptzfsboot/Makefile
+++ head/sys/boot/i386/gptzfsboot/Makefile
@@ -36,6 +36,9 @@
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline -Wno-tentative-definition-incomplete-type -Wno-pointer-sign
+# Do not unroll skein loops, reduce code size
+CFLAGS+= -DSKEIN_LOOP=111
+
.if !defined(LOADER_NO_GELI_SUPPORT)
CFLAGS+= -DLOADER_GELI_SUPPORT
CFLAGS+= -I${.CURDIR}/../../geli
Index: head/sys/boot/i386/zfsboot/Makefile
===================================================================
--- head/sys/boot/i386/zfsboot/Makefile
+++ head/sys/boot/i386/zfsboot/Makefile
@@ -35,6 +35,8 @@
-Winline
CFLAGS.gcc+= --param max-inline-insns-single=100
+# Do not unroll skein loops, reduce code size
+CFLAGS+= -DSKEIN_LOOP=111
LD_FLAGS=${LD_FLAGS_BIN}
Index: head/sys/boot/userboot/zfs/Makefile
===================================================================
--- head/sys/boot/userboot/zfs/Makefile
+++ head/sys/boot/userboot/zfs/Makefile
@@ -8,6 +8,9 @@
SRCS+= zfs.c skein.c skein_block.c
+# Do not unroll skein loops, reduce code size
+CFLAGS+= -DSKEIN_LOOP=111
+
CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs
Index: head/sys/boot/zfs/Makefile
===================================================================
--- head/sys/boot/zfs/Makefile
+++ head/sys/boot/zfs/Makefile
@@ -6,6 +6,8 @@
SRCS+= zfs.c
SRCS+= skein.c skein_block.c
+# Do not unroll skein loops, reduce code size
+CFLAGS+= -DSKEIN_LOOP=111
.PATH: ${.CURDIR}/../../crypto/skein
CFLAGS+= -DBOOTPROG=\"zfsloader\"

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 4:09 PM (15 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15542972
Default Alt Text
D7826.diff (2 KB)

Event Timeline