X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=vm%2FAtomic.cpp;h=ccbf64af0a7e0c705aa4cf9640484af04705cf9c;hb=c5d0614f778e0f26db913fdc7320f08e9417e984;hp=ac5d8ac3a045d71a32ac59fe1bf787a28223d582;hpb=5220f12dca8ad2666a97e36862bf0d4767e3555e;p=android-x86%2Fdalvik.git

diff --git a/vm/Atomic.cpp b/vm/Atomic.cpp
index ac5d8ac3a..ccbf64af0 100644
--- a/vm/Atomic.cpp
+++ b/vm/Atomic.cpp
@@ -42,9 +42,6 @@
 #define NEED_PTHREADS_QUASI_ATOMICS 1
 #endif
 
-#elif defined(__sh__)
-#define NEED_PTHREADS_QUASI_ATOMICS 1
-
 #else
 #error "Unsupported atomic operations for this platform"
 #endif
@@ -185,7 +182,9 @@ void dvmQuasiAtomicsShutdown() {
     for (size_t i = 0; i < kSwapLockCount; ++i) {
         pthread_mutex_t* m = gSwapLocks[i];
         gSwapLocks[i] = NULL;
-        dvmDestroyMutex(m);
+        if (m != NULL) {
+            dvmDestroyMutex(m);
+        }
         delete m;
     }
 }