commit 467d94a3d926620b01b034eff68fdcaf2b5fb579
author Nicolas Geoffray <ngeoffray@google.com> Thu Mar 16 10:24:17 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Mar 16 10:24:17 2017 +0000
tree 64f16e96e416902e5a203eb94fb33e09f9d3a4e8
parent 25275bef429dc6a48b79411e0d0b32207294523b

Revert "Revert "ARM: VIXL32: Use VIXL backend by default.""

bug:35977033

This reverts commit 25275bef429dc6a48b79411e0d0b32207294523b.

Change-Id: I440bf8415e2bf550607595499701fb3e7c33b37e

compiler/optimizing/code_generator_arm_vixl.h

diff --git a/compiler/optimizing/code_generator_arm_vixl.h b/compiler/optimizing/code_generator_arm_vixl.h
index 8ae3b7d..3f52c72 100644
--- a/compiler/optimizing/code_generator_arm_vixl.h
+++ b/compiler/optimizing/code_generator_arm_vixl.h
@@ -35,11 +35,11 @@
 #include "aarch32/macro-assembler-aarch32.h"
 #pragma GCC diagnostic pop
 
-// True if VIXL32 should be used for codegen on ARM.
-#ifdef ART_USE_VIXL_ARM_BACKEND
-static constexpr bool kArmUseVIXL32 = true;
-#else
+// Default to use the VIXL-based backend on ARM.
+#ifdef ART_USE_OLD_ARM_BACKEND
 static constexpr bool kArmUseVIXL32 = false;
+#else
+static constexpr bool kArmUseVIXL32 = true;
 #endif
 
 namespace art {