[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dbates at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 2f1e71451e6000351359f6a2485aee9b4febbe9a
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 00:51:17 2011 +0000

    2011-01-10  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Martin Robinson.
    
            Remove extraneous COMPILER(GCC) condition when checking GCC_VERSION_AT_LEAST()
            https://bugs.webkit.org/show_bug.cgi?id=52178
    
            It is sufficient to test GCC_VERSION_AT_LEAST() instead of both COMPILER(GCC) and
            GCC_VERSION_AT_LEAST(). Notice GCC_VERSION_AT_LEAST() is defined to be 0 when we
            are not compiling with GCC.
    
            Fixes style issues at the callsites (i.e. replace comma with comma-space in
            macro function argument list). Also, makes a spelling correction in a comment.
    
            * jit/ExecutableAllocator.h:
            (JSC::ExecutableAllocator::cacheFlush):
            * wtf/Platform.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75454 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 9b34b84..d4d21f7 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-10  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Martin Robinson.
+
+        Remove extraneous COMPILER(GCC) condition when checking GCC_VERSION_AT_LEAST()
+        https://bugs.webkit.org/show_bug.cgi?id=52178
+
+        It is sufficient to test GCC_VERSION_AT_LEAST() instead of both COMPILER(GCC) and
+        GCC_VERSION_AT_LEAST(). Notice GCC_VERSION_AT_LEAST() is defined to be 0 when we
+        are not compiling with GCC.
+
+        Fixes style issues at the callsites (i.e. replace comma with comma-space in
+        macro function argument list). Also, makes a spelling correction in a comment.
+
+        * jit/ExecutableAllocator.h:
+        (JSC::ExecutableAllocator::cacheFlush):
+        * wtf/Platform.h:
+
 2011-01-10  Geoffrey Garen  <ggaren at apple.com>
 
         Build fix: removed some uses of nextNumber that I missed last time.
@@ -6,15 +24,6 @@
         (JSC::Heap::reset):
         (JSC::Heap::collectAllGarbage):
 
-2011-01-10  Geoffrey Garen  <ggaren at apple.com>
-
-        Reviewed by Oliver Hunt.
-
-        Removed dead number allocation code.
-        https://bugs.webkit.org/show_bug.cgi?id=52177
-
-        * runtime/Heap.h:
-
 2011-01-10  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Darin Adler.
diff --git a/Source/JavaScriptCore/jit/ExecutableAllocator.h b/Source/JavaScriptCore/jit/ExecutableAllocator.h
index d45f294..3233412 100644
--- a/Source/JavaScriptCore/jit/ExecutableAllocator.h
+++ b/Source/JavaScriptCore/jit/ExecutableAllocator.h
@@ -231,8 +231,8 @@ public:
 #elif CPU(MIPS)
     static void cacheFlush(void* code, size_t size)
     {
-#if COMPILER(GCC) && GCC_VERSION_AT_LEAST(4,3,0)
-#if WTF_MIPS_ISA_REV(2) && !GCC_VERSION_AT_LEAST(4,4,3)
+#if GCC_VERSION_AT_LEAST(4, 3, 0)
+#if WTF_MIPS_ISA_REV(2) && !GCC_VERSION_AT_LEAST(4, 4, 3)
         int lineSize;
         asm("rdhwr %0, $1" : "=r" (lineSize));
         //
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
index dc3b343..34b6cde 100644
--- a/Source/JavaScriptCore/wtf/Platform.h
+++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -87,7 +87,7 @@
 #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))
 #else
-/* define this for !GCC compilers, just so we can write things like COMPILER(GCC) && GCC_VERSION_AT_LEAST(4,1,0) */
+/* Define this for !GCC compilers, just so we can write things like GCC_VERSION_AT_LEAST(4, 1, 0). */
 #define GCC_VERSION_AT_LEAST(major, minor, patch) 0
 #endif
 
@@ -956,8 +956,8 @@
 #define ENABLE_REPAINT_THROTTLING 0
 #endif
 
-/* Disable the JIT on versiond of GCC prior to 4.1 */
-#if !defined(ENABLE_JIT) && COMPILER(GCC) && !GCC_VERSION_AT_LEAST(4,1,0)
+/* Disable the JIT on versions of GCC prior to 4.1 */
+#if !defined(ENABLE_JIT) && COMPILER(GCC) && !GCC_VERSION_AT_LEAST(4, 1, 0)
 #define ENABLE_JIT 0
 #endif
 
@@ -969,7 +969,7 @@
 /* The JIT is enabled by default on all x86, x64-64, ARM & MIPS platforms. */
 #if !defined(ENABLE_JIT) \
     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
-    && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4,1,0)) \
+    && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
     && !OS(WINCE)
 #define ENABLE_JIT 1
 #endif

-- 
WebKit Debian packaging