diff --git a/BUILD.gn b/BUILD.gn index a5e7d21e59244c3f545911981ab165d477f6199e..8586723304d0793ebeb9c7c025be2bfbe11c12c9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -51,8 +51,8 @@ config("crypto_config") { "-DECP_NISTZ256_ASM", "-DPOLY1305_ASM", ] - } else if ((current_cpu == "arm64" || current_cpu == "x86_64") && - !(current_os == "linux" || host_os == "mac" || is_mingw)) { + } else if (current_cpu == "arm64" && + !(current_os == "linux" || host_os == "mac")) { cflags += [ "-DOPENSSL_CPUID_OBJ", "-DOPENSSL_BN_ASM_MONT", @@ -118,13 +118,15 @@ config("crypto_config_public") { if (current_cpu == "arm" && !(current_os == "linux" || host_os == "mac")) { cflags = [ "-DOPENSSL_ARM_PLATFORM" ] - } else if ((current_cpu == "arm64" || current_cpu == "x86_64") && - !(current_os == "linux" || host_os == "mac" || is_mingw)) { + } else if (current_cpu == "arm64" && + !(current_os == "linux" || host_os == "mac")) { cflags = [ "-DOPENSSL_ARM64_PLATFORM" ] } else if (is_mingw) { cflags = [ "-DWINDOWS_PLATFORM" ] } else if (current_os == "linux" || host_os == "mac") { cflags = [ "-DMAC_PLATFORM" ] + } else { + cflags = [ "-DOPENSSL_ARM64_PLATFORM" ] } } @@ -751,8 +753,8 @@ ohos_source_set("crypto_source") { "crypto/sha/sha256-armv4.S", "crypto/sha/sha512-armv4.S", ] - } else if ((current_cpu == "arm64" || current_cpu == "x86_64") && - !(current_os == "linux" || host_os == "mac" || is_mingw)) { + } else if (current_cpu == "arm64" && + !(current_os == "linux" || host_os == "mac")) { sources += [ "crypto/aes/aes_core.c", "crypto/aes/asm/arm64/aesv8-armx.S", @@ -878,8 +880,8 @@ config("ssl_config") { if (current_cpu == "arm" && host_os != "mac") { cflags += [ "-DOPENSSL_ARM_PLATFORM" ] - } else if ((current_cpu == "arm64" || current_cpu == "x86_64") && - !(current_os == "linux" || host_os == "mac" || is_mingw)) { + } else if (current_cpu == "arm64" && + !(current_os == "linux" || host_os == "mac")) { cflags += [ "-DOPENSSL_ARM64_PLATFORM" ] } else if (is_mingw) { cflags -= [ "-fPIC" ] @@ -905,6 +907,8 @@ config("ssl_config") { "-c", ] defines = [ "MAC_PLATFORM" ] + } else { + cflags += [ "-DOPENSSL_ARM64_PLATFORM" ] } }