diff options
author | Torne (Richard Coles) <torne@google.com> | 2015-02-03 10:34:47 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2015-02-03 10:34:47 +0000 |
commit | f00a6eb5f6db73f1b75c834e97e061fb3ed21cd9 (patch) | |
tree | e6c5f07a2fdc94ba18f2c47b18fe29138a89c681 | |
parent | 07dd6d95a3d41c36bf1b9d7261b0557b265d8b41 (diff) | |
parent | 9dc11c782b183920f94a64fb7fbfd9c63864525e (diff) | |
download | v8-f00a6eb5f6db73f1b75c834e97e061fb3ed21cd9.tar.gz |
Merge v8 from https://chromium.googlesource.com/v8/v8.git at 9dc11c782b183920f94a64fb7fbfd9c63864525e
This commit was generated by merge_from_chromium.py.
Change-Id: Iae5ad75e9f59463b65c607fe2e9cf625793dc30c
-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 |