Changeset 206759 in webkit for trunk/Source/JavaScriptCore/offlineasm/asm.rb

Timestamp:

Oct 3, 2016, 4:24:56 PM (9 years ago)

Author:

[email protected]

Message:

Offline asm should not output masm assembly when using a x86_64 asm backend
​https://bugs.webkit.org/show_bug.cgi?id=162705

When cross compiling on windows to Clang, masm was being generated simply because
the os was windows. This change adds a command line parameter --assembler=MASM
to set the output assembly to masm.
The functions isGCC and isCompilingToWindows were removed as they are no longer called.

Patch by Christopher Reid <​[email protected]> on 2016-10-03
Reviewed by Mark Lam.

• CMakeLists.txt:
• offlineasm/asm.rb:
• offlineasm/x86.rb:

File:

• trunk/Source/JavaScriptCore/offlineasm/asm.rb (modified) (3 diffs)

trunk/Source/JavaScriptCore/offlineasm/asm.rb

@@ -30 +30 @@
 require "digest/sha1"
 require "offsets"
+require 'optparse'
 require "parser"
 require "self_hash"
@@ -302 +303 @@
 outputFlnm = ARGV.shift
 
+$options = {}
+OptionParser.new do |opts|
+    opts.banner = "Usage: asm.rb asmFile offsetsFile outputFileName [--assembler=<ASM>]"
+    # This option is currently only used to specify the masm assembler
+    opts.on("--assembler=[ASM]", "Specify an assembler to use.") do |assembler|
+        $options[:assembler] = assembler
+    end
+end.parse!
+
 begin
     configurationList = offsetsAndConfigurationIndex(offsetsFile)
@@ -320 +330 @@
     $commentPrefix + " offlineasm input hash: " + parseHash(asmFile) +
     " " + Digest::SHA1.hexdigest(configurationList.map{|v| (v[0] + [v[1]]).join(' ')}.join(' ')) +
-    " " + selfHash
+    " " + selfHash +
+    " " + Digest::SHA1.hexdigest($options.has_key?(:assembler) ? $options[:assembler] : "")
 
 if FileTest.exist? outputFlnm