diff options
| author | buzbee <buzbee@google.com> | 2012-03-05 15:35:46 -0800 |
|---|---|---|
| committer | buzbee <buzbee@google.com> | 2012-03-05 15:35:46 -0800 |
| commit | a7678db092ac6bb79f7cad490099a1015fbbc714 (patch) | |
| tree | 95181107e5ef16068298cbec717b605f54748ca4 /build | |
| parent | e88dfbf138bc204b1ce21911f1c34098ea74af7c (diff) | |
| download | art-a7678db092ac6bb79f7cad490099a1015fbbc714.zip art-a7678db092ac6bb79f7cad490099a1015fbbc714.tar.gz art-a7678db092ac6bb79f7cad490099a1015fbbc714.tar.bz2 | |
x86 source code hack and slash
Made a pass over the compiler source to get it into a compileable
state for the x86 target. Lots of temporary #ifdefs, but it
compiles and makes it to oatArchInit().
Change-Id: Ib8bcd2a032e47dcb83430dbc479a29758e084359
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 7680f06..0dcfd82 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -28,6 +28,13 @@ else ART_MIPS_TARGET := false endif +# Build for x86 target (temporary) +ifneq ($(wildcard art/X86_TARGET),) +ART_X86_TARGET := true +else +ART_X86_TARGET := false +endif + ifeq ($(ART_USE_LLVM_COMPILER),true) LLVM_ROOT_PATH := external/llvm include $(LLVM_ROOT_PATH)/llvm.mk @@ -248,6 +255,13 @@ LIBART_COMMON_SRC_FILES += \ src/compiler/codegen/mips/Assemble.cc \ src/compiler/codegen/mips/mips/Codegen.cc else +ifeq ($(ART_X86_TARGET),true) +LIBART_COMMON_SRC_FILES += \ + src/compiler/codegen/x86/ArchUtility.cc \ + src/compiler/codegen/x86/X86RallocUtil.cc \ + src/compiler/codegen/x86/Assemble.cc \ + src/compiler/codegen/x86/x86/Codegen.cc +else LIBART_COMMON_SRC_FILES += \ src/compiler/codegen/arm/ArchUtility.cc \ src/compiler/codegen/arm/ArmRallocUtil.cc \ @@ -255,6 +269,7 @@ LIBART_COMMON_SRC_FILES += \ src/compiler/codegen/arm/armv7-a/Codegen.cc endif endif +endif LIBART_TARGET_SRC_FILES := \ $(LIBART_COMMON_SRC_FILES) \ |