summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Cheng <bccheng@google.com>2010-09-23 01:23:14 -0700
committerBen Cheng <bccheng@google.com>2010-09-23 20:12:48 -0700
commit629e692379a8b12641a4402ff1c9f67af879f68e (patch)
tree50a7f073170791de0b59969994b497e91c34671c
parent4934b377d9cf5df6f80da7caab4f2178c6cec307 (diff)
downloadandroid_dalvik-629e692379a8b12641a4402ff1c9f67af879f68e.tar.gz
android_dalvik-629e692379a8b12641a4402ff1c9f67af879f68e.tar.bz2
android_dalvik-629e692379a8b12641a4402ff1c9f67af879f68e.zip
Print the JIT codegen type in the VM configuration list.
Example: Configured with: debugger profiler hprof jit(armv7-a-neon) show_exception=1 So that the CPU capability on JIT-enabled devices can be exposed. (cherry-picked from dalvik-dev) Change-Id: I887201e7023ca94cd9c3d690f03b7b042175e6ed
-rw-r--r--vm/Dvm.mk1
-rw-r--r--vm/Init.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 85fc59806..0867ffa87 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -27,6 +27,7 @@
LOCAL_CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2 -fno-align-jumps
#LOCAL_CFLAGS += -DUSE_INDIRECT_REF
LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter
+LOCAL_CFLAGS += -DARCH_VARIANT=\"$(dvm_arch_variant)\"
#
# Optional features. These may impact the size or performance of the VM.
diff --git a/vm/Init.c b/vm/Init.c
index 72f6218ea..24513f3fa 100644
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -182,7 +182,7 @@ static void dvmUsage(const char* progName)
" profile_field_access"
#endif
#if defined(WITH_JIT)
- " jit"
+ " jit(" ARCH_VARIANT ")"
#endif
#if defined(WITH_SELF_VERIFICATION)
" self_verification"