Implement cpp.generateLinkerMapFile for GCC-like toolchains

Now it is possible to generate a linker map file
from the GCC, MinGW and CLang toolchains.

Change-Id: I69b07e907129daac0ff29bd62034d8807cd5fdf1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Richard Weickelt <richard@weickelt.de>

2 files changed, 15 insertions, 1 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 5ededc512..63d5db7b8 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -561,7 +561,7 @@ CppModule {
         inputsFromDependencies: ["dynamiclibrary_symbols", "dynamiclibrary_import", "staticlibrary"]
 
         outputFileTags: ["bundle.input", "application", "debuginfo_app","debuginfo_bundle",
-                         "debuginfo_plist"]
+                         "debuginfo_plist", "mem_map"]
         outputArtifacts: {
             var app = {
                 filePath: FileInfo.joinPaths(product.destinationDirectory,
@@ -575,6 +575,13 @@ CppModule {
             var artifacts = [app];
             if (!product.aggregate)
                 artifacts = artifacts.concat(Gcc.debugInfoArtifacts(product, undefined, "app"));
+            if (product.cpp.generateLinkerMapFile) {
+                artifacts.push({
+                    filePath: FileInfo.joinPaths(product.destinationDirectory,
+                                                 product.targetName + ".map"),
+                    fileTags: ["mem_map"]
+                });
+            }
             return artifacts;
         }
 
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 0913b27d0..639191da6 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -514,6 +514,13 @@ function linkerFlags(project, product, inputs, outputs, primaryOutput, linkerPat
     if (importLibs)
         escapableLinkerFlags.push("--out-implib", importLibs[0].filePath);
 
+    if (outputs.application && product.cpp.generateLinkerMapFile) {
+        if (isDarwin)
+            escapableLinkerFlags.push("-map", outputs.mem_map[0].filePath);
+        else
+            escapableLinkerFlags.push("-Map=" + outputs.mem_map[0].filePath);
+    }
+
     var escapedLinkerFlags = escapeLinkerFlags(product, inputs, escapableLinkerFlags);
     Array.prototype.push.apply(escapedLinkerFlags, args);
     var driverLinkerFlags = useCompilerDriver ? product.cpp.driverLinkerFlags : undefined;