aboutsummaryrefslogtreecommitdiff
path: root/vm/compiler/Compiler.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-05 13:23:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-05 13:23:28 -0700
commitb91f922c80b454fa579deaee262bdd51225b82ee (patch)
treeb03d52402d67163cd4680d29768847a8a14ce2f0 /vm/compiler/Compiler.cpp
parent8c44176ceda51ac586346a64a5ce3af2c0e66624 (diff)
parentf3079bdadf30d93b37e0a59a8787c636027a36f5 (diff)
am f3079bda: Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
* commit 'f3079bdadf30d93b37e0a59a8787c636027a36f5': Rename unreasonable function name dmvCompilerTemplateEnd
Diffstat (limited to 'vm/compiler/Compiler.cpp')
-rw-r--r--vm/compiler/Compiler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/compiler/Compiler.cpp b/vm/compiler/Compiler.cpp
index 188027f3d..66fd1b1c2 100644
--- a/vm/compiler/Compiler.cpp
+++ b/vm/compiler/Compiler.cpp
@@ -27,7 +27,7 @@
#endif
extern "C" void dvmCompilerTemplateStart(void);
-extern "C" void dmvCompilerTemplateEnd(void);
+extern "C" void dvmCompilerTemplateEnd(void);
static inline bool workQueueLength(void)
{
@@ -193,7 +193,7 @@ bool dvmCompilerSetupCodeCache(void)
#ifndef ARCH_IA32
/* Copy the template code into the beginning of the code cache */
- int templateSize = (intptr_t) dmvCompilerTemplateEnd -
+ int templateSize = (intptr_t) dvmCompilerTemplateEnd -
(intptr_t) dvmCompilerTemplateStart;
memcpy((void *) gDvmJit.codeCache,
(void *) dvmCompilerTemplateStart,