aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2023-10-10 08:29:57 -0500
committerBrent Cook <busterb@gmail.com>2023-10-30 22:55:29 -0500
commit98a5122bc6b6efc2729b5c29a570500311310ca0 (patch)
tree59397095bd8c2d081b00881038c645f9b17b9be3 /crypto
parent1fd73818df53ae51adb681a34b2d5bca4bb37e49 (diff)
downloadportable-98a5122bc6b6efc2729b5c29a570500311310ca0.tar.gz
portable-98a5122bc6b6efc2729b5c29a570500311310ca0.tar.bz2
portable-98a5122bc6b6efc2729b5c29a570500311310ca0.zip
portable asm generator patches for portable
This reverses changes from the 3.8.x upstream that are causing issues on a few different platforms, including macOS x64, Windows, and older Linux/FreeBSD.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/CMakeLists.txt3
-rw-r--r--crypto/Makefile.am.macosx-x86_641
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index d61e607..7efb143 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -111,7 +111,6 @@ if(HOST_ASM_MACOSX_X86_64)
111 bn/arch/amd64/word_clz.S 111 bn/arch/amd64/word_clz.S
112 bn/arch/amd64/bn_arch.c 112 bn/arch/amd64/bn_arch.c
113 ) 113 )
114 add_definitions(-Dendbr64=)
115 add_definitions(-DAES_ASM) 114 add_definitions(-DAES_ASM)
116 add_definitions(-DBSAES_ASM) 115 add_definitions(-DBSAES_ASM)
117 add_definitions(-DVPAES_ASM) 116 add_definitions(-DVPAES_ASM)
@@ -153,6 +152,7 @@ if(HOST_ASM_MASM_X86_64)
153 whrlpool/wp-masm-x86_64.S 152 whrlpool/wp-masm-x86_64.S
154 cpuid-masm-x86_64.S 153 cpuid-masm-x86_64.S
155 ) 154 )
155 add_definitions(-Dendbr64=)
156 add_definitions(-DAES_ASM) 156 add_definitions(-DAES_ASM)
157 add_definitions(-DBSAES_ASM) 157 add_definitions(-DBSAES_ASM)
158 add_definitions(-DVPAES_ASM) 158 add_definitions(-DVPAES_ASM)
@@ -193,6 +193,7 @@ if(HOST_ASM_MINGW64_X86_64)
193 whrlpool/wp-mingw64-x86_64.S 193 whrlpool/wp-mingw64-x86_64.S
194 cpuid-mingw64-x86_64.S 194 cpuid-mingw64-x86_64.S
195 ) 195 )
196 add_definitions(-Dendbr64=)
196 add_definitions(-DAES_ASM) 197 add_definitions(-DAES_ASM)
197 add_definitions(-DBSAES_ASM) 198 add_definitions(-DBSAES_ASM)
198 add_definitions(-DVPAES_ASM) 199 add_definitions(-DVPAES_ASM)
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index 219a7ac..b9b89cf 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -34,7 +34,6 @@ ASM_X86_64_MACOSX += bn/arch/amd64/bn_arch.c
34EXTRA_DIST += $(ASM_X86_64_MACOSX) 34EXTRA_DIST += $(ASM_X86_64_MACOSX)
35 35
36if HOST_ASM_MACOSX_X86_64 36if HOST_ASM_MACOSX_X86_64
37libcrypto_la_CPPFLAGS += -Dendbr64=
38libcrypto_la_CPPFLAGS += -DAES_ASM 37libcrypto_la_CPPFLAGS += -DAES_ASM
39libcrypto_la_CPPFLAGS += -DBSAES_ASM 38libcrypto_la_CPPFLAGS += -DBSAES_ASM
40libcrypto_la_CPPFLAGS += -DVPAES_ASM 39libcrypto_la_CPPFLAGS += -DVPAES_ASM