diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-10 12:46:37 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-08-10 12:46:37 -0700 |
| commit | 8003b9b6c8e9091fe74c1ce2193448f1cba6683d (patch) | |
| tree | 5db3f681940f704df438f13754384468b99d8eb6 /Android.mksnapshot.mk | |
| parent | 08d4f3a1420ec9ed70ef67fc9a662dd47bc353e5 (diff) | |
| parent | 2461b847d44e0dfa125b5d7c566a52d3da2eb1df (diff) | |
| download | android_external_v8-8003b9b6c8e9091fe74c1ce2193448f1cba6683d.tar.gz android_external_v8-8003b9b6c8e9091fe74c1ce2193448f1cba6683d.tar.bz2 android_external_v8-8003b9b6c8e9091fe74c1ce2193448f1cba6683d.zip | |
resolved conflicts for merge of 2461b847 to jb-mr1-dev
Change-Id: If6f3619904a44a71bd8814e00cfcfd96abdf534c
Diffstat (limited to 'Android.mksnapshot.mk')
| -rw-r--r-- | Android.mksnapshot.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk index f73549b0..9ab80b40 100644 --- a/Android.mksnapshot.mk +++ b/Android.mksnapshot.mk @@ -24,6 +24,11 @@ ifeq ($(TARGET_ARCH),arm) V8_LOCAL_SRC_FILES += src/arm/simulator-arm.cc endif +ifeq ($(TARGET_ARCH),mips) +V8_LOCAL_SRC_FILES += src/mips/simulator-mips.cc + +endif + ifeq ($(HOST_ARCH),x86) V8_LOCAL_SRC_FILES += src/atomicops_internals_x86_gcc.cc endif @@ -90,6 +95,14 @@ ifeq ($(TARGET_CPU_ABI),armeabi-v7a) endif endif +ifeq ($(TARGET_ARCH),mips) + LOCAL_CFLAGS += -DV8_TARGET_ARCH_MIPS + LOCAL_CFLAGS += -DCAN_USE_FPU_INSTRUCTIONS + LOCAL_CFLAGS += -Umips + LOCAL_CFLAGS += -finline-limit=64 + LOCAL_CFLAGS += -fno-strict-aliasing +endif + ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += -DV8_TARGET_ARCH_IA32 endif |