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/x86.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/Source/JavaScriptCore/offlineasm/x86.rb b/Source/JavaScriptCore/offlineasm/x86.rb
index 470318a09..cebc83326 100644
--- a/Source/JavaScriptCore/offlineasm/x86.rb
+++ b/Source/JavaScriptCore/offlineasm/x86.rb
@@ -624,8 +624,8 @@ class Instruction
     end
     
     def lowerX86Common
-        $asm.codeOrigin codeOriginString
-        $asm.annotation annotation
+        $asm.codeOrigin codeOriginString if $enableCodeOriginComments
+        $asm.annotation annotation if $enableInstrAnnotations
 
         case opcode
         when "addi"
@@ -1028,7 +1028,7 @@ class Instruction
         when "leap"
             $asm.puts "lea#{x86Suffix(:ptr)} #{operands[0].x86AddressOperand(:ptr)}, #{operands[1].x86Operand(:ptr)}"
         else
-            raise "Bad opcode: #{opcode}"
+            lowerDefault
         end
     end
 end
-- 
cgit v1.2.1