[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
dimich at chromium.org
dimich at chromium.org
Wed Jan 6 00:19:55 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 191de512c438e23d7a2fbe031a85001c908fcec4
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 4 23:05:34 2010 +0000
Not reviewed, attempt to fix ARM bulid.
* wtf/Platform.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52763 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f3fd4bb..7909506 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-04 Dmitry Titov <dimich at chromium.org>
+
+ Not reviewed, attempt to fix ARM bulid.
+
+ * wtf/Platform.h:
+
2010-01-04 Gavin Barraclough <barraclough at apple.com>
Rubber stamped by Geoff Garen.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 64ae3af..cff18dc 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -251,7 +251,7 @@
/* CPU(ARMV5_OR_LOWER) - ARM instruction set v5 or earlier */
/* On ARMv5 and below the natural alignment is required.
And there are some other differences for v5 or earlier. */
-#if !defined(ARMV5_OR_LOWER) && !CPU_ARM_ARCH_AT_LEAST(6)
+#if !defined(ARMV5_OR_LOWER) && !WTF_ARM_ARCH_AT_LEAST(6)
#define WTF_CPU_ARMV5_OR_LOWER 1
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list