aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-05-12 14:42:25 -0700
committerChristopher Ferris <cferris@google.com>2014-05-12 14:48:24 -0700
commit82b5fc4e61d6a8444bd29f2876b19521c2df0924 (patch)
tree7d0f6444b06835b47b69c2c19ff4bac87c060940
parent0ad2e9ca022104ba15b593ca44baba2d0ca2d86a (diff)
downloadlibcxxrt-82b5fc4e61d6a8444bd29f2876b19521c2df0924.tar.gz
Make guard_t 32 bit for mips.
The mips arch does not compile with a 64 bit guard_t. Change-Id: I555cb49085642b5dd378d8c6b61bceefd452e4fb
-rw-r--r--src/guard.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/guard.cc b/src/guard.cc
index d9220a0..fe6db59 100644
--- a/src/guard.cc
+++ b/src/guard.cc
@@ -67,8 +67,8 @@
* The least significant bit of the guard variable indicates that the object
* has been initialised, the most significant bit is used for a spinlock.
*/
-#ifdef __arm__
-// ARM ABI - 32-bit guards.
+#if defined(__arm__) || defined(__mips__)
+// ARM/MIPS ABI - 32-bit guards.
typedef uint32_t guard_t;
static const uint32_t LOCKED = static_cast<guard_t>(1) << 31;
static const uint32_t INITIALISED = 1;