factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Land #872, implement endbr64 workaround on macOS in preprocessor

Browse Source
This commit is contained in:
Brent Cook 2023-07-03 11:05:09 -05:00
commit 7d0b106805
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/CMakeLists.txt
View File

@ -111,6 +111,7 @@ if(HOST_ASM_MACOSX_X86_64)
bn/arch/amd64/word_clz.S bn/arch/amd64/word_clz.S
bn/arch/amd64/bn_arch.c bn/arch/amd64/bn_arch.c
) )
add_definitions(-Dendbr64=)
add_definitions(-DAES_ASM) add_definitions(-DAES_ASM)
add_definitions(-DBSAES_ASM) add_definitions(-DBSAES_ASM)
add_definitions(-DVPAES_ASM) add_definitions(-DVPAES_ASM)

1
crypto/Makefile.am.macosx-x86_64
View File

@ -34,6 +34,7 @@ ASM_X86_64_MACOSX += bn/arch/amd64/bn_arch.c
EXTRA_DIST += $(ASM_X86_64_MACOSX) EXTRA_DIST += $(ASM_X86_64_MACOSX)
if HOST_ASM_MACOSX_X86_64 if HOST_ASM_MACOSX_X86_64
libcrypto_la_CPPFLAGS += -Dendbr64=
libcrypto_la_CPPFLAGS += -DAES_ASM libcrypto_la_CPPFLAGS += -DAES_ASM
libcrypto_la_CPPFLAGS += -DBSAES_ASM libcrypto_la_CPPFLAGS += -DBSAES_ASM
libcrypto_la_CPPFLAGS += -DVPAES_ASM libcrypto_la_CPPFLAGS += -DVPAES_ASM

9
update.sh
View File

@ -194,11 +194,6 @@ fixup_masm() {
> $2 > $2
} }
fixup_macosx() {
echo Fixing up $2
sed -e 's/endbr64//' $1 > $2
}
# generate assembly crypto algorithms # generate assembly crypto algorithms
asm_src=$libcrypto_src asm_src=$libcrypto_src
gen_asm_stdout() { gen_asm_stdout() {
@ -210,8 +205,6 @@ gen_asm_stdout() {
EOF EOF
if [ $1 = "masm" ]; then if [ $1 = "masm" ]; then
fixup_masm crypto/$3.tmp crypto/$3 fixup_masm crypto/$3.tmp crypto/$3
elif [ $1 = "macosx" ]; then
fixup_macosx crypto/$3.tmp crypto/$3
else else
$MV crypto/$3.tmp crypto/$3 $MV crypto/$3.tmp crypto/$3
fi fi
@ -238,8 +231,6 @@ gen_asm() {
EOF EOF
if [ $1 = "masm" ]; then if [ $1 = "masm" ]; then
fixup_masm crypto/$3.tmp crypto/$3 fixup_masm crypto/$3.tmp crypto/$3
elif [ $1 = "macosx" ]; then
fixup_macosx crypto/$3.tmp crypto/$3
else else
$MV crypto/$3.tmp crypto/$3 $MV crypto/$3.tmp crypto/$3
fi fi