2 files changed, 3 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66d04ba..599515f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,9 +345,7 @@ if(ENABLE_ASM)
                 endif()
                 add_definitions(-DHAVE_GNU_STACK)
         elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-                # disable for now (.section .rodata invalid)
-                # set(HOST_ASM_MACOSX_X86_64 true)
-                set(ENABLE_ASM false)
+                set(HOST_ASM_MACOSX_X86_64 true)
         elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
                 set(HOST_ASM_MASM_X86_64 true)
                 ENABLE_LANGUAGE(ASM_MASM)
diff --git a/configure.ac b/configure.ac
index d8bf28e..c89fe95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,7 @@ AC_ARG_ENABLE([tests],
 AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes])
 
 AS_CASE([$host_cpu],
+        [arm64], [host_cpu=aarch64],
         [*arm*], [host_cpu=arm],
         [*amd64*], [host_cpu=x86_64 HOSTARCH=intel],
         [i?86], [host_cpu=i386 HOSTARCH=intel],
@@ -110,17 +111,13 @@ int main() {return 0;}
 
 AC_ARG_ENABLE([asm],
         AS_HELP_STRING([--disable-asm], [Disable assembly]))
-# Disable below while updating to support upstream assembly changes
-AM_CONDITIONAL([OPENSSL_NO_ASM], [true])
-enable_asm = "no"
-# AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno"])
+AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno" -o "$host_cpu" = "aarch64"])
 
 # Conditionally enable assembly by default
 AM_CONDITIONAL([HOST_ASM_ELF_ARM],
     [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "arm" -a "x$enable_asm" != "xno"])
 AM_CONDITIONAL([HOST_ASM_ELF_X86_64],
     [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
-
 AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64],
     [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
 AM_CONDITIONAL([HOST_ASM_MASM_X86_64],