Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)

This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future

3 files changed, 4 insertions, 27 deletions

diff --git a/Source/JavaScriptCore/offlineasm/armv7.rb b/Source/JavaScriptCore/offlineasm/armv7.rb
index 6595fdc71..eb9472af3 100644
--- a/Source/JavaScriptCore/offlineasm/armv7.rb
+++ b/Source/JavaScriptCore/offlineasm/armv7.rb
@@ -527,8 +527,8 @@ def armV7LowerMisplacedAddresses(list)
                                            node.opcode,
                                            armV7AsRegisters(newList, postInstructions, node.operands, "i"),
                                            annotation)
-            when "bbeq", "bbneq", "bba", "bbaeq", "bbb", "bbbeq", "btbo", "btbz", "btbnz", "tbz", "tbnz",
-                "tbo", "cbeq", "cbneq", "cba", "cbaeq", "cbb", "cbbeq"
+            when "bbeq", "bbneq", "bba", "bbaeq", "bbb", "bbbeq", "btbz", "btbnz", "tbz", "tbnz",
+                "cbeq", "cbneq", "cba", "cbaeq", "cbb", "cbbeq"
                 newList << Instruction.new(node.codeOrigin,
                                            node.opcode,
                                            armV7AsRegisters(newList, postInstructions, node.operands, "b"),
@@ -579,8 +579,8 @@ def armV7LowerRegisterReuse(list)
             case node.opcode
             when "cieq", "cineq", "cia", "ciaeq", "cib", "cibeq", "cigt", "cigteq", "cilt", "cilteq",
                 "cpeq", "cpneq", "cpa", "cpaeq", "cpb", "cpbeq", "cpgt", "cpgteq", "cplt", "cplteq",
-                "tio", "tis", "tiz", "tinz", "tbo", "tbs", "tbz", "tbnz", "tpo", "tps", "tpz", "tpnz",
-                "cbeq", "cbneq", "cba", "cbaeq", "cbb", "cbbeq", "cbgt", "cbgteq", "cblt", "cblteq"
+                "tis", "tiz", "tinz", "tbs", "tbz", "tbnz", "tps", "tpz", "tpnz", "cbeq", "cbneq",
+                "cba", "cbaeq", "cbb", "cbbeq", "cbgt", "cbgteq", "cblt", "cblteq"
                 if node.operands.size == 2
                     if node.operands[0] == node.operands[1]
                         tmp = Tmp.new(node.codeOrigin, :gpr)
@@ -940,9 +940,6 @@ class Instruction
         when "btinz", "btpnz", "btbnz"
             emitArmV7Test(operands)
             $asm.puts "bne #{operands[-1].asmLabel}"
-        when "btio", "btpo", "btbo"
-            emitArmV7Test(operands)
-            $asm.puts "bvs #{operands[-1].asmLabel}"
         when "btis", "btps", "btbs"
             emitArmV7Test(operands)
             $asm.puts "bmi #{operands[-1].asmLabel}"
@@ -982,8 +979,6 @@ class Instruction
             emitArmV7Compare(operands, "lt")
         when "cilteq", "cplteq", "cblteq"
             emitArmV7Compare(operands, "le")
-        when "tio", "tbo", "tpo"
-            emitArmV7TestSet(operands, "vs")
         when "tis", "tbs", "tps"
             emitArmV7TestSet(operands, "mi")
         when "tiz", "tbz", "tpz"
diff --git a/Source/JavaScriptCore/offlineasm/instructions.rb b/Source/JavaScriptCore/offlineasm/instructions.rb
index 211c10933..d046bee6f 100644
--- a/Source/JavaScriptCore/offlineasm/instructions.rb
+++ b/Source/JavaScriptCore/offlineasm/instructions.rb
@@ -107,11 +107,9 @@ MACRO_INSTRUCTIONS =
      "bbgteq",
      "bblt",
      "bblteq",
-     "btio",
      "btis",
      "btiz",
      "btinz",
-     "btbo",
      "btbs",
      "btbz",
      "btbnz",
@@ -155,15 +153,12 @@ MACRO_INSTRUCTIONS =
      "cigteq",
      "cilt",
      "cilteq",
-     "tio",
      "tis",
      "tiz",
      "tinz",
-     "tbo",
      "tbs",
      "tbz",
      "tbnz",
-     "tpo",
      "tps",
      "tpz",
      "tpnz",
@@ -197,7 +192,6 @@ MACRO_INSTRUCTIONS =
      "cplt",
      "cplteq",
      "storep",
-     "btpo",
      "btps",
      "btpz",
      "btpnz",
diff --git a/Source/JavaScriptCore/offlineasm/x86.rb b/Source/JavaScriptCore/offlineasm/x86.rb
index cebc83326..033c200d7 100644
--- a/Source/JavaScriptCore/offlineasm/x86.rb
+++ b/Source/JavaScriptCore/offlineasm/x86.rb
@@ -835,10 +835,6 @@ class Instruction
             handleX86IntBranch("jl", :byte)
         when "bblteq"
             handleX86IntBranch("jlteq", :byte)
-        when "btio"
-            handleX86BranchTest("jo", :int)
-        when "btpo"
-            handleX86BranchTest("jo", :ptr)
         when "btis"
             handleX86BranchTest("js", :int)
         when "btps"
@@ -851,8 +847,6 @@ class Instruction
             handleX86BranchTest("jnz", :int)
         when "btpnz"
             handleX86BranchTest("jnz", :ptr)
-        when "btbo"
-            handleX86BranchTest("jo", :byte)
         when "btbs"
             handleX86BranchTest("js", :byte)
         when "btbz"
@@ -967,24 +961,18 @@ class Instruction
             handleX86IntCompareSet("setle", :byte)
         when "cplteq"
             handleX86IntCompareSet("setle", :ptr)
-        when "tio"
-            handleX86SetTest("seto", :int)
         when "tis"
             handleX86SetTest("sets", :int)
         when "tiz"
             handleX86SetTest("setz", :int)
         when "tinz"
             handleX86SetTest("setnz", :int)
-        when "tpo"
-            handleX86SetTest("seto", :ptr)
         when "tps"
             handleX86SetTest("sets", :ptr)
         when "tpz"
             handleX86SetTest("setz", :ptr)
         when "tpnz"
             handleX86SetTest("setnz", :ptr)
-        when "tbo"
-            handleX86SetTest("seto", :byte)
         when "tbs"
             handleX86SetTest("sets", :byte)
         when "tbz"