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

only disable asm on aarch64 for now, enable for other archs

Browse Source
This commit is contained in:
Brent Cook 2023-02-23 08:31:31 -06:00
parent a64adc5811
commit a498c6a7c9
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -345,9 +345,7 @@ if(ENABLE_ASM)
endif() endif()
add_definitions(-DHAVE_GNU_STACK) add_definitions(-DHAVE_GNU_STACK)
elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
# disable for now (.section .rodata invalid) set(HOST_ASM_MACOSX_X86_64 true)
# set(HOST_ASM_MACOSX_X86_64 true)
set(ENABLE_ASM false)
elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
set(HOST_ASM_MASM_X86_64 true) set(HOST_ASM_MASM_X86_64 true)
ENABLE_LANGUAGE(ASM_MASM) ENABLE_LANGUAGE(ASM_MASM)

7
configure.ac
View File

@ -74,6 +74,7 @@ AC_ARG_ENABLE([tests],
AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes]) AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes])
AS_CASE([$host_cpu], AS_CASE([$host_cpu],
[arm64], [host_cpu=aarch64],
[*arm*], [host_cpu=arm], [*arm*], [host_cpu=arm],
[*amd64*], [host_cpu=x86_64 HOSTARCH=intel], [*amd64*], [host_cpu=x86_64 HOSTARCH=intel],
[i?86], [host_cpu=i386 HOSTARCH=intel], [i?86], [host_cpu=i386 HOSTARCH=intel],
@ -110,17 +111,13 @@ int main() {return 0;}
AC_ARG_ENABLE([asm], AC_ARG_ENABLE([asm],
AS_HELP_STRING([--disable-asm], [Disable assembly])) AS_HELP_STRING([--disable-asm], [Disable assembly]))
# Disable below while updating to support upstream assembly changes AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno" -o "$host_cpu" = "aarch64"])
AM_CONDITIONAL([OPENSSL_NO_ASM], [true])
enable_asm = "no"
# AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno"])
# Conditionally enable assembly by default # Conditionally enable assembly by default
AM_CONDITIONAL([HOST_ASM_ELF_ARM], AM_CONDITIONAL([HOST_ASM_ELF_ARM],
[test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "arm" -a "x$enable_asm" != "xno"]) [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "arm" -a "x$enable_asm" != "xno"])
AM_CONDITIONAL([HOST_ASM_ELF_X86_64], AM_CONDITIONAL([HOST_ASM_ELF_X86_64],
[test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64],
[test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
AM_CONDITIONAL([HOST_ASM_MASM_X86_64], AM_CONDITIONAL([HOST_ASM_MASM_X86_64],