diff options
| author | Anwar Ghuloum <anwarg@google.com> | 2013-06-27 07:13:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-27 07:13:43 +0000 |
| commit | e53ebbcf98d004f0e1f631a630d0344d104e3dc6 (patch) | |
| tree | 6190aab5b5c6061a25df9931e1b0dbd6229d0a95 /build | |
| parent | eac1880f791c4a2b18f1b197cc6289a28ec11252 (diff) | |
| parent | 39f992750ac1eb7e51955d3e52bddc32b37c370f (diff) | |
| download | art-e53ebbcf98d004f0e1f631a630d0344d104e3dc6.zip art-e53ebbcf98d004f0e1f631a630d0344d104e3dc6.tar.gz art-e53ebbcf98d004f0e1f631a630d0344d104e3dc6.tar.bz2 | |
Merge changes I3b33358e,I7467ee05 into dalvik-dev
* changes:
Added wrapper functions for register acccess in Instruction.
Added support for SEA IR.
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common.mk | 18 | ||||
| -rw-r--r-- | build/Android.libart-compiler.mk | 5 |
2 files changed, 23 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 \ diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk index 708a488..25e6997 100644 --- a/build/Android.libart-compiler.mk +++ b/build/Android.libart-compiler.mk @@ -76,6 +76,11 @@ LIBART_COMPILER_SRC_FILES := \ src/elf_writer.cc \ src/elf_writer_quick.cc +ifeq ($(ART_SEA_IR_MODE),true) +LIBART_COMPILER_SRC_FILES += \ + src/compiler/sea_ir/frontend.cc +endif + LIBART_COMPILER_CFLAGS := ifeq ($(ART_USE_PORTABLE_COMPILER),true) LIBART_COMPILER_SRC_FILES += src/elf_writer_mclinker.cc |