From c305c7ac43b0fa3a47724cbff2ac3303eb163387 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 27 Feb 2023 04:46:43 -0600 Subject: disable BN asm for amd64 win32 build --- crypto/Makefile.am.mingw64-x86_64 | 13 ------------- patches/win32_amd64_bn_arch.h.patch | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 patches/win32_amd64_bn_arch.h.patch diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index f808c12..bce854b 100644 --- a/crypto/Makefile.am.mingw64-x86_64 +++ b/crypto/Makefile.am.mingw64-x86_64 @@ -19,19 +19,6 @@ ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S ASM_X86_64_MINGW64 += whrlpool/wp-mingw64-x86_64.S ASM_X86_64_MINGW64 += cpuid-mingw64-x86_64.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_add.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_cmadd.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_cmul.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_mul.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_mul_4_8_alt.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_mul_8_16_alt.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_sqr.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_sqr_4_8_alt.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_sqr_8_16_alt.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bignum_sub.S -ASM_X86_64_MINGW64 += bn/arch/amd64/word_clz.S -ASM_X86_64_MINGW64 += bn/arch/amd64/bn_arch.c - EXTRA_DIST += $(ASM_X86_64_MINGW64) if HOST_ASM_MINGW64_X86_64 diff --git a/patches/win32_amd64_bn_arch.h.patch b/patches/win32_amd64_bn_arch.h.patch new file mode 100644 index 0000000..20205dc --- /dev/null +++ b/patches/win32_amd64_bn_arch.h.patch @@ -0,0 +1,21 @@ +--- crypto/bn/arch/amd64/bn_arch.h.orig 2023-02-27 04:43:12.257874699 -0600 ++++ crypto/bn/arch/amd64/bn_arch.h 2023-02-27 04:44:05.541873870 -0600 +@@ -20,6 +20,10 @@ + #ifndef HEADER_BN_ARCH_H + #define HEADER_BN_ARCH_H + ++#ifdef _WIN32 ++#define OPENSSL_NO_ASM ++#else ++ + #ifndef OPENSSL_NO_ASM + + #define HAVE_BN_ADD +@@ -85,6 +89,7 @@ + *out_r0 = r0; + } + #endif /* __GNUC__ */ ++#endif /* _WIN32 */ + + #endif + #endif -- cgit v1.2.3-55-g6feb