Merge change 4695

* changes:
  Quick experiment with ARMv6 instructions.
diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
index adafb48..c1b4733 100644
--- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
+++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
@@ -895,7 +895,7 @@
      * Generic 32bit-to-32bit floating point unary operation.  Provide an
      * "instr" line that specifies an instruction that performs "s1 = op s0".
      *
-     * For: flot-to-int, int-to-float
+     * For: float-to-int, int-to-float
      *
      * On entry:
      *     r0 = target dalvik register address
@@ -941,7 +941,7 @@
      * Generic 32bit-to-32bit floating point unary operation.  Provide an
      * "instr" line that specifies an instruction that performs "s1 = op s0".
      *
-     * For: flot-to-int, int-to-float
+     * For: float-to-int, int-to-float
      *
      * On entry:
      *     r0 = target dalvik register address
diff --git a/vm/mterp/out/InterpAsm-armv4t.S b/vm/mterp/out/InterpAsm-armv4t.S
index 21fb884..5dba929 100644
--- a/vm/mterp/out/InterpAsm-armv4t.S
+++ b/vm/mterp/out/InterpAsm-armv4t.S
@@ -201,12 +201,6 @@
  */
 #include "../common/asm-constants.h"
 
-/*
- * Power of 2 width in bits of the hash table size.
- *   for ex: 9 -> 512, 10-> 1024, etc.
-#define JIT_PROF_TAB_WIDTH    12
-#define JIT_PROF_TAB_LSHIFT   (32 - JIT_PROF_TAB_WIDTH)
-#defnie JIT_PROF_TAB_THRESH_RESET 255
 
 /* File: armv5te/platform.S */
 /*
diff --git a/vm/mterp/out/InterpAsm-armv5te-vfp.S b/vm/mterp/out/InterpAsm-armv5te-vfp.S
index 55a157d..7412f29 100644
--- a/vm/mterp/out/InterpAsm-armv5te-vfp.S
+++ b/vm/mterp/out/InterpAsm-armv5te-vfp.S
@@ -201,12 +201,6 @@
  */
 #include "../common/asm-constants.h"
 
-/*
- * Power of 2 width in bits of the hash table size.
- *   for ex: 9 -> 512, 10-> 1024, etc.
-#define JIT_PROF_TAB_WIDTH    12
-#define JIT_PROF_TAB_LSHIFT   (32 - JIT_PROF_TAB_WIDTH)
-#defnie JIT_PROF_TAB_THRESH_RESET 255
 
 /* File: armv5te/platform.S */
 /*
diff --git a/vm/mterp/out/InterpAsm-armv5te.S b/vm/mterp/out/InterpAsm-armv5te.S
index 68ae10d..8264164 100644
--- a/vm/mterp/out/InterpAsm-armv5te.S
+++ b/vm/mterp/out/InterpAsm-armv5te.S
@@ -201,12 +201,6 @@
  */
 #include "../common/asm-constants.h"
 
-/*
- * Power of 2 width in bits of the hash table size.
- *   for ex: 9 -> 512, 10-> 1024, etc.
-#define JIT_PROF_TAB_WIDTH    12
-#define JIT_PROF_TAB_LSHIFT   (32 - JIT_PROF_TAB_WIDTH)
-#defnie JIT_PROF_TAB_THRESH_RESET 255
 
 /* File: armv5te/platform.S */
 /*