| Index: build/config/arm.gni
|
| diff --git a/build/config/arm.gni b/build/config/arm.gni
|
| index 47c836a222190eb8ab3ea8daec385f2b5bdf2ac7..865f6427c368b72179ce91e0f901f6e0595b5d00 100644
|
| --- a/build/config/arm.gni
|
| +++ b/build/config/arm.gni
|
| @@ -18,6 +18,10 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
|
| # An empty string means to use the default for the arm_version.
|
| 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
|
| # "softfp". An empty string means to use the default one for the
|
| # arm_version.
|
| @@ -61,7 +65,9 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
|
| if (arm_float_abi == "") {
|
| arm_float_abi = "softfp"
|
| }
|
| - arm_fpu = "vfp"
|
| + if (arm_fpu == "") {
|
| + arm_fpu = "vfp"
|
| + }
|
| arm_use_thumb = false
|
| } else if (arm_version == 7) {
|
| if (arm_arch == "") {
|
| @@ -82,10 +88,12 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
|
| }
|
| }
|
|
|
| - if (arm_use_neon) {
|
| - arm_fpu = "neon"
|
| - } else {
|
| - arm_fpu = "vfpv3-d16"
|
| + if (arm_fpu == "") {
|
| + if (arm_use_neon) {
|
| + arm_fpu = "neon"
|
| + } else {
|
| + arm_fpu = "vfpv3-d16"
|
| + }
|
| }
|
| } else if (arm_version == 8) {
|
| if (arm_arch == "") {
|
| @@ -103,10 +111,12 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
|
| }
|
| }
|
|
|
| - if (arm_use_neon) {
|
| - arm_fpu = "neon"
|
| - } else {
|
| - arm_fpu = "vfpv3-d16"
|
| + if (arm_fpu == "") {
|
| + if (arm_use_neon) {
|
| + arm_fpu = "neon"
|
| + } else {
|
| + arm_fpu = "vfpv3-d16"
|
| + }
|
| }
|
| }
|
| } else if (current_cpu == "arm64" || v8_current_cpu == "arm64") {
|
|
|