diff options
author | Akos Palfi <akos.palfi@imgtec.com> | 2015-01-21 11:37:55 +0100 |
---|---|---|
committer | Akos Palfi <akos.palfi@imgtec.com> | 2015-01-21 10:38:18 +0000 |
commit | 9dc11c782b183920f94a64fb7fbfd9c63864525e (patch) | |
tree | 9b73f2c42935b3ff6f3b3c76ac34928d3267f41a | |
parent | 1bf660fafd6c66fe862d5eef0b06e53e9967621b (diff) | |
download | v8-9dc11c782b183920f94a64fb7fbfd9c63864525e.tar.gz |
Version 3.30.33.16 (cherry-pick)
Merged eb68d6fe13f13b0697dd2b4ff00df1d7c997669e
MIPS: remove immediate constraint within CompareAndSwap.
R=jkummerow@chromium.org, paul.lind@imgtec.com, machenbach@chromium.org
BUG=
Review URL: https://codereview.chromium.org/857303003
Cr-Commit-Position: refs/branch-heads/3.30@{#25270}
-rw-r--r-- | src/base/atomicops_internals_mips64_gcc.h | 4 | ||||
-rw-r--r-- | src/base/atomicops_internals_mips_gcc.h | 2 | ||||
-rw-r--r-- | src/version.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/base/atomicops_internals_mips64_gcc.h b/src/base/atomicops_internals_mips64_gcc.h index 1f629b6ea..ccb973c03 100644 --- a/src/base/atomicops_internals_mips64_gcc.h +++ b/src/base/atomicops_internals_mips64_gcc.h @@ -59,7 +59,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; } @@ -196,7 +196,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; } diff --git a/src/base/atomicops_internals_mips_gcc.h b/src/base/atomicops_internals_mips_gcc.h index d33b66876..442fdd0f9 100644 --- a/src/base/atomicops_internals_mips_gcc.h +++ b/src/base/atomicops_internals_mips_gcc.h @@ -36,7 +36,7 @@ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, "2:\n" ".set pop\n" : "=&r" (prev), "=&r" (tmp) - : "Ir" (old_value), "r" (new_value), "r" (ptr) + : "r" (old_value), "r" (new_value), "r" (ptr) : "memory"); return prev; } diff --git a/src/version.cc b/src/version.cc index a2997459d..0ef9ddaf4 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 30 #define BUILD_NUMBER 33 -#define PATCH_LEVEL 15 +#define PATCH_LEVEL 16 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 |