diff options
| author | 2012-12-21 11:16:29 -0800 | |
|---|---|---|
| committer | 2013-01-08 14:38:02 -0800 | |
| commit | 26f10eed520942d3db754c31941e457048475f61 (patch) | |
| tree | 6b0bdd82479c1a6d8fed05071b1990df5840e803 /src/compiler_llvm/compilation_unit.h | |
| parent | 1a25aa432314bcf008c11e3514afc0b7aeb64d5c (diff) | |
Fix Portable build
A previous change broke the ability to compile the Portable build.
Instead of building Portable, we unwittingly were building Iceland.
This CL fixes that, along with some bitrot unknowingly introduced
by subsequent CLs.
In particular, the debugger support change to add an intrinsic
call to associate value definitions with the original Dalvik
VReg broke llvm's Phi constraint. Fixed.
However, problems remain. Though the build is now fixed, CLs
subsequent to the makefile breakage broke the Portable llvm backend.
This CL will shift all Portable compilations to Iceland while the
new breakage is being addressed.
Change-Id: I7b08b26ed653a7b477f0ae9a226b7ee09c6b3398
Diffstat (limited to 'src/compiler_llvm/compilation_unit.h')
| -rw-r--r-- | src/compiler_llvm/compilation_unit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler_llvm/compilation_unit.h b/src/compiler_llvm/compilation_unit.h index 591d4f0a31..6ebac9aa68 100644 --- a/src/compiler_llvm/compilation_unit.h +++ b/src/compiler_llvm/compilation_unit.h @@ -29,7 +29,7 @@ #include "safe_map.h" #if defined(ART_USE_PORTABLE_COMPILER) -# include "compiler/Dalvik.h" +# include "compiler/compiler_internals.h" # include "compiler.h" # include "oat_compilation_unit.h" #endif |