[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch fix m68k/i386

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

details:   https://anonhg.NetBSD.org/src/rev/d74ffcde8b15
branches:  trunk
changeset: 374823:d74ffcde8b15
user:      christos <christos%NetBSD.org@localhost>
date:      Sat May 13 13:43:25 2023 +0000

description:
fix m68k/i386

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc |  2 ++
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc     |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc |  3 +--
 crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc     |  3 +++
 4 files changed, 7 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r caf43dfdef47 -r d74ffcde8b15 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc    Sat May 13 13:31:37 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc    Sat May 13 13:43:25 2023 +0000
@@ -2,4 +2,6 @@
 CPUID_SRCS = x86cpuid.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS       # no atomic 64 bit ops
+
 .include "../../crypto.inc"
diff -r caf43dfdef47 -r d74ffcde8b15 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc        Sat May 13 13:31:37 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc        Sat May 13 13:43:25 2023 +0000
@@ -2,7 +2,7 @@
 EC_SRCS += \
 ecp_nistz256-x86.S 
 
-ECCPPFLAGS+= -DX25519_ASM -DOPENSSL_NO_EC_NISTP_64_GCC_128
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
 
 ECNI = yes
 .include "../../ec.inc"
diff -r caf43dfdef47 -r d74ffcde8b15 crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc    Sat May 13 13:31:37 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc    Sat May 13 13:43:25 2023 +0000
@@ -1,5 +1,4 @@
-.PATH.S: ${.PARSEDIR}
 
-#CRYPTO_SRCS += libc-memequal.c
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS       # no atomic 64 bit ops
 
 .include "../../crypto.inc"
diff -r caf43dfdef47 -r d74ffcde8b15 crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc        Sat May 13 13:43:25 2023 +0000
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"