[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loki at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f646d2c35800277c38d6d1adc10a5873dfec739a
Author: loki at webkit.org <loki at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 13:27:04 2010 +0000

    2010-08-11  Gabor Loki  <loki at webkit.org>
    
            Qt build fix (ARMv7).
    
            Fix invalid conversion from int to Condition.
            Add ARMv7Assembler.cpp to JavaScriptCore.pro.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 6160b31..a3e88eb 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-11  Gabor Loki  <loki at webkit.org>
+
+        Qt build fix (ARMv7).
+
+        Fix invalid conversion from int to Condition.
+        Add ARMv7Assembler.cpp to JavaScriptCore.pro.
+
+        * JavaScriptCore.pro:
+        * assembler/ARMv7Assembler.h:
+        (JSC::ARMv7Assembler::):
+        (JSC::ARMv7Assembler::JmpSrc::JmpSrc):
+
 2010-08-11  Nathan Lawrence  <nlawrence at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/JavaScriptCore/JavaScriptCore.pro b/JavaScriptCore/JavaScriptCore.pro
index d6c4420..7f6b27d 100644
--- a/JavaScriptCore/JavaScriptCore.pro
+++ b/JavaScriptCore/JavaScriptCore.pro
@@ -79,6 +79,7 @@ SOURCES += \
     API/JSValueRef.cpp \
     API/OpaqueJSString.cpp \
     assembler/ARMAssembler.cpp \
+    assembler/ARMv7Assembler.cpp \
     assembler/MacroAssemblerARM.cpp \
     bytecode/CodeBlock.cpp \
     bytecode/JumpTable.cpp \
diff --git a/JavaScriptCore/assembler/ARMv7Assembler.h b/JavaScriptCore/assembler/ARMv7Assembler.h
index f1b57b8..d960546 100644
--- a/JavaScriptCore/assembler/ARMv7Assembler.h
+++ b/JavaScriptCore/assembler/ARMv7Assembler.h
@@ -462,8 +462,8 @@ public:
     typedef enum {
         ConditionEQ,
         ConditionNE,
-        ConditionHS,
-        ConditionLO,
+        ConditionHS, ConditionCS = ConditionHS,
+        ConditionLO, ConditionCC = ConditionLO,
         ConditionMI,
         ConditionPL,
         ConditionVS,
@@ -475,9 +475,7 @@ public:
         ConditionGT,
         ConditionLE,
         ConditionAL,
-        
-        ConditionCS = ConditionHS,
-        ConditionCC = ConditionLO,
+        ConditionInvalid
     } Condition;
 
     enum JumpType { JumpNoCondition, JumpCondition, JumpFullSize };
@@ -522,7 +520,7 @@ public:
     private:
         JmpSrc(int offset, JumpType type)
             : m_offset(offset)
-            , m_condition(0xffff)
+            , m_condition(ConditionInvalid)
             , m_type(type)
         {
             ASSERT(m_type != JumpCondition);

-- 
WebKit Debian packaging