diff options
| -rw-r--r-- | lib/libmd/Makefile | 11 | ||||
| -rw-r--r-- | sys/crypto/skein/amd64/skein_block_asm.S (renamed from sys/crypto/skein/amd64/skein_block_asm.s) | 0 | ||||
| -rw-r--r-- | sys/modules/crypto/Makefile | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 0368cfdc740e..fda9b772ab38 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -116,18 +116,15 @@ CFLAGS+= -DSHA1_ASM SRCS+= rmd160.S CFLAGS+= -DRMD160_ASM .endif -.if exists(${MACHINE_ARCH}/skein_block_asm.s) -.if defined(XAS) || ${MK_BINUTILS_BOOTSTRAP} != "no" -AFLAGS += --strip-local-absolute +.if exists(${MACHINE_ARCH}/skein_block_asm.S) # Fully unroll all loops in the assembly optimized version -AFLAGS+= --defsym SKEIN_LOOP=0 --defsym SKEIN_USE_ASM=1792 -SRCS+= skein_block_asm.s +ACFLAGS+= -DSKEIN_LOOP=0 +SRCS+= skein_block_asm.S CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 .else .warning as not available: not using optimized Skein asm .endif -.endif -.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) || exists(${MACHINE_ARCH}/skein_block_asm.s) +.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) || exists(${MACHINE_ARCH}/skein_block_asm.S) ACFLAGS+= -DELF -Wa,--noexecstack .endif .endif # ${USE_ASM_SOURCES} != 0 diff --git a/sys/crypto/skein/amd64/skein_block_asm.s b/sys/crypto/skein/amd64/skein_block_asm.S index a5e1613fe2fe..a5e1613fe2fe 100644 --- a/sys/crypto/skein/amd64/skein_block_asm.s +++ b/sys/crypto/skein/amd64/skein_block_asm.S diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 8a5335c3a781..28243fa9245c 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -28,13 +28,13 @@ SRCS += sha1.c sha256c.c sha512c.c SRCS += skein.c skein_block.c # unroll the 256 and 512 loops, half unroll the 1024 CFLAGS.skein_block.c += -DSKEIN_LOOP=995 -.if exists(${MACHINE_ARCH}/skein_block_asm.s) +.if exists(${MACHINE_ARCH}/skein_block_asm.S) .PATH: ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} -SRCS += skein_block_asm.s +SRCS += skein_block_asm.S CFLAGS += -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 ACFLAGS += -DELF -Wa,--noexecstack # Fully unroll all loops in the assembly optimized version -AFLAGS+= --defsym SKEIN_LOOP=0 --defsym SKEIN_USE_ASM=1792 +ACFLAGS += -DSKEIN_LOOP=0 .endif SRCS += siphash.c SRCS += gmac.c gfmult.c |