diff options
| author | 2014-11-14 00:21:21 +0000 | |
|---|---|---|
| committer | 2014-11-14 00:21:21 +0000 | |
| commit | 963ab93759c051af21c07669f0d3f345e60b1da8 (patch) | |
| tree | c76704c266ef4687eab425612ddf3fd24f93fe8d /compiler/optimizing/code_generator.h | |
| parent | f20076ff813b8012096ff31af236d59db3c0f4e1 (diff) | |
| parent | d582fa4ea62083a7598dded5b82dc2198b3daac7 (diff) | |
Merge "Instruction set features for ARM64, MIPS and X86."
Diffstat (limited to 'compiler/optimizing/code_generator.h')
| -rw-r--r-- | compiler/optimizing/code_generator.h | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index ac4fc67c2c..63bf96ca5a 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -17,9 +17,9 @@  #ifndef ART_COMPILER_OPTIMIZING_CODE_GENERATOR_H_  #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_H_ +#include "arch/instruction_set.h"  #include "base/bit_field.h"  #include "globals.h" -#include "instruction_set.h"  #include "locations.h"  #include "memory_region.h"  #include "nodes.h"  |