Commit f2f12d92 authored by David Benjamin's avatar David Benjamin Committed by Commit Bot

Enable iOS assembly in BoringSSL.

BUG=none

Change-Id: Ic4359354e152c4af266554252a3728af1efd0e02
Reviewed-on: https://chromium-review.googlesource.com/529584
Commit-Queue: David Benjamin <davidben@chromium.org>
Reviewed-by: default avatarSteven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#478799}
parent 14ae013d
...@@ -65,7 +65,8 @@ if (is_win && !is_msan) { ...@@ -65,7 +65,8 @@ if (is_win && !is_msan) {
asmflags = [] asmflags = []
include_dirs = [ "src/include" ] include_dirs = [ "src/include" ]
if ((current_cpu == "arm" || current_cpu == "arm64") && is_clang) { if ((current_cpu == "arm" || current_cpu == "arm64") && is_clang &&
!is_ios) {
if (current_cpu == "arm" && arm_version != 6) { if (current_cpu == "arm" && arm_version != 6) {
# TODO(hans) Enable integrated-as (crbug.com/124610). # TODO(hans) Enable integrated-as (crbug.com/124610).
asmflags += [ "-fno-integrated-as" ] asmflags += [ "-fno-integrated-as" ]
...@@ -97,10 +98,22 @@ if (is_win && !is_msan) { ...@@ -97,10 +98,22 @@ if (is_win && !is_msan) {
} else { } else {
public_configs = [ ":no_asm_config" ] public_configs = [ ":no_asm_config" ]
} }
} else if (current_cpu == "arm" && (is_linux || is_android)) { } else if (current_cpu == "arm") {
sources += crypto_sources_linux_arm if (is_linux || is_android) {
} else if (current_cpu == "arm64" && (is_linux || is_android)) { sources += crypto_sources_linux_arm
sources += crypto_sources_linux_aarch64 } else if (is_ios) {
sources += crypto_sources_ios_arm
} else {
public_configs = [ ":no_asm_config" ]
}
} else if (current_cpu == "arm64") {
if (is_linux || is_android) {
sources += crypto_sources_linux_aarch64
} else if (is_ios) {
sources += crypto_sources_ios_aarch64
} else {
public_configs = [ ":no_asm_config" ]
}
} else { } else {
public_configs = [ ":no_asm_config" ] public_configs = [ ":no_asm_config" ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment