From de7420802c7295857d234960b1be0b7d4a5f2984 Mon Sep 17 00:00:00 2001 From: HJ Date: Thu, 12 Aug 2021 04:10:43 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E9=85=8Dx86=5F64=20Signed-off-by:?= =?UTF-8?q?=20HJ=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BUILD.gn | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 554b248ab7..a5e7d21e59 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_os == "linux" || host_os == "mac")) { + } else if ((current_cpu == "arm64" || current_cpu == "x86_64") && + !(current_os == "linux" || host_os == "mac" || is_mingw)) { cflags += [ "-DOPENSSL_CPUID_OBJ", "-DOPENSSL_BN_ASM_MONT", @@ -118,8 +118,8 @@ config("crypto_config_public") { if (current_cpu == "arm" && !(current_os == "linux" || host_os == "mac")) { cflags = [ "-DOPENSSL_ARM_PLATFORM" ] - } else if (current_cpu == "arm64" && - !(current_os == "linux" || host_os == "mac")) { + } else if ((current_cpu == "arm64" || current_cpu == "x86_64") && + !(current_os == "linux" || host_os == "mac" || is_mingw)) { cflags = [ "-DOPENSSL_ARM64_PLATFORM" ] } else if (is_mingw) { cflags = [ "-DWINDOWS_PLATFORM" ] @@ -751,8 +751,8 @@ ohos_source_set("crypto_source") { "crypto/sha/sha256-armv4.S", "crypto/sha/sha512-armv4.S", ] - } else if (current_cpu == "arm64" && - !(current_os == "linux" || host_os == "mac")) { + } else if ((current_cpu == "arm64" || current_cpu == "x86_64") && + !(current_os == "linux" || host_os == "mac" || is_mingw)) { sources += [ "crypto/aes/aes_core.c", "crypto/aes/asm/arm64/aesv8-armx.S", @@ -878,7 +878,8 @@ config("ssl_config") { if (current_cpu == "arm" && host_os != "mac") { cflags += [ "-DOPENSSL_ARM_PLATFORM" ] - } else if (current_cpu == "arm64" && host_os != "mac") { + } else if ((current_cpu == "arm64" || current_cpu == "x86_64") && + !(current_os == "linux" || host_os == "mac" || is_mingw)) { cflags += [ "-DOPENSSL_ARM64_PLATFORM" ] } else if (is_mingw) { cflags -= [ "-fPIC" ] -- Gitee From 69fef5dd14836940c55f6f2f6a34d0004d2fff5a Mon Sep 17 00:00:00 2001 From: HJ Date: Thu, 12 Aug 2021 06:51:16 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8Dx86=5F64=20Signed-off-by:?= =?UTF-8?q?=20HJ=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BUILD.gn | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index a5e7d21e59..8586723304 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" ] } } -- Gitee