diff options
| author | Brent Cook <busterb@gmail.com> | 2023-07-03 11:05:09 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2023-07-03 11:05:09 -0500 |
| commit | 7d0b106805f08997267c90ddbc6eea8e0b029f84 (patch) | |
| tree | 9299b2ea981219d3b4787862e0bdc01a792b0307 /crypto | |
| parent | 4ccf125f8899c9ec45c91560ba835d8b9ee8e4c9 (diff) | |
| parent | b328be457ae699947f409b7434293d632c36e47d (diff) | |
| download | portable-7d0b106805f08997267c90ddbc6eea8e0b029f84.tar.gz portable-7d0b106805f08997267c90ddbc6eea8e0b029f84.tar.bz2 portable-7d0b106805f08997267c90ddbc6eea8e0b029f84.zip | |
Land #872, implement endbr64 workaround on macOS in preprocessor
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | crypto/Makefile.am.macosx-x86_64 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 0379899..707424c 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -111,6 +111,7 @@ 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=) | ||
| 114 | add_definitions(-DAES_ASM) | 115 | add_definitions(-DAES_ASM) |
| 115 | add_definitions(-DBSAES_ASM) | 116 | add_definitions(-DBSAES_ASM) |
| 116 | add_definitions(-DVPAES_ASM) | 117 | add_definitions(-DVPAES_ASM) |
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index b9b89cf..219a7ac 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 | |||
| @@ -34,6 +34,7 @@ ASM_X86_64_MACOSX += bn/arch/amd64/bn_arch.c | |||
| 34 | EXTRA_DIST += $(ASM_X86_64_MACOSX) | 34 | EXTRA_DIST += $(ASM_X86_64_MACOSX) |
| 35 | 35 | ||
| 36 | if HOST_ASM_MACOSX_X86_64 | 36 | if HOST_ASM_MACOSX_X86_64 |
| 37 | libcrypto_la_CPPFLAGS += -Dendbr64= | ||
| 37 | libcrypto_la_CPPFLAGS += -DAES_ASM | 38 | libcrypto_la_CPPFLAGS += -DAES_ASM |
| 38 | libcrypto_la_CPPFLAGS += -DBSAES_ASM | 39 | libcrypto_la_CPPFLAGS += -DBSAES_ASM |
| 39 | libcrypto_la_CPPFLAGS += -DVPAES_ASM | 40 | libcrypto_la_CPPFLAGS += -DVPAES_ASM |