From 11dfc90f83c260e99aed721cf0880ec427a9bb6f Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 3 Jul 2023 16:34:38 +0300 Subject: move endbr64 removal to preprocessor --- crypto/CMakeLists.txt | 1 + crypto/Makefile.am.macosx-x86_64 | 1 + 2 files changed, 2 insertions(+) (limited to 'crypto') diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 0379899..c978c04 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -111,6 +111,7 @@ 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) diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index b9b89cf..789da0a 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 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 -- cgit v1.2.3-55-g6feb From cdb7ad475308d135ad8f3734a31c10d70c5a2299 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 3 Jul 2023 16:50:10 +0300 Subject: define endbr64 as nop --- crypto/CMakeLists.txt | 2 +- crypto/Makefile.am.macosx-x86_64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto') diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index c978c04..5d80541 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -111,7 +111,7 @@ if(HOST_ASM_MACOSX_X86_64) bn/arch/amd64/word_clz.S bn/arch/amd64/bn_arch.c ) - add_definitions(-Dendbr64) + add_definitions(-Dendbr64=nop) 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 789da0a..2708618 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 @@ -34,7 +34,7 @@ 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 += -Dendbr64=nop libcrypto_la_CPPFLAGS += -DAES_ASM libcrypto_la_CPPFLAGS += -DBSAES_ASM libcrypto_la_CPPFLAGS += -DVPAES_ASM -- cgit v1.2.3-55-g6feb From b328be457ae699947f409b7434293d632c36e47d Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 3 Jul 2023 18:40:00 +0300 Subject: third try's a charm --- crypto/CMakeLists.txt | 2 +- crypto/Makefile.am.macosx-x86_64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto') diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 5d80541..707424c 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -111,7 +111,7 @@ if(HOST_ASM_MACOSX_X86_64) bn/arch/amd64/word_clz.S bn/arch/amd64/bn_arch.c ) - add_definitions(-Dendbr64=nop) + 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 2708618..219a7ac 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 @@ -34,7 +34,7 @@ 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=nop +libcrypto_la_CPPFLAGS += -Dendbr64= libcrypto_la_CPPFLAGS += -DAES_ASM libcrypto_la_CPPFLAGS += -DBSAES_ASM libcrypto_la_CPPFLAGS += -DVPAES_ASM -- cgit v1.2.3-55-g6feb