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

Timestamp:

Oct 29, 2020, 2:38:30 PM (5 years ago)

Author:

[email protected]

Message:

JavaScriptCore should support multiple build variants
<​https://webkit.org/b/218347>
<rdar://problem/70786057>

Patch by Jérôme Decoodt <​[email protected]> on 2020-10-29
Reviewed by Keith Miller.

Update JavaScriptCore to handle BUILD_VARIANTS properly by
passing the value to build phase scripts and handling all
variants set during the build. For engineering builds,
BUILD_VARIANTS=normal.

• CMakeLists.txt:
• Update to pass equivalent ${BUILD_VARIANTS} for non-Apple platforms to asm.rb and generate_offset_extractor.rb.

• JavaScriptCore.xcodeproj/project.pbxproj:

(LLInt Offsets | Generate Derived Sources):
(Offline Assembler | Offline Assemble):

• Update build phase script to pass "${BUILD_VARIANTS}" as an argument to scripts.

• offlineasm/asm.rb:
• Parse BUILD_VARIANTS argument to pass to offsetsAndConfigurationIndexForVariants().
• offlineasm/generate_offset_extractor.rb:
• Parse BUILD_VARIANTS argument to pass to configurationIndicesForVariants().

• offlineasm/offsets.rb:

(offsetsAndConfigurationIndex):

• Update argument list in comment block.

(offsetsAndConfigurationIndexForVariants): Add.

• Invoke offsetsAndConfigurationIndex() for each build variant.

(configurationIndices):

• Update argument list in comment block.

(configurationIndicesForVariants): Add.

• Invoke configurationIndices() for each build variant.

File:

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

trunk/Source/JavaScriptCore/offlineasm/asm.rb

@@ -332 +332 @@
 offsetsFile = ARGV.shift
 outputFlnm = ARGV.shift
+variants = ARGV.shift.split(/[,\s]+/)
 
 $options = {}
@@ -343 +344 @@
 
 begin
-    configurationList = offsetsAndConfigurationIndex(offsetsFile)
+    configurationList = offsetsAndConfigurationIndexForVariants(offsetsFile, variants)
 rescue MissingMagicValuesException
     $stderr.puts "offlineasm: No magic values found. Skipping assembly file generation."