Pull in various Windows improvements (#3940)

closes #3794

Author: UebelAndre

rust/platform/triple_mappings.bzl

@@ -121,8 +121,8 @@ _CPU_ARCH_TO_BUILTIN_PLAT_SUFFIX = {
     "le32": None,
     "mips": None,
     "mipsel": None,
-    "powerpc": "ppc",
-    "powerpc64": None,
+    "powerpc": "ppc32",
+    "powerpc64": "ppc",
     "powerpc64le": "ppc64le",
     "riscv32": "riscv32",
     "riscv32imc": "riscv32",
@@ -154,17 +154,17 @@ _SYSTEM_TO_BUILTIN_SYS_SUFFIX = {
     "linux": "linux",
     "macos": "osx",
     "nacl": None,
-    "netbsd": None,
+    "netbsd": "netbsd",
     "nixos": "nixos",
     "none": "none",
     "nto": "qnx",
     "openbsd": "openbsd",
     "solaris": None,
     "uefi": "uefi",
     "unknown": None,
-    "wasi": None,
-    "wasip1": None,
-    "wasip2": None,
+    "wasi": "wasi",
+    "wasip1": "wasi",
+    "wasip2": "wasi",
     "windows": "windows",
 }
 
@@ -179,9 +179,11 @@ _SYSTEM_TO_BINARY_EXT = {
     "ios": "",
     "linux": "",
     "macos": "",
+    "netbsd": "",
     "nixos": "",
     "none": "",
     "nto": "",
+    "threads": ".wasm",
     "uefi": ".efi",
     # This is currently a hack allowing us to have the proper
     # generated extension for the wasm target, similarly to the
@@ -204,9 +206,11 @@ _SYSTEM_TO_STATICLIB_EXT = {
     "ios": ".a",
     "linux": ".a",
     "macos": ".a",
+    "netbsd": ".a",
     "nixos": ".a",
     "none": ".a",
     "nto": ".a",
+    "threads": "",
     "uefi": ".lib",
     "unknown": "",
     "wasi": "",
@@ -226,9 +230,11 @@ _SYSTEM_TO_DYLIB_EXT = {
     "ios": ".dylib",
     "linux": ".so",
     "macos": ".dylib",
+    "netbsd": ".so",
     "nixos": ".so",
     "none": ".so",
     "nto": ".a",
+    "threads": ".wasm",
     "uefi": "",  # UEFI doesn't have dynamic linking
     "unknown": ".wasm",
     "wasi": ".wasm",
@@ -284,7 +290,12 @@ _SYSTEM_TO_STDLIB_LINKFLAGS = {
     "wasi": [],
     "wasip1": [],
     "wasip2": [],
-    "windows": ["advapi32.lib", "ws2_32.lib", "userenv.lib", "Bcrypt.lib"],
+    "windows": {
+        # see https://github.com/rust-lang/rust/blob/c4aa646f15e40bd3e64ddb5017b7b89b3646ac99/src/tools/run-make-support/src/external_deps/c_cxx_compiler/extras.rs#L14-L23
+        "gnu": ["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"],
+        "gnullvm": ["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"],
+        "msvc": ["advapi32.lib", "ws2_32.lib", "userenv.lib", "Bcrypt.lib"],
+    },
 }
 
 def cpu_arch_to_constraints(cpu_arch, *, system = None, abi = None):
@@ -410,8 +421,24 @@ def system_to_staticlib_ext(system):
 def system_to_binary_ext(system):
     return _SYSTEM_TO_BINARY_EXT[system]
 
-def system_to_stdlib_linkflags(system):
-    return _SYSTEM_TO_STDLIB_LINKFLAGS[system]
+def system_to_stdlib_linkflags(system, abi = None):
+    """_summary_
+
+    Args:
+        system (_type_): _description_
+        abi (_type_, optional): _description_. Defaults to None.
+
+    Returns:
+        _type_: _description_
+    """
+    flags = _SYSTEM_TO_STDLIB_LINKFLAGS[system]
+    if type(flags) == "list":
+        return flags
+    if abi:
+        for prefix, abi_flags in flags.items():
+            if prefix and abi.startswith(prefix):
+                return abi_flags
+    return flags.get(None, [])
 
 def triple_to_constraint_set(target_triple):
     """Returns a set of constraints for a given platform triple

rust/private/repository_utils.bzl

@@ -417,7 +417,13 @@ def BUILD_for_rust_toolchain(
         str: A rendered template of a `rust_toolchain` declaration
     """
     if stdlib_linkflags == None:
-        stdlib_linkflags = ", ".join(['"%s"' % x for x in system_to_stdlib_linkflags(target_triple.system)])
+        stdlib_linkflags = ", ".join([
+            '"%s"' % x
+            for x in system_to_stdlib_linkflags(
+                target_triple.system,
+                target_triple.abi,
+            )
+        ])
 
     rustfmt_label = None
     if include_rustfmt:

rust/private/rustc.bzl

@@ -541,7 +541,7 @@ def get_linker_and_args(ctx, crate_type, toolchain, cc_toolchain, feature_config
 
     return ld, ld_is_direct_driver, link_args, link_env
 
-def _symlink_for_ambiguous_lib(actions, toolchain, crate_info, lib):
+def symlink_for_ambiguous_lib(actions, toolchain, crate_info, lib):
     """Constructs a disambiguating symlink for a library dependency.
 
     Args:
@@ -560,9 +560,9 @@ def _symlink_for_ambiguous_lib(actions, toolchain, crate_info, lib):
 
     # Take the absolute value of hash() since it could be negative.
     path_hash = abs(hash(lib.path))
-    lib_name = get_lib_name_for_windows(lib) if toolchain.target_os.startswith("windows") else get_lib_name_default(lib)
+    lib_name = get_lib_name_for_windows(lib) if toolchain.target_abi == "msvc" else get_lib_name_default(lib)
 
-    if toolchain.target_os.startswith("windows"):
+    if toolchain.target_abi == "msvc":
         prefix = ""
         extension = ".lib"
     elif lib_name.endswith(".pic"):
@@ -657,8 +657,8 @@ def _disambiguate_libs(actions, toolchain, crate_info, dep_info, use_pic):
                 if name in visited_libs:
                     old_path = visited_libs[name].path
                     if old_path not in ambiguous_libs:
-                        ambiguous_libs[old_path] = _symlink_for_ambiguous_lib(actions, toolchain, crate_info, visited_libs[name])
-                ambiguous_libs[artifact.path] = _symlink_for_ambiguous_lib(actions, toolchain, crate_info, artifact)
+                        ambiguous_libs[old_path] = symlink_for_ambiguous_lib(actions, toolchain, crate_info, visited_libs[name])
+                ambiguous_libs[artifact.path] = symlink_for_ambiguous_lib(actions, toolchain, crate_info, artifact)
 
             visited_libs[name] = artifact
     return ambiguous_libs
@@ -1500,7 +1500,7 @@ def rustc_compile_action(
     pdb_file = None
     dsym_folder = None
     if crate_info.type in ("cdylib", "bin") and not experimental_use_cc_common_link:
-        if toolchain.target_os == "windows" and compilation_mode.strip_level == "none":
+        if toolchain.target_abi == "msvc" and compilation_mode.strip_level == "none":
             pdb_file = ctx.actions.declare_file(crate_info.output.basename[:-len(crate_info.output.extension)] + "pdb", sibling = crate_info.output)
             action_outputs.append(pdb_file)
         elif toolchain.target_os in ["macos", "darwin"]:
@@ -1643,6 +1643,7 @@ def rustc_compile_action(
             compilation_outputs = compilation_outputs,
             name = output_relative_to_package,
             stamp = ctx.attr.stamp,
+            main_output = crate_info.output,
             output_type = "executable" if crate_info.type == "bin" else "dynamic_library",
             additional_outputs = additional_linker_outputs,
         )
@@ -2204,7 +2205,26 @@ def _get_crate_dirname(crate):
     """
     return crate.output.dirname
 
-def _portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name, for_windows = False, for_darwin = False, flavor_msvc = False):
+def portable_link_flags(
+        lib,
+        use_pic,
+        ambiguous_libs,
+        get_lib_name,
+        for_darwin = False,
+        flavor_msvc = False):
+    """_summary_
+
+    Args:
+        lib (_type_): _description_
+        use_pic (_type_): _description_
+        ambiguous_libs (_type_): _description_
+        get_lib_name (_type_): _description_
+        for_darwin (bool, optional): _description_. Defaults to False.
+        flavor_msvc (bool, optional): _description_. Defaults to False.
+
+    Returns:
+        _type_: _description_
+    """
     artifact = get_preferred_artifact(lib, use_pic)
     if ambiguous_libs and artifact.path in ambiguous_libs:
         artifact = ambiguous_libs[artifact.path]
@@ -2244,17 +2264,11 @@ def _portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name, for_windows
         ):
             return [] if for_darwin else ["-lstatic=%s" % get_lib_name(artifact)]
 
-        if for_windows:
-            if flavor_msvc:
-                return [
-                    "-lstatic=%s" % get_lib_name(artifact),
-                    "-Clink-arg={}".format(artifact.basename),
-                ]
-            else:
-                return [
-                    "-lstatic=%s" % get_lib_name(artifact),
-                    "-Clink-arg=-l{}".format(artifact.basename),
-                ]
+        if flavor_msvc:
+            return [
+                "-lstatic=%s" % get_lib_name(artifact),
+                "-Clink-arg={}".format(artifact.basename),
+            ]
         else:
             return [
                 "-lstatic=%s" % get_lib_name(artifact),
@@ -2285,8 +2299,15 @@ def _make_link_flags_windows(make_link_flags_args, flavor_msvc, use_direct_drive
                     ("-Clink-arg=%s--no-whole-archive" % prefix),
                 ])
         elif include_link_flags:
-            ret.extend(_portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name_for_windows, for_windows = True, flavor_msvc = flavor_msvc))
-    _add_user_link_flags(ret, linker_input)
+            get_lib_name = get_lib_name_for_windows if flavor_msvc else get_lib_name_default
+            ret.extend(portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name, flavor_msvc = flavor_msvc))
+
+    # Windows toolchains can inherit POSIX defaults like -pthread from C deps,
+    # which fails to link with the MinGW/LLD toolchain. Drop them here.
+    for flag in linker_input.user_link_flags:
+        if flag in ("-pthread", "-lpthread"):
+            continue
+        ret.append("--codegen=link-arg={}".format(flag))
     return ret
 
 def _make_link_flags_windows_msvc(make_link_flags_args, use_direct_driver):
@@ -2306,7 +2327,7 @@ def _make_link_flags_darwin(make_link_flags_args, use_direct_driver):
                 ("-Clink-arg=%s%s" % (prefix, get_preferred_artifact(lib, use_pic).path)),
             ])
         elif include_link_flags:
-            ret.extend(_portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name_default, for_darwin = True))
+            ret.extend(portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name_default, for_darwin = True))
     _add_user_link_flags(ret, linker_input)
     return ret
 
@@ -2322,7 +2343,7 @@ def _make_link_flags_default(make_link_flags_args, use_direct_driver):
                 ("-Clink-arg=%s--no-whole-archive" % prefix),
             ])
         elif include_link_flags:
-            ret.extend(_portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name_default))
+            ret.extend(portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name_default))
     _add_user_link_flags(ret, linker_input)
     return ret
 
@@ -2365,19 +2386,18 @@ def _get_make_link_flag_funcs(target_os, target_abi, use_direct_link_driver):
             - callable: The function for producing link args.
             - callable: The function for formatting link library names.
     """
+    get_lib_name = get_lib_name_default
+
     if target_os == "windows":
-        make_link_flags_windows_msvc = _make_link_flags_windows_msvc_direct if use_direct_link_driver else _make_link_flags_windows_msvc_indirect
-        make_link_flags_windows_gnu = _make_link_flags_windows_gnu_direct if use_direct_link_driver else _make_link_flags_windows_gnu_indirect
-        make_link_flags = make_link_flags_windows_msvc if target_abi == "msvc" else make_link_flags_windows_gnu
-        get_lib_name = get_lib_name_for_windows
+        if target_abi == "msvc":
+            make_link_flags = _make_link_flags_windows_msvc_direct if use_direct_link_driver else _make_link_flags_windows_msvc_indirect
+            get_lib_name = get_lib_name_for_windows
+        else:
+            make_link_flags = _make_link_flags_windows_gnu_direct if use_direct_link_driver else _make_link_flags_windows_gnu_indirect
     elif target_os.startswith(("mac", "darwin", "ios")):
-        make_link_flags_darwin = _make_link_flags_darwin_direct if use_direct_link_driver else _make_link_flags_darwin_indirect
-        make_link_flags = make_link_flags_darwin
-        get_lib_name = get_lib_name_default
+        make_link_flags = _make_link_flags_darwin_direct if use_direct_link_driver else _make_link_flags_darwin_indirect
     else:
-        make_link_flags_default = _make_link_flags_default_direct if use_direct_link_driver else _make_link_flags_default_indirect
-        make_link_flags = make_link_flags_default
-        get_lib_name = get_lib_name_default
+        make_link_flags = _make_link_flags_default_direct if use_direct_link_driver else _make_link_flags_default_indirect
 
     return (make_link_flags, get_lib_name)
 

test/unit/windows_lib_name/BUILD.bazel

@@ -0,0 +1,3 @@
+load(":windows_lib_name_test.bzl", "windows_lib_name_test_suite")
+
+windows_lib_name_test_suite(name = "windows_lib_name_test_suite")