[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto fix vax, restructure.

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

details:   https://anonhg.NetBSD.org/src/rev/7c842735298b
branches:  trunk
changeset: 374772:7c842735298b
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 11 20:08:59 2023 +0000

description:
fix vax, restructure.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc |  5 -----
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc         |  2 ++
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc   |  5 -----
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc |  5 -----
 crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc       |  2 ++
 crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc           |  2 ++
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc  |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/chacha.inc                |  4 ++--
 crypto/external/bsd/openssl/lib/libcrypto/ec.inc                    |  4 +++-
 crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc              |  3 ++-
 10 files changed, 14 insertions(+), 20 deletions(-)

diffs (110 lines):

diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc       Thu May 11 19:14:54 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: whrlpool.inc,v 1.1 2023/05/11 01:31:54 christos Exp $
-
-WHRLPOOL_SRCS += wp_block.c
-.include "../../whrlpool.inc"
-
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       Thu May 11 19:14:54 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       Thu May 11 20:08:59 2023 +0000
@@ -8,4 +8,6 @@ AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av
 .else
 .endif
 
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
 .include "../../ec.inc"
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc Thu May 11 19:14:54 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: chacha.inc,v 1.1 2023/05/11 01:45:38 christos Exp $
-
-CHACHA_SRCS += chacha_enc.c
-.include "../../chacha.inc"
-
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc       Thu May 11 19:14:54 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: whrlpool.inc,v 1.1 2023/05/11 01:45:38 christos Exp $
-
-WHRLPOOL_SRCS += wp_block.c
-.include "../../whrlpool.inc"
-
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc     Thu May 11 19:14:54 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc     Thu May 11 20:08:59 2023 +0000
@@ -2,5 +2,7 @@
 
 #CRYPTO_SRCS += libc-memequal.c
 #CPPFLAGS += -DOPENSSL_CPUID_OBJ
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS      # no atomic 64 bit ops
+
 
 .include "../../crypto.inc"
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc Thu May 11 20:08:59 2023 +0000
@@ -0,0 +1,2 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+.include "../../ec.inc"
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc        Thu May 11 19:14:54 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc        Thu May 11 20:08:59 2023 +0000
@@ -1,4 +1,4 @@
 .PATH.S: ${.PARSEDIR}
-WHRLPOOL_SRCS = wp-x86_64.S
+WHRLPOOL_SRCS += wp-x86_64.S
 WHRLPOOLCPPFLAGS+=     -DWHIRLPOOL_ASM
 .include "../../whrlpool.inc"
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/chacha.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc      Thu May 11 19:14:54 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc      Thu May 11 20:08:59 2023 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: chacha.inc,v 1.3 2023/05/06 17:07:22 christos Exp $
+#      $NetBSD: chacha.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
 
 .PATH: ${OPENSSLSRC}/crypto/chacha
 
-CHACHA_SRCS += \
+CHACHA_SRCS ?= chacha_enc.c
 
 SRCS += ${CHACHA_SRCS}
 
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/ec.inc  Thu May 11 19:14:54 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/ec.inc  Thu May 11 20:08:59 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ec.inc,v 1.10 2023/05/11 15:26:13 christos Exp $
+#      $NetBSD: ec.inc,v 1.11 2023/05/11 20:08:59 christos Exp $
 
 .PATH: ${OPENSSLSRC}/crypto/ec
 
@@ -38,8 +38,10 @@ ecx_meth.c \
 .if defined(ECNI)
 COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
 EC_SRCS+= ecp_nistz256.c
+.if empty(ECCPPFLAGS:M*OPENSSL_NO_EC_NISTP_64_GCC_128*)
 EC_SRCS+= ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
 .endif
+.endif
 
 SRCS += ${EC_SRCS}
 
diff -r 2c635b00d91b -r 7c842735298b crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc    Thu May 11 19:14:54 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc    Thu May 11 20:08:59 2023 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: whrlpool.inc,v 1.3 2023/05/06 17:07:23 christos Exp $
+#      $NetBSD: whrlpool.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
 
 .PATH: ${OPENSSLSRC}/crypto/whrlpool
 
+WHRLPOOL_SRCS ?= wp_block.c
 WHRLPOOL_SRCS += \
 wp_dgst.c \