Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
8 个月 前同步成功

通知 8
Star 18
Fork 1
T
Third Party Openssl

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 69fef5dd 编写于 作者: H HJ 提交者： Gitee
浏览文件
操作

适配x86_64 

Signed-off-by: NHJ <huangjun42@huawei.com>
上级 de742080
隐藏空白更改
内联 并排
Showing with 12 addition and 8 deletion
BUILD.gn
浏览文件 @ 69fef5dd
...@@ -51,8 +51,8 @@ config("crypto_config") { ...@@ -51,8 +51,8 @@ config("crypto_config") {
"-DECP_NISTZ256_ASM", "-DECP_NISTZ256_ASM",
"-DPOLY1305_ASM", "-DPOLY1305_ASM",
] ]
} else if ((current_cpu == "arm64" || current_cpu == "x86_64") && } else if (current_cpu == "arm64" &&
!(current_os == "linux" || host_os == "mac" || is_mingw)) { !(current_os == "linux" || host_os == "mac")) {
cflags += [ cflags += [
"-DOPENSSL_CPUID_OBJ", "-DOPENSSL_CPUID_OBJ",
"-DOPENSSL_BN_ASM_MONT", "-DOPENSSL_BN_ASM_MONT",
...@@ -118,13 +118,15 @@ config("crypto_config_public") { ...@@ -118,13 +118,15 @@ config("crypto_config_public") {
if (current_cpu == "arm" && !(current_os == "linux" || host_os == "mac")) { if (current_cpu == "arm" && !(current_os == "linux" || host_os == "mac")) {
cflags = [ "-DOPENSSL_ARM_PLATFORM" ] cflags = [ "-DOPENSSL_ARM_PLATFORM" ]
} else if ((current_cpu == "arm64" || current_cpu == "x86_64") && } else if (current_cpu == "arm64" &&
!(current_os == "linux" || host_os == "mac" || is_mingw)) { !(current_os == "linux" || host_os == "mac")) {
cflags = [ "-DOPENSSL_ARM64_PLATFORM" ] cflags = [ "-DOPENSSL_ARM64_PLATFORM" ]
} else if (is_mingw) { } else if (is_mingw) {
cflags = [ "-DWINDOWS_PLATFORM" ] cflags = [ "-DWINDOWS_PLATFORM" ]
} else if (current_os == "linux" || host_os == "mac") { } else if (current_os == "linux" || host_os == "mac") {
cflags = [ "-DMAC_PLATFORM" ] cflags = [ "-DMAC_PLATFORM" ]
} else {
cflags = [ "-DOPENSSL_ARM64_PLATFORM" ]
} }
} }
...@@ -751,8 +753,8 @@ ohos_source_set("crypto_source") { ...@@ -751,8 +753,8 @@ ohos_source_set("crypto_source") {
"crypto/sha/sha256-armv4.S", "crypto/sha/sha256-armv4.S",
"crypto/sha/sha512-armv4.S", "crypto/sha/sha512-armv4.S",
] ]
} else if ((current_cpu == "arm64" || current_cpu == "x86_64") && } else if (current_cpu == "arm64" &&
!(current_os == "linux" || host_os == "mac" || is_mingw)) { !(current_os == "linux" || host_os == "mac")) {
sources += [ sources += [
"crypto/aes/aes_core.c", "crypto/aes/aes_core.c",
"crypto/aes/asm/arm64/aesv8-armx.S", "crypto/aes/asm/arm64/aesv8-armx.S",
...@@ -878,8 +880,8 @@ config("ssl_config") { ...@@ -878,8 +880,8 @@ config("ssl_config") {
if (current_cpu == "arm" && host_os != "mac") { if (current_cpu == "arm" && host_os != "mac") {
cflags += [ "-DOPENSSL_ARM_PLATFORM" ] cflags += [ "-DOPENSSL_ARM_PLATFORM" ]
} else if ((current_cpu == "arm64" || current_cpu == "x86_64") && } else if (current_cpu == "arm64" &&
!(current_os == "linux" || host_os == "mac" || is_mingw)) { !(current_os == "linux" || host_os == "mac")) {
cflags += [ "-DOPENSSL_ARM64_PLATFORM" ] cflags += [ "-DOPENSSL_ARM64_PLATFORM" ]
} else if (is_mingw) { } else if (is_mingw) {
cflags -= [ "-fPIC" ] cflags -= [ "-fPIC" ]
...@@ -905,6 +907,8 @@ config("ssl_config") { ...@@ -905,6 +907,8 @@ config("ssl_config") {
"-c", "-c",
] ]
defines = [ "MAC_PLATFORM" ] defines = [ "MAC_PLATFORM" ]
} else {
cflags += [ "-DOPENSSL_ARM64_PLATFORM" ]
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或