commit 179f375ef1237e13a5d006bdbd48f37ca3dfad46
author jeffhao <jeffhao@google.com> Fri Oct 12 17:22:35 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 12 17:22:36 2012 -0700
tree e589497c2ea5990610667451668401ab45a646f2
parent ed6d5ed3494648780b9e91422c90d6bc22c16b79
parent fa147e22a73c6df166b08a2f71f9c9b52b09d17c

Merge "Numerous fixes to MIPS. Basic oatexec works." into dalvik-dev

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index b0d373b..1be7b75 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -389,6 +389,7 @@
     MutexLock mu(self, compiled_methods_lock_);
     STLDeleteElements(&methods_to_patch_);
   }
+  CHECK_PTHREAD_CALL(pthread_key_delete, (tls_key_), "delete tls key");
 #if defined(ART_USE_LLVM_COMPILER)
   // Uninitialize compiler_context_
   typedef void (*UninitCompilerContextFn)(Compiler&);

src/compiler/Frontend.cc

diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index 72eb8a1..9db23ac 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -25,7 +25,9 @@
 #include <llvm/Support/Threading.h>
 
 namespace {
+#if !defined(ART_USE_LLVM_COMPILER)
   pthread_once_t llvm_multi_init = PTHREAD_ONCE_INIT;
+#endif
   void InitializeLLVMForQuick() {
     llvm::llvm_start_multithreaded();
   }