[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b6bf991836a195bdbfa57d2d15475258235c9e06
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 17:07:44 2011 +0000

    2011-01-07  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Martin Robinson.
    
            Enable PCRE computed gotos when compiling with RCVT 4.0 or greater in GNU mode
            https://bugs.webkit.org/show_bug.cgi?id=52034
    
            Derived from a patch by Eli Fidler.
    
            RVCT 4 or greater in GNU mode supports the computed goto GNU language extension
            as per <http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0348c/ch03s07s12.html>.
    
            * pcre/pcre_exec.cpp: Modified to check for feature, HAVE(COMPUTED_GOTO), instead
            of hardcoding the GCC compiler.
            * wtf/Platform.h: Define WTF_COMPILER_RVCT4_OR_GREATER if __ARMCC_VERSION >= 400000.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index a5145e5..dd233d7 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-07  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Martin Robinson.
+
+        Enable PCRE computed gotos when compiling with RCVT 4.0 or greater in GNU mode
+        https://bugs.webkit.org/show_bug.cgi?id=52034
+
+        Derived from a patch by Eli Fidler.
+
+        RVCT 4 or greater in GNU mode supports the computed goto GNU language extension
+        as per <http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0348c/ch03s07s12.html>.
+
+        * pcre/pcre_exec.cpp: Modified to check for feature, HAVE(COMPUTED_GOTO), instead
+        of hardcoding the GCC compiler.
+        * wtf/Platform.h: Define WTF_COMPILER_RVCT4_OR_GREATER if __ARMCC_VERSION >= 400000.
+
 2011-01-06  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/Source/JavaScriptCore/pcre/pcre_exec.cpp b/Source/JavaScriptCore/pcre/pcre_exec.cpp
index f4899f2..789f80a 100644
--- a/Source/JavaScriptCore/pcre/pcre_exec.cpp
+++ b/Source/JavaScriptCore/pcre/pcre_exec.cpp
@@ -56,7 +56,7 @@ the JavaScript specification. There are also some supporting functions. */
 
 using namespace WTF;
 
-#if COMPILER(GCC)
+#if HAVE(COMPUTED_GOTO)
 #define USE_COMPUTED_GOTO_FOR_MATCH_RECURSION
 //#define USE_COMPUTED_GOTO_FOR_MATCH_OPCODE_LOOP
 #endif
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
index 5cc3a1a..d4c442b 100644
--- a/Source/JavaScriptCore/wtf/Platform.h
+++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -71,8 +71,12 @@
 #endif
 
 /* COMPILER(RVCT)  - ARM RealView Compilation Tools */
+/* COMPILER(RVCT4_OR_GREATER) - ARM RealView Compilation Tools 4.0 or greater */
 #if defined(__CC_ARM) || defined(__ARMCC__)
 #define WTF_COMPILER_RVCT 1
+#if __ARMCC_VERSION >= 400000
+#define WTF_COMPILER_RVCT4_OR_GREATER 1
+#endif
 #endif
 
 /* COMPILER(GCC) - GNU Compiler Collection */
@@ -1008,7 +1012,7 @@
 #endif
 
 /* Configure the interpreter */
-#if COMPILER(GCC)
+#if COMPILER(GCC) || (COMPILER(RVCT4_OR_GREATER) && defined(__GNUC__))
 #define HAVE_COMPUTED_GOTO 1
 #endif
 #if HAVE(COMPUTED_GOTO) && ENABLE(INTERPRETER)

-- 
WebKit Debian packaging