Commit e90481d1 authored by hashimoto's avatar hashimoto Committed by Commit bot

gn: Make arm_fpu configurable

Chrome OS needs to use values like neon-vfpv4 or crypto-neon-fp-armv8.

BUG=670541

Review-Url: https://codereview.chromium.org/2546033002
Cr-Commit-Position: refs/heads/master@{#436231}
parent 0a193627
...@@ -18,6 +18,10 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") { ...@@ -18,6 +18,10 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
# An empty string means to use the default for the arm_version. # An empty string means to use the default for the arm_version.
arm_arch = "" arm_arch = ""
# The ARM floating point hardware. This will be a string like "neon" or
# "vfpv3". An empty string means to use the default for the arm_version.
arm_fpu = ""
# The ARM floating point mode. This is either the string "hard", "soft", or # The ARM floating point mode. This is either the string "hard", "soft", or
# "softfp". An empty string means to use the default one for the # "softfp". An empty string means to use the default one for the
# arm_version. # arm_version.
...@@ -61,7 +65,9 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") { ...@@ -61,7 +65,9 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
if (arm_float_abi == "") { if (arm_float_abi == "") {
arm_float_abi = "softfp" arm_float_abi = "softfp"
} }
arm_fpu = "vfp" if (arm_fpu == "") {
arm_fpu = "vfp"
}
arm_use_thumb = false arm_use_thumb = false
} else if (arm_version == 7) { } else if (arm_version == 7) {
if (arm_arch == "") { if (arm_arch == "") {
...@@ -82,10 +88,12 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") { ...@@ -82,10 +88,12 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
} }
} }
if (arm_use_neon) { if (arm_fpu == "") {
arm_fpu = "neon" if (arm_use_neon) {
} else { arm_fpu = "neon"
arm_fpu = "vfpv3-d16" } else {
arm_fpu = "vfpv3-d16"
}
} }
} else if (arm_version == 8) { } else if (arm_version == 8) {
if (arm_arch == "") { if (arm_arch == "") {
...@@ -103,10 +111,12 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") { ...@@ -103,10 +111,12 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
} }
} }
if (arm_use_neon) { if (arm_fpu == "") {
arm_fpu = "neon" if (arm_use_neon) {
} else { arm_fpu = "neon"
arm_fpu = "vfpv3-d16" } else {
arm_fpu = "vfpv3-d16"
}
} }
} }
} else if (current_cpu == "arm64" || v8_current_cpu == "arm64") { } else if (current_cpu == "arm64" || v8_current_cpu == "arm64") {
......
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