[src/trunk]: src/crypto/external/bsd/openssl provide OPENSSL_cpuid_setup to t...

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

details:   https://anonhg.NetBSD.org/src/rev/114444a33afb
branches:  trunk
changeset: 780504:114444a33afb
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jul 27 18:10:40 2012 +0000

description:
provide OPENSSL_cpuid_setup to the haves and the havenots
[still there are other platforms ia64, s370, powerpc64] where we can do better.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/cryptlib.c                |   2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc     |   3 +++
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc |   3 +++
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc |   3 +++
 crypto/external/bsd/openssl/lib/libcrypto/engine.inc              |  10 +++++++---
 5 files changed, 17 insertions(+), 4 deletions(-)

diffs (63 lines):

diff -r 5a4313882aac -r 114444a33afb crypto/external/bsd/openssl/dist/crypto/cryptlib.c
--- a/crypto/external/bsd/openssl/dist/crypto/cryptlib.c        Fri Jul 27 17:45:59 2012 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/cryptlib.c        Fri Jul 27 18:10:40 2012 +0000
@@ -718,7 +718,7 @@
 unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; }
 #endif
 int OPENSSL_NONPIC_relocated = 0;
-#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)
+#if (!defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)) || defined(NEED_CPUID_SETUP)
 void OPENSSL_cpuid_setup(void) {}
 #endif
 
diff -r 5a4313882aac -r 114444a33afb crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc     Fri Jul 27 18:10:40 2012 +0000
@@ -0,0 +1,3 @@
+CPUID_SRCS = armcap.c
+CPUID = yes
+.include "../../crypto.inc"
diff -r 5a4313882aac -r 114444a33afb crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc Fri Jul 27 18:10:40 2012 +0000
@@ -0,0 +1,3 @@
+CPUID_SRCS = ppccap.c
+CPUID = yes
+.include "../../crypto.inc"
diff -r 5a4313882aac -r 114444a33afb crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Fri Jul 27 18:10:40 2012 +0000
@@ -0,0 +1,3 @@
+CPUID_SRCS = sparcv9cap.c
+CPUID = yes
+.include "../../crypto.inc"
diff -r 5a4313882aac -r 114444a33afb crypto/external/bsd/openssl/lib/libcrypto/engine.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/engine.inc      Fri Jul 27 17:45:59 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/engine.inc      Fri Jul 27 18:10:40 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: engine.inc,v 1.6 2012/07/27 16:05:27 christos Exp $
+#      $NetBSD: engine.inc,v 1.7 2012/07/27 18:10:40 christos Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -28,7 +28,7 @@
 .if defined(AESNI)
 ENGINE_SRCS+=  eng_aesni.c
 .else
-AESCPPFLAGS=-DOPENSSL_NO_HW_AESNI
+CRYPTOCPPFLAGS+=-DOPENSSL_NO_HW_AESNI
 .endif
 
 ENGINE_SRCS += gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c \
@@ -38,6 +38,10 @@
 
 SRCS += ${ENGINE_SRCS}
 
+.if !defined(CPUID)
+CRYPTOCPPFLAGS+=-DNEED_CPUID_SETUP
+.endif
+
 .for cryptosrc in ${ENGINE_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/engine ${AESCPPFLAGS} -DHAVE_CRYPTODEV
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/engine ${CRYPTOCPPFLAGS} -DHAVE_CRYPTODEV
 .endfor