Fix usage of Cpp.collectMiscAssemblerArguments() function

* We need to pass the 'asm' tag for this function.
* We need to use this function also in MSVC toolchain.

Change-Id: I3dfc7b79ec17b855da76dab35428d875c39548a1
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

6 files changed, 7 insertions, 21 deletions

diff --git a/share/qbs/modules/cpp/cosmic.js b/share/qbs/modules/cpp/cosmic.js
index a60b78687..08abe7b6b 100644
--- a/share/qbs/modules/cpp/cosmic.js
+++ b/share/qbs/modules/cpp/cosmic.js
@@ -281,11 +281,8 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
     if (input.cpp.debugInformation)
         args.push("-xx");
 
-    // Determine which C-language we"re compiling
-    var tag = ModUtils.fileTagForTargetLanguage(input.fileTags.concat(outputs.obj[0].fileTags));
-
     // Misc flags.
-    args = args.concat(Cpp.collectMiscAssemblerArguments(input, tag));
+    args = args.concat(Cpp.collectMiscAssemblerArguments(input, "asm"));
 
     // Listing files generation flag.
     if (input.cpp.generateAssemblerListingFiles) {
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 0df0b14cc..5fce2bbe4 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -943,9 +943,7 @@ function prepareAssembler(project, product, inputs, outputs, input, output) {
     if (warnings === 'none')
         args.push('-W');
 
-    var tag = "asm";
-    args = args.concat(Cpp.collectMiscAssemblerArguments(input, tag));
-
+    args = args.concat(Cpp.collectMiscAssemblerArguments(input, "asm"));
     args = args.concat(Cpp.collectIncludePathsArguments(input));
     args = args.concat(Cpp.collectSystemIncludePathsArguments(input));
 
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js
index 5193b1814..3848761f5 100644
--- a/share/qbs/modules/cpp/iar.js
+++ b/share/qbs/modules/cpp/iar.js
@@ -613,9 +613,6 @@ function compilerFlags(project, product, input, outputs, explicitlyDependsOn) {
 }
 
 function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
-    // Determine which C-language we"re compiling
-    var tag = ModUtils.fileTagForTargetLanguage(input.fileTags.concat(outputs.obj[0].fileTags));
-
     var args = [];
 
     // Input.
@@ -665,7 +662,7 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
         args.push("-l", outputs.lst[0].filePath);
 
     // Misc flags.
-    args = args.concat(Cpp.collectMiscAssemblerArguments(input, tag));
+    args = args.concat(Cpp.collectMiscAssemblerArguments(input, "asm"));
     return args;
 }
 
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js
index b398396df..86fbb153c 100644
--- a/share/qbs/modules/cpp/keil.js
+++ b/share/qbs/modules/cpp/keil.js
@@ -683,10 +683,7 @@ function compilerFlags(project, product, input, outputs, explicitlyDependsOn) {
 }
 
 function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
-    // Determine which C-language we're compiling
-    var tag = ModUtils.fileTagForTargetLanguage(input.fileTags.concat(outputs.obj[0].fileTags));
     var args = [];
-
     var architecture = input.qbs.architecture;
     if (isMcsArchitecture(architecture) || isC166Architecture(architecture)) {
         // Input.
@@ -745,7 +742,7 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
     }
 
     // Misc flags.
-    args = args.concat(Cpp.collectMiscAssemblerArguments(input, tag));
+    args = args.concat(Cpp.collectMiscAssemblerArguments(input, "asm"));
     return args;
 }
 
diff --git a/share/qbs/modules/cpp/sdcc.js b/share/qbs/modules/cpp/sdcc.js
index fe9406baa..b3dfd92b4 100644
--- a/share/qbs/modules/cpp/sdcc.js
+++ b/share/qbs/modules/cpp/sdcc.js
@@ -318,11 +318,8 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
     args = args.concat(Cpp.collectIncludePathsArguments(input));
     args = args.concat(Cpp.collectSystemIncludePathsArguments(input, input.cpp.includeFlag));
 
-    // Determine which C-language we"re compiling.
-    var tag = ModUtils.fileTagForTargetLanguage(input.fileTags.concat(outputs.obj[0].fileTags));
-
     // Misc flags.
-    args = args.concat(Cpp.collectMiscCompilerArguments(input, tag));
+    args = args.concat(Cpp.collectMiscAssemblerArguments(input, "asm"));
 
     args.push("-ol");
     args.push(outputs.obj[0].filePath);
diff --git a/share/qbs/modules/cpp/windows-msvc-base.qbs b/share/qbs/modules/cpp/windows-msvc-base.qbs
index 1dce682ed..4efd20668 100644
--- a/share/qbs/modules/cpp/windows-msvc-base.qbs
+++ b/share/qbs/modules/cpp/windows-msvc-base.qbs
@@ -35,6 +35,7 @@ import qbs.PathTools
 import qbs.Probes
 import qbs.Utilities
 import qbs.WindowsUtils
+import 'cpp.js' as Cpp
 import 'msvc.js' as MSVC
 
 CppModule {
@@ -368,8 +369,7 @@ CppModule {
                         FileInfo.toWindowsSeparators(input.filePath)];
             if (product.cpp.debugInformation)
                 args.push("/Zi");
-            args = args.concat(ModUtils.moduleProperty(input, 'platformFlags', 'asm'),
-                               ModUtils.moduleProperty(input, 'flags', 'asm'));
+            args = args.concat(Cpp.collectMiscAssemblerArguments(input, "asm"));
             var cmd = new Command(product.cpp.assemblerPath, args);
             cmd.description = "assembling " + input.fileName;
             cmd.jobPool = "assembler";