Module Name: src
Committed By: christos
Date: Sat May 13 13:43:26 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: crypto.inc
ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: ec.inc
Log Message:
fix m68k/i386
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.3 Sat May 9 09:16:42 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc Sat May 13 09:43:25 2023
@@ -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"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.2 Thu May 11 22:23:32 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc Sat May 13 09:43:25 2023
@@ -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"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.2 Mon Sep 24 07:03:39 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc Sat May 13 09:43:25 2023
@@ -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"
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc:1.1
--- /dev/null Sat May 13 09:43:26 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc Sat May 13 09:43:25 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"
