| Index: build/config/arm.gni | 
| diff --git a/build/config/arm.gni b/build/config/arm.gni | 
| index 6eeca62778b35a90d1630b62d57b1cd8ff23297a..27ed7738abced64765080e78be18d9e7eadb81c9 100644 | 
| --- a/build/config/arm.gni | 
| +++ b/build/config/arm.gni | 
| @@ -39,7 +39,7 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") { | 
| arm_float_abi == "soft" || arm_float_abi == "softfp") | 
|  | 
| if (arm_use_neon == "") { | 
| -    if (current_os == "linux" && current_cpu != v8_current_cpu) { | 
| +    if (current_os == "linux" && target_cpu != v8_target_cpu) { | 
| # Don't use neon on V8 simulator builds as a default. | 
| arm_use_neon = false | 
| } else { | 
| @@ -66,7 +66,7 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") { | 
| if (arm_float_abi == "") { | 
| if (current_os == "android" || target_os == "android") { | 
| arm_float_abi = "softfp" | 
| -      } else if (current_os == "linux" && current_cpu != v8_current_cpu) { | 
| +      } else if (current_os == "linux" && target_cpu != v8_target_cpu) { | 
| # Default to the same as Android for V8 simulator builds. | 
| arm_float_abi = "softfp" | 
| } else { | 
|  |