diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-06-25 14:35:34 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-06-25 14:35:34 +0100 |
| commit | 20550910e608ed7d86db97927d2ce9d2191061a4 (patch) | |
| tree | 685b5ede42c3583c0152f784567026b1afc8e55d /compiler/optimizing/code_generator_arm.h | |
| parent | ae43e2b11cc5af5b632700a9e4e4d9ed436b24dc (diff) | |
| download | android_art-20550910e608ed7d86db97927d2ce9d2191061a4.tar.gz android_art-20550910e608ed7d86db97927d2ce9d2191061a4.tar.bz2 android_art-20550910e608ed7d86db97927d2ce9d2191061a4.zip | |
Re-enable tests with the optimizing compiler.
Tests run ok on my host/target. I reverted the move to
using thumb2, because tests were crashing. But I could not
reproduce file limits issues.
Change-Id: I26bc4ec1eb6c227750d11210e012d9d3b1d824af
Diffstat (limited to 'compiler/optimizing/code_generator_arm.h')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm.h b/compiler/optimizing/code_generator_arm.h index 0e2a079cde..712a24cf67 100644 --- a/compiler/optimizing/code_generator_arm.h +++ b/compiler/optimizing/code_generator_arm.h @@ -20,7 +20,7 @@ #include "code_generator.h" #include "nodes.h" #include "parallel_move_resolver.h" -#include "utils/arm/assembler_thumb2.h" +#include "utils/arm/assembler_arm32.h" namespace art { namespace arm { @@ -180,7 +180,7 @@ class CodeGeneratorARM : public CodeGenerator { LocationsBuilderARM location_builder_; InstructionCodeGeneratorARM instruction_visitor_; ParallelMoveResolverARM move_resolver_; - Thumb2Assembler assembler_; + Arm32Assembler assembler_; DISALLOW_COPY_AND_ASSIGN(CodeGeneratorARM); }; |