Bug 1397263 - move ASOUTOPTION to moz.configure; r=mshal

build/moz.configure/toolchain.configure

@@ -1906,6 +1906,18 @@ def as_dash_c_flag(as_info, target):
 
 set_config('AS_DASH_C_FLAG', as_dash_c_flag)
 
+
+@depends(as_info, target)
+def as_outoption(as_info, target):
+    # The uses of ASOUTOPTION depend on the spacing for -o/-Fo.
+    if as_info.type == 'masm' and target.cpu != 'aarch64':
+        return '-Fo'
+
+    return '-o '
+
+
+set_config('ASOUTOPTION', as_outoption)
+
 # clang plugin handling
 # ==============================================================
 

config/rules.mk

@@ -376,12 +376,6 @@ else
 OUTOPTION = -o # eol
 endif # WINNT && !GNU_CC
 
-ifneq (,$(filter ml%,$(AS)))
-ASOUTOPTION = -Fo# eol
-else
-ASOUTOPTION = -o # eol
-endif
-
 ifeq (,$(CROSS_COMPILE))
 HOST_OUTOPTION = $(OUTOPTION)
 else

python/mozbuild/mozbuild/frontend/emitter.py

@@ -1340,6 +1340,7 @@ class TreeMetadataEmitter(LoggingMixin):
                 raise SandboxValidationError('yasm is not available', context)
             passthru.variables['AS'] = yasm
             passthru.variables['AS_DASH_C_FLAG'] = ''
+            passthru.variables['ASOUTOPTION'] = '-o '
             computed_as_flags.resolve_flags('OS',
                                             context.config.substs.get('YASM_ASFLAGS', []))
 

python/mozbuild/mozbuild/test/frontend/test_emitter.py

@@ -459,7 +459,8 @@ class TestEmitterBasic(unittest.TestCase):
         self.maxDiff = None
         self.assertEqual(passthru.variables,
                          {'AS': 'yasm',
-                          'AS_DASH_C_FLAG': ''})
+                          'AS_DASH_C_FLAG': '',
+                          'ASOUTOPTION': '-o '})
         self.maxDiff = maxDiff
 
     def test_generated_files(self):