[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto Use x86_64 assembl...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/919ca62c2254
branches:  trunk
changeset: 808405:919ca62c2254
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat May 16 19:33:59 2015 +0000

description:
Use x86_64 assembler version of whirlpool. It has a small but consistent
performance advantage over the clang output on my E3v2.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc |  4 ++++
 crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc             |  9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 9f7d169e94a3 -r 919ca62c2254 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc        Sat May 16 19:33:59 2015 +0000
@@ -0,0 +1,4 @@
+.PATH.S: ${.PARSEDIR}
+WHRLPOOL_SRCS = wp-x86_64.S
+WHRLPOOLCPPFLAGS+=     -DWHIRLPOOL_ASM
+.include "../../whrlpool.inc"
diff -r 9f7d169e94a3 -r 919ca62c2254 crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc    Sat May 16 19:19:36 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc    Sat May 16 19:33:59 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: whrlpool.inc,v 1.1 2012/07/26 19:58:40 christos Exp $
+#      $NetBSD: whrlpool.inc,v 1.2 2015/05/16 19:33:59 joerg Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,11 +7,14 @@
 
 .PATH: ${OPENSSLSRC}/crypto/whrlpool
 
-WHRLPOOL_SRCS = wp_block.c wp_dgst.c # wp_test.c   
+.if empty(WHRLPOOL_SRCS)
+WHRLPOOL_SRCS += wp_block.c
+.endif
+WHRLPOOL_SRCS += wp_dgst.c # wp_test.c   
 
 SRCS += ${WHRLPOOL_SRCS}
 
 .for cryptosrc in ${WHRLPOOL_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/whrlpool
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/whrlpool ${WHRLPOOLCPPFLAGS}
 .endfor
 CPPFLAGS.m_wp.c += -I${OPENSSLSRC}/crypto/whrlpool