From 815f1ed417bd26fbe2abbdf20ac5d3423b30796c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 23 Jul 2012 09:28:44 +0200
Subject: Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92
 (http://svn.webkit.org/repository/webkit/trunk@123308)

New snapshot with better configure tests
---
 Source/JavaScriptCore/offlineasm/armv7.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Source/JavaScriptCore/offlineasm/armv7.rb')

diff --git a/Source/JavaScriptCore/offlineasm/armv7.rb b/Source/JavaScriptCore/offlineasm/armv7.rb
index 18538120b..6595fdc71 100644
--- a/Source/JavaScriptCore/offlineasm/armv7.rb
+++ b/Source/JavaScriptCore/offlineasm/armv7.rb
@@ -743,8 +743,8 @@ end
 
 class Instruction
     def lowerARMv7
-        $asm.codeOrigin codeOriginString
-        $asm.annotation annotation
+        $asm.codeOrigin codeOriginString if $enableCodeOriginComments
+        $asm.annotation annotation if $enableInstrAnnotations
 
         case opcode
         when "addi", "addp", "addis"
@@ -1012,7 +1012,7 @@ class Instruction
             raise "Wrong number of arguments to smull in #{self.inspect} at #{codeOriginString}" unless operands.length == 4
             $asm.puts "smull #{operands[2].armV7Operand}, #{operands[3].armV7Operand}, #{operands[0].armV7Operand}, #{operands[1].armV7Operand}"
         else
-            raise "Unhandled opcode #{opcode} at #{codeOriginString}"
+            lowerDefault
         end
     end
 end
-- 
cgit v1.2.1