From c89d83e1c05979b68037ad15413fa4460a88e36f Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 25 Feb 2013 17:04:06 -0800
Subject: Fix -Xjitthreshold.

Previously, we'd always overwrite the user-supplied value because
the architecture-specific default gets set so late.

Bug: https://code.google.com/p/android/issues/detail?id=52017
Change-Id: I469bf9ce599820f5ce3dea346aa8f680deffb0c5
---
 vm/compiler/codegen/x86/CodegenInterface.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'vm/compiler/codegen/x86/CodegenInterface.cpp')

diff --git a/vm/compiler/codegen/x86/CodegenInterface.cpp b/vm/compiler/codegen/x86/CodegenInterface.cpp
index c4ad445e5..6670bda6d 100644
--- a/vm/compiler/codegen/x86/CodegenInterface.cpp
+++ b/vm/compiler/codegen/x86/CodegenInterface.cpp
@@ -64,7 +64,9 @@ bool dvmCompilerArchInit() {
     /* Target-specific configuration */
     gDvmJit.jitTableSize = 1 << 12;
     gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1;
-    gDvmJit.threshold = 255;
+    if (gDvmJit.threshold != 0) {
+        gDvmJit.threshold = 255;
+    }
     gDvmJit.codeCacheSize = 512*1024;
     gDvmJit.optLevel = kJitOptLevelO1;
 
-- 
cgit v1.2.3