diff options
| author | Dragos Sbirlea <dragoss@google.com> | 2013-06-21 09:20:34 -0700 |
|---|---|---|
| committer | Dragos Sbirlea <dragoss@google.com> | 2013-06-25 13:12:53 -0700 |
| commit | 7467ee05012e1fd9834df74663c1ebda46f5636b (patch) | |
| tree | d93d7b7f13440eff50c552ccdab8ce8e4e5a9547 /build/Android.common.mk | |
| parent | b126134010ebeee771da0eec7fa76ad13fe9a9c9 (diff) | |
| download | art-7467ee05012e1fd9834df74663c1ebda46f5636b.zip art-7467ee05012e1fd9834df74663c1ebda46f5636b.tar.gz art-7467ee05012e1fd9834df74663c1ebda46f5636b.tar.bz2 | |
Added support for SEA IR.
- Modified makefile to take the existance of SEA_IR_ART
file to mean "switch to sea ir mode".
- Switching SEA IR mode on leads to the new compiler being
fed the fibonacci methods only, if they are used as input.
- Added partial support for the control flow subgraph of
the SEA IR (instruction nodes and region nodes for
conditional and unconditional branches).
Change-Id: I29020b8e2df5a00fde75715c3683cc25038589f4
Conflicts:
src/compiler/driver/compiler_driver.cc
Diffstat (limited to 'build/Android.common.mk')
| -rw-r--r-- | build/Android.common.mk | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index a7bf944..33c5ac6 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -23,6 +23,15 @@ ifeq ($(WITH_ART_SMALL_MODE), true) ART_SMALL_MODE := true endif +ART_SEA_IR_MODE := false +ifneq ($(wildcard art/SEA_IR_ART),) +$(info Enabling ART_SEA_IR_MODE because of existence of art/SEA_IR_ART) +ART_SEA_IR_MODE := true +endif +ifeq ($(WITH_ART_SEA_IR_MODE), true) +ART_SEA_IR_MODE := true +endif + ART_USE_PORTABLE_COMPILER := false ifneq ($(wildcard art/USE_PORTABLE_COMPILER),) $(info Enabling ART_USE_PORTABLE_COMPILER because of existence of art/USE_PORTABLE_COMPILER) @@ -71,6 +80,10 @@ ifeq ($(ART_SMALL_MODE),true) art_cflags += -DART_SMALL_MODE=1 endif +ifeq ($(ART_SEA_IR_MODE),true) + art_cflags += -DART_SEA_IR_MODE=1 +endif + # TODO: enable -std=gnu++0x for auto support when on Ubuntu 12.04 LTS (Precise Pangolin) # On 10.04 LTS (Lucid Lynx), it can cause dependencies on GLIBCXX_3.4.14 version symbols. @@ -302,6 +315,11 @@ LIBART_COMMON_SRC_FILES += \ src/oat/runtime/support_throw.cc \ src/oat/runtime/support_interpreter.cc +ifeq ($(ART_SEA_IR_MODE),true) +LIBART_COMMON_SRC_FILES += \ + src/compiler/sea_ir/sea.cc +endif + LIBART_TARGET_SRC_FILES := \ $(LIBART_COMMON_SRC_FILES) \ src/base/logging_android.cc \ |