| commit | fa9b594525939ef0d72c78f3c3263316bdd63acb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Nov 26 14:34:45 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 26 14:34:45 2013 -0800 |
| tree | cbe4b1eccd07c30587f47575192d11321704aa9d | |
| parent | dd0ada27da29343e5cd50066801ae3e0794b8b6b [diff] | |
| parent | af82e0cce0f7fe5611c47493372183a7963397bf [diff] |
am af82e0cc: Merge "[MIPS] Enable futex support" * commit 'af82e0cce0f7fe5611c47493372183a7963397bf': [MIPS] Enable futex support
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index feb8a6c..b894c0a 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h
@@ -32,7 +32,7 @@ #if defined(__APPLE__) #define ART_USE_FUTEXES 0 #else -#define ART_USE_FUTEXES !defined(__mips__) +#define ART_USE_FUTEXES 1 #endif // Currently Darwin doesn't support locks with timeouts.