Bug#821013: src:qtwebkit: Fix FTBFS on x32

[James Clarke <jrtc27@jrtc27.com>]

Package: src:qtwebkit
Version: 2.3.4.dfsg-6
Severity: important
Tags: patch

Hi,
Currently qtwebkit FTBFS on x32 due to Atomics.h assuming CPU(X86_64) means
64-bit pointers. The attached patch fixes this, and is sufficient to build from
source.

Regards,
James



-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.4.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

--- a/Source/WTF/wtf/Atomics.h
+++ b/Source/WTF/wtf/Atomics.h
@@ -170,7 +170,7 @@
 inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* newValue)
 {
 #if ENABLE(COMPARE_AND_SWAP)
-#if CPU(X86_64)
+#if CPU(X86_64) && !CPU(X32)
     bool result;
     asm volatile(
         "lock; cmpxchgq %3, %2\n\t"