diff options
| author | Christopher Ferris <cferris@google.com> | 2014-05-12 21:56:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 21:56:57 +0000 |
| commit | b9d834bf13354e369d1e0dd96201e9fe3a952e03 (patch) | |
| tree | 7d0f6444b06835b47b69c2c19ff4bac87c060940 | |
| parent | 68ac3d580d3ac8c9a139b5f328db3776156b4e4c (diff) | |
| parent | 82b5fc4e61d6a8444bd29f2876b19521c2df0924 (diff) | |
| download | libcxxrt-b9d834bf13354e369d1e0dd96201e9fe3a952e03.tar.gz | |
am 82b5fc4e: Make guard_t 32 bit for mips.
* commit '82b5fc4e61d6a8444bd29f2876b19521c2df0924':
Make guard_t 32 bit for mips.
| -rw-r--r-- | src/guard.cc | 4 |
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; |