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.

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)
                 bn/arch/amd64/word_clz.S
                 bn/arch/amd64/bn_arch.c
         )
-        add_definitions(-Dendbr64=)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
@@ -153,6 +152,7 @@ if(HOST_ASM_MASM_X86_64)
                 whrlpool/wp-masm-x86_64.S
                 cpuid-masm-x86_64.S
         )
+        add_definitions(-Dendbr64=)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
@@ -193,6 +193,7 @@ if(HOST_ASM_MINGW64_X86_64)
                 whrlpool/wp-mingw64-x86_64.S
                 cpuid-mingw64-x86_64.S
         )
+        add_definitions(-Dendbr64=)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         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
 EXTRA_DIST += $(ASM_X86_64_MACOSX)
 
 if HOST_ASM_MACOSX_X86_64
-libcrypto_la_CPPFLAGS += -Dendbr64=
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM