[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[Gustavo Noronha Silva]

The following commit has been merged in the webkit-1.2 branch:
commit 5c566ec395dc96743ae649c8937ae0cec8565928
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 23 18:30:52 2010 +0000

    2010-03-23  Kent Hansen  <kent.hansen at nokia.com>
    
            Reviewed by Darin Adler.
    
            Fix compilation on Itanium in 32-bit mode
            https://bugs.webkit.org/show_bug.cgi?id=36494
    
            * wtf/Platform.h: Introduce CPU(IA64_32). Don't define
              WTF_USE_JSVALUE64 if the CPU is in 32-bit mode.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56403 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d739332..622b6ec 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-23  Kent Hansen  <kent.hansen at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Fix compilation on Itanium in 32-bit mode
+        https://bugs.webkit.org/show_bug.cgi?id=36494
+
+        * wtf/Platform.h: Introduce CPU(IA64_32). Don't define
+          WTF_USE_JSVALUE64 if the CPU is in 32-bit mode.
+
 2010-03-18  Tom Callaway  <tcallawa at redhat.com>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 92a80d3..369e14c 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -102,6 +102,10 @@
 /* CPU(IA64) - Itanium / IA-64 */
 #if defined(__ia64__)
 #define WTF_CPU_IA64 1
+/* 32-bit mode on Itanium */
+#if !defined(__LP64__)
+#define WTF_CPU_IA64_32 1
+#endif
 #endif
 
 /* CPU(MIPS) - MIPS 32-bit */
@@ -861,7 +865,7 @@
 
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
 #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
-    || CPU(IA64)  \
+    || (CPU(IA64) && !CPU(IA64_32)) \
     || CPU(ALPHA) \
     || CPU(SPARC64)
 #define WTF_USE_JSVALUE64 1

-- 
WebKit Debian packaging