[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto fix sparc.

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

details:   https://anonhg.NetBSD.org/src/rev/82e5f5f94bd4
branches:  trunk
changeset: 830058:82e5f5f94bd4
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Feb 24 21:45:57 2018 +0000

description:
fix sparc.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   |  5 ++++-
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       |  5 +++++
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc |  2 ++
 crypto/external/bsd/openssl/lib/libcrypto/ec.inc                  |  8 +++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diffs (78 lines):

diff -r 2472ca293c7a -r 82e5f5f94bd4 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   Sat Feb 24 20:23:58 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   Sat Feb 24 21:45:57 2018 +0000
@@ -1,5 +1,5 @@
+.PATH.S: ${.PARSEDIR}
 .if ${MACHINE} == "sparc64"
-.PATH.S: ${.PARSEDIR}
 CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S 
 CPUID_SRCS += sparct4-mont.S vis3-mont.S
 CPUID = yes
@@ -8,5 +8,8 @@
 AFLAGS.sparcv9a-mont.S+= -Wa,-Av9a
 AFLAGS.sparct4-mont.S+= -Wa,-Av9a
 AFLAGS.vis3-mont.S+= -Wa,-Av9a
+.else
+CPUID = yes
+CPUID_SRCS = sparccpuid.S
 .endif
 .include "../../crypto.inc"
diff -r 2472ca293c7a -r 82e5f5f94bd4 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       Sat Feb 24 20:23:58 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       Sat Feb 24 21:45:57 2018 +0000
@@ -1,7 +1,12 @@
+.if ${MACHINE} == "sparc64"
 .PATH.S: ${.PARSEDIR}
 EC_SRCS += \
+       ecp_nistz256-sparcv9.S
 
 ECNI = yes
 AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av9
+.else
+ECCPPFLAGS+=-DECP_NISTZ256_REFERENCE_IMPLEMENTATION
+.endif
 
 .include "../../ec.inc"
diff -r 2472ca293c7a -r 82e5f5f94bd4 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc Sat Feb 24 20:23:58 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc Sat Feb 24 21:45:57 2018 +0000
@@ -1,8 +1,10 @@
+.if ${MACHINE} == "sparc64"
 .PATH.S: ${.PARSEDIR}
 
 POLY1305_SRCS = poly1305-sparcv9.S
 POLY1305_CPPFLAGS+=-DPOLY1305_ASM
 
 AFLAGS.poly1305-sparcv9.S+= -Wa,-Av9
+.endif
 
 .include "../../poly1305.inc"
diff -r 2472ca293c7a -r 82e5f5f94bd4 crypto/external/bsd/openssl/lib/libcrypto/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/ec.inc  Sat Feb 24 20:23:58 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/ec.inc  Sat Feb 24 21:45:57 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ec.inc,v 1.5 2018/02/18 23:41:44 christos Exp $
+#      $NetBSD: ec.inc,v 1.6 2018/02/24 21:45:57 christos Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -38,15 +38,17 @@
 ecp_nistp256.c \
 ecp_nistp521.c \
 ecp_nistputil.c \
-ecp_nistz256.c \
 ecp_oct.c \
 ecp_smpl.c \
 ecx_meth.c
 
 SRCS += ${EC_SRCS}
 
+.if defined(ECNI)
 COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
+SRCS+= ecp_nistz256.c
+.endif
 
 .for cryptosrc in ${EC_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ec
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ec ${ECCPPFLAGS}
 .endfor