Specify dlltool prefix when generating import libs #107752
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon. Please see the contribution instructions for more information. |
rustbot
added
S-waiting-on-review
|
cc @mati865 |
|
@bors r+ |
bors
added
S-waiting-on-bors
compiler-errors
added a commit
to compiler-errors/rust
that referenced
this pull request
Feb 9, 2023
…efix, r=petrochenkov Specify dlltool prefix when generating import libs Ref: rust-lang#106610 (comment) tl;dr: This PR adds an explicit dlltool temporary filename prefix. The prefix resolves a race condition by ensuring dlltool temporary files are siloed in an appropriate/unique Rust temporary directory. --- GNU dlltool, as part of its import library generation logic, uses a bunch of temporary files on disk. In the interest of deterministic build runs, dlltool supports deterministic temporary filenames. The temporary filename prefix is automatically generated internally or can be explicitly specified via a `--temp-prefix` argument. GNU dlltool **2.38** (that ships with `x86_64-12.2.0-release-posix-seh-rt_v10-rev0` [installed during CI](https://github.com/rust-lang/rust/blob/master/src/ci/scripts/install-mingw.sh)) generates a prefix based on the target library name ([source](https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=binutils/dlltool.c;h=d95bf3f5470b999fa3b30bc887791859f48d81d1;hb=20756b0fbe065a84710aa38f2457563b57546440#l3992)). The tool writes to files such as `target_dll_h.s` and `target_dll_s00203.o` in the current working directory. This presents a problem when multiple instances of rustc_codegen_llvm are running to generate an import library (as part of the raw_dylib feature) for the same target library (e.g. kernel32) ([source](https://github.com/rust-lang/rust/blob/master/compiler/rustc_codegen_llvm/src/back/archive.rs#L185-L196)). That is, dlltool instances race and may overwrite or delete files belonging to each other. GNU dlltool **2.39**+ (not used in Rust CI) generates a prefix based on the output library path ([source](https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=binutils/dlltool.c;h=e2af20847009945b4c61a6fef08268fbb4429715;hb=b51c2fec1da205ea3e7354cbb3e253018d64873c#l3992)). The tool, when invoked as part of rustc_codegen_llvm, writes to files at paths such as `C_Users_Foo_AppData_Local_Temp_rustcOFqhXZ_target_lib_h.s`. (The output library path is normalized and non-alphanumeric characters are replaced with underscores.)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 9, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#107446 (Migrate some of `rustc_parse` to derive diagnostics) - rust-lang#107752 (Specify dlltool prefix when generating import libs) - rust-lang#107808 (bootstrap.py: fix build-failure message) - rust-lang#107834 (create symlink for legacy rustfmt path) - rust-lang#107835 (use idiomatic formatting) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
|
The |
|
It looks like llvm-dlltool is not susceptible to this race condition, although it does use random temp files. A fix to recognize and ignore this flag has been upstreamed as https://reviews.llvm.org/D152361. |
|
FYI if you build tier 3 |
|
That's good to know. I think it's better for us to stick to pc-windows-gnu for now as it's better supported. We have some workarounds, including cherrypicking the llvm patch into our toolchain build. |
|
I think I'm going to play around with gnullvm a bit. It's an interesting option. Thanks for the suggestion. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref: #106610 (comment)
tl;dr: This PR adds an explicit dlltool temporary filename prefix. The prefix resolves a race condition by ensuring dlltool temporary files are siloed in an appropriate/unique Rust temporary directory.
GNU dlltool, as part of its import library generation logic, uses a bunch of temporary files on disk. In the interest of deterministic build runs, dlltool supports deterministic temporary filenames. The temporary filename prefix is automatically generated internally or can be explicitly specified via a
--temp-prefixargument.GNU dlltool 2.38 (that ships with
x86_64-12.2.0-release-posix-seh-rt_v10-rev0installed during CI) generates a prefix based on the target library name (source). The tool writes to files such astarget_dll_h.sandtarget_dll_s00203.oin the current working directory.This presents a problem when multiple instances of rustc_codegen_llvm are running to generate an import library (as part of the raw_dylib feature) for the same target library (e.g. kernel32) (source). That is, dlltool instances race and may overwrite or delete files belonging to each other.
GNU dlltool 2.39+ (not used in Rust CI) generates a prefix based on the output library path (source). The tool, when invoked as part of rustc_codegen_llvm, writes to files at paths such as
C_Users_Foo_AppData_Local_Temp_rustcOFqhXZ_target_lib_h.s. (The output library path is normalized and non-alphanumeric characters are replaced with underscores.)