diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-02-12 14:13:45 +0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-02-12 14:13:45 +0800 |
| commit | 43beb6268bd3989154991bccb831e2bc951402d8 (patch) | |
| tree | 17cf1dc4c788389f724822f56f7cacf65b56f35f | |
| parent | 504d124287c179d66fd79e93913a4b0739f1d204 (diff) | |
| parent | b61b0c330428fbc8ec92bb295b9836e577d46d63 (diff) | |
| download | protobuf-43beb6268bd3989154991bccb831e2bc951402d8.tar.gz protobuf-43beb6268bd3989154991bccb831e2bc951402d8.tar.bz2 protobuf-43beb6268bd3989154991bccb831e2bc951402d8.zip | |
Merge pull request #201 from gordana-cmiljanovic-imgtec/mips-atomic-ops-fix
MIPS: remove immediate constraint within CompareAndSwap.
| -rw-r--r-- | src/google/protobuf/stubs/atomicops_internals_mips_gcc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h b/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h index e3cd14cf..f5837c9e 100644 --- a/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h +++ b/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h @@ -65,7 +65,7 @@ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, "2:\n" ".set pop\n" : "=&r" (prev), "=m" (*ptr), "=&r" (tmp) - : "Ir" (old_value), "r" (new_value), "m" (*ptr) + : "r" (old_value), "r" (new_value), "m" (*ptr) : "memory"); return prev; } @@ -197,7 +197,7 @@ inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr, "2:\n" ".set pop\n" : "=&r" (prev), "=m" (*ptr), "=&r" (tmp) - : "Ir" (old_value), "r" (new_value), "m" (*ptr) + : "r" (old_value), "r" (new_value), "m" (*ptr) : "memory"); return prev; } |