[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc make th...

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

details:   https://anonhg.NetBSD.org/src/rev/654aa2e8f4eb
branches:  trunk
changeset: 830112:654aa2e8f4eb
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Feb 26 01:33:05 2018 +0000

description:
make this link again:
- we don't want to define the reference impl flag because there is no
  complete c reference impl for nistz256
- we want to define an empty OPENSSL_cpuid_setup() because we don't want
  to use the v9 one... this function is called from 2 places:
  1. in the sparccpuid.S assembly, which we need for the CRYPTO_mem*
     functions -- but we could get rid of the v9 stuff with
     #ifdef __sparc_v9__ for size and we don't bother
  2. crypto/init.c

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc |  5 +++--
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc     |  1 -
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c |  6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r a8c09806e7f0 -r 654aa2e8f4eb crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   Mon Feb 26 00:17:40 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   Mon Feb 26 01:33:05 2018 +0000
@@ -1,9 +1,10 @@
 .PATH.S: ${.PARSEDIR}
+.PATH.c: ${.PARSEDIR}
 CPUID = yes
-CPUID_SRCS += sparccpuid.S
+CPUID_SRCS += sparccpuid.S sparccap.c
 
 .if ${MACHINE} == "sparc64"
-CPUID_SRCS += sparcv9cap.c sparcv9-mont.S sparcv9a-mont.S 
+CPUID_SRCS += sparcv9-mont.S sparcv9a-mont.S 
 CPUID_SRCS += sparct4-mont.S vis3-mont.S
 #CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 AFLAGS.sparcv9-mont.S+= -Wa,-Av9
diff -r a8c09806e7f0 -r 654aa2e8f4eb crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       Mon Feb 26 00:17:40 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       Mon Feb 26 01:33:05 2018 +0000
@@ -6,7 +6,6 @@
 ECNI = yes
 AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av9
 .else
-ECCPPFLAGS+=-DECP_NISTZ256_REFERENCE_IMPLEMENTATION
 .endif
 
 .include "../../ec.inc"
diff -r a8c09806e7f0 -r 654aa2e8f4eb crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c   Mon Feb 26 01:33:05 2018 +0000
@@ -0,0 +1,6 @@
+
+void OPENSSL_cpuid_setup(void);
+
+void OPENSSL_cpuid_setup(void)
+{
+}