diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-10 14:45:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-10 14:46:25 +0100 |
| commit | 1ee472207c63905ab4455e676ee3ffd3263ab2cb (patch) | |
| tree | 5e00ee54aa0f963665e124c2e5ce6a6a554c484f /Source/WTF | |
| parent | 5160ca54bb01b1d7bb0e6b359aa3d475df22e6f0 (diff) | |
| parent | 650c6ee8e76bb574d3a1bea09e2494992d8f070e (diff) | |
| download | qtwebkit-1ee472207c63905ab4455e676ee3ffd3263ab2cb.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1
Change-Id: I824a984e8552340c2f9f631ac951f2c9eaa90b74
Diffstat (limited to 'Source/WTF')
| -rw-r--r-- | Source/WTF/wtf/Atomics.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WTF/wtf/Atomics.h b/Source/WTF/wtf/Atomics.h index 4b3eb4b88..8f950c718 100644 --- a/Source/WTF/wtf/Atomics.h +++ b/Source/WTF/wtf/Atomics.h @@ -188,7 +188,7 @@ inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* ne #if CPU(X86_64) bool result; asm volatile( - "lock; cmpxchgq %3, %2\n\t" + "lock; cmpxchg %3, %2\n\t" "sete %1" : "+a"(expected), "=q"(result), "+m"(*location) : "r"(newValue) |