Add support for feature generate_linkmap to cc_binary

See bazelbuild#20966.

src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java

@@ -509,7 +509,7 @@ public static ToolchainTypeRequirement ccToolchainTypeRequirement(RuleDefinition
    */
   public static final String NO_GENERATE_DEBUG_SYMBOLS_FEATURE_NAME = "no_generate_debug_symbols";
 
-  /** A feature to indicate whether to generate linkmap. For Apple platform only. */
+  /** A feature to indicate whether to generate linkmap. */
   public static final String GENERATE_LINKMAP_FEATURE_NAME = "generate_linkmap";
 
   /** A feature to indicate whether to do linker deadstrip. For Apple platform only. */

src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl

@@ -427,7 +427,8 @@ def _create_transitive_linking_actions(
         pdb_file,
         win_def_file,
         additional_linkopts,
-        additional_make_variable_substitutions):
+        additional_make_variable_substitutions,
+        additional_outputs):
     cc_compilation_outputs_with_only_objects = cc_common.create_compilation_outputs(objects = None, pic_objects = None)
     deps_cc_info = CcInfo(linking_context = deps_cc_linking_context)
     libraries_for_current_cc_linking_context = []
@@ -515,6 +516,7 @@ def _create_transitive_linking_actions(
         never_link = True,
         pdb_file = pdb_file,
         win_def_file = win_def_file,
+        additional_outputs = additional_outputs,
     )
     cc_launcher_info = cc_internal.create_cc_launcher_info(cc_info = cc_info_without_extra_link_time_libraries, compilation_outputs = cc_compilation_outputs_with_only_objects)
     return (cc_linking_outputs, cc_launcher_info, cc_linking_context)
@@ -714,6 +716,13 @@ def cc_binary_impl(ctx, additional_linkopts, force_linkstatic = False):
     if cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "generate_pdb_file"):
         pdb_file = ctx.actions.declare_file(_strip_extension(binary) + ".pdb", sibling = binary)
 
+    additional_linker_outputs = []
+
+    linkmap = None
+    if cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "generate_linkmap"):
+        linkmap = ctx.actions.declare_file(_strip_extension(binary) + ".map", sibling = binary)
+        additional_linker_outputs.append(linkmap)
+
     extra_link_time_libraries = deps_cc_linking_context.extra_link_time_libraries()
     linker_inputs_extra = depset()
     runtime_libraries_extra = depset()
@@ -738,6 +747,7 @@ def cc_binary_impl(ctx, additional_linkopts, force_linkstatic = False):
         win_def_file,
         additional_linkopts,
         additional_make_variable_substitutions,
+        additional_linker_outputs,
     )
 
     cc_linking_outputs_binary_library = cc_linking_outputs_binary.library_to_link
@@ -830,6 +840,8 @@ def cc_binary_impl(ctx, additional_linkopts, force_linkstatic = False):
         output_groups["pdb_file"] = depset([pdb_file])
     if generated_def_file != None:
         output_groups["def_file"] = depset([generated_def_file])
+    if linkmap:
+        output_groups["linkmap"] = depset([linkmap])
 
     if cc_linking_outputs_binary_library != None:
         # For consistency and readability.

src/test/java/com/google/devtools/build/lib/analysis/mock/cc_toolchain_config.bzl

@@ -117,6 +117,7 @@ _FEATURE_NAMES = struct(
     optional_cc_flags_feature = "optional_cc_flags_feature",
     cpp_compile_with_requirements = "cpp_compile_with_requirements",
     no_copts_tokenization = "no_copts_tokenization",
+    generate_linkmap = "generate_linkmap",
 )
 
 _no_copts_tokenization_feature = feature(name = _FEATURE_NAMES.no_copts_tokenization)
@@ -1313,6 +1314,21 @@ _layering_check_module_maps_header_modules_simple_features = [
     ),
 ]
 
+_generate_linkmap_feature = feature(
+    name = _FEATURE_NAMES.generate_linkmap,
+    flag_sets = [
+        flag_set(
+            actions = [ACTION_NAMES.cpp_link_executable],
+            flag_groups = [
+                flag_group(
+                    flags = ["-linkmap=%{output_execpath}.map"],
+                    expand_if_available = "output_execpath",
+                ),
+            ],
+        ),
+    ],
+)
+
 _feature_name_to_feature = {
     _FEATURE_NAMES.no_legacy_features: _no_legacy_features_feature,
     _FEATURE_NAMES.do_not_split_linking_cmdline: _do_not_split_linking_cmdline_feature,
@@ -1388,6 +1404,7 @@ _feature_name_to_feature = {
     _FEATURE_NAMES.optional_cc_flags_feature: _optional_cc_flags_feature,
     _FEATURE_NAMES.cpp_compile_with_requirements: _cpp_compile_with_requirements,
     _FEATURE_NAMES.generate_pdb_file: _generate_pdb_file_feature,
+    _FEATURE_NAMES.generate_linkmap: _generate_linkmap_feature,
     "header_modules_feature_configuration": _header_modules_feature_configuration,
     "env_var_feature_configuration": _env_var_feature_configuration,
     "host_and_nonhost_configuration": _host_and_nonhost_configuration,

src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java

@@ -1327,4 +1327,24 @@ public void testNoLinkExtra() throws Exception {
     List<String> artifactNames = baseArtifactNames(getLinkerInputs(target));
     assertThat(artifactNames).doesNotContain("liblink_extra_lib.a");
   }
+
+  @Test
+  public void testGenerateLinkMap() throws Exception {
+    AnalysisMock.get()
+        .ccSupport()
+        .setupCcToolchainConfig(
+            mockToolsConfig, CcToolchainConfig.builder().withFeatures(CppRuleClasses.GENERATE_LINKMAP_FEATURE_NAME));
+    useConfiguration("--cpu=k8");
+    ConfiguredTarget generateLinkMapTest =
+        scratchConfiguredTarget(
+            "generate_linkmap",
+            "generate_linkmap_test",
+            "cc_binary(name = 'generate_linkmap_test',",
+            "          features = ['generate_linkmap'],",
+            "          srcs = ['generate_linkmap_test.cc'],",
+            "          )");
+    Iterable<String> temps =
+        ActionsTestUtil.baseArtifactNames(getOutputGroup(generateLinkMapTest, "linkmap"));
+    assertThat(temps).containsExactly("generate_linkmap_test.map");
+  }
 }

tools/cpp/unix_cc_toolchain_config.bzl

@@ -1171,6 +1171,27 @@ def _impl(ctx):
         ],
     )
 
+    generate_linkmap_feature = feature(
+        name = "generate_linkmap",
+        flag_sets = [
+            flag_set(
+                actions = [
+                    ACTION_NAMES.cpp_link_executable,
+                ],
+                flag_groups = [
+                    flag_group(
+                        flags = [
+                            "-Wl,-Map=%{output_execpath}.map"
+                            if is_linux else
+                            "-Wl,-map,%{output_execpath}.map"
+                        ],
+                        expand_if_available = "output_execpath",
+                    ),
+                ],
+            ),
+        ],
+    )
+
     output_execpath_flags_feature = feature(
         name = "output_execpath_flags",
         flag_sets = [
@@ -1379,6 +1400,7 @@ def _impl(ctx):
             autofdo_feature,
             build_interface_libraries_feature,
             dynamic_library_linker_tool_feature,
+            generate_linkmap_feature,
             shared_flag_feature,
             linkstamps_feature,
             output_execpath_flags_feature,
@@ -1453,6 +1475,7 @@ def _impl(ctx):
             unfiltered_compile_flags_feature,
             treat_warnings_as_errors_feature,
             archive_param_file_feature,
+            generate_linkmap_feature,
         ]
 
     return cc_common.create_cc_toolchain_config_info(

tools/cpp/windows_cc_toolchain_config.bzl

@@ -722,6 +722,25 @@ def _impl(ctx):
             name = "generate_pdb_file",
         )
 
+        generate_linkmap_feature = feature(
+            name = "generate_linkmap",
+            flag_sets = [
+                flag_set(
+                    actions = [
+                        ACTION_NAMES.cpp_link_executable,
+                    ],
+                    flag_groups = [
+                        flag_group(
+                            flags = [
+                                "/MAP:%{output_execpath}.map",
+                            ],
+                            expand_if_available = "output_execpath",
+                        ),
+                    ],
+                ),
+            ],
+        )
+
         output_execpath_flags_feature = feature(
             name = "output_execpath_flags",
             flag_sets = [
@@ -1122,6 +1141,7 @@ def _impl(ctx):
             parse_showincludes_feature,
             no_dotd_file_feature,
             generate_pdb_file_feature,
+            generate_linkmap_feature,
             shared_flag_feature,
             linkstamps_feature,
             output_execpath_flags_feature,