Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix fastcall mangling for rust_psm_on_stack #54

Merged
merged 1 commit into from
Jul 5, 2021
Merged

fix fastcall mangling for rust_psm_on_stack #54

merged 1 commit into from
Jul 5, 2021

Conversation

jeremyd2019
Copy link
Contributor

All but the label were @16, but the label itself was @20. This was causing an error trying to build a mingw-w64 (windows-gnu) rust using clang/lld.

@jeremyd2019 jeremyd2019 changed the title fix stdcall mangling for rust_psm_on_stack fix fastcall mangling for rust_psm_on_stack Jul 5, 2021
All but the label were `@16`, but the label itself was `@20`.  This was causing an error trying to build a mingw-w64 (windows-gnu) rust using clang/lld.
@nagisa
Copy link
Member

nagisa commented Jul 5, 2021

Huh, I'm pretty sure we run tests for i686-pc-windows-gnu in CI. I wonder if its because the Windows' implementation actually uses the Fibers implementation and the toolchain used in the CI optimizes out the reference to the symbol, but not whatever toolchain you're using in msys2?

@nagisa nagisa merged commit 00e695f into rust-lang:master Jul 5, 2021
@nagisa
Copy link
Member

nagisa commented Jul 5, 2021

Published as 0.1.14

@jeremyd2019 jeremyd2019 deleted the patch-1 branch July 5, 2021 16:13
@jeremyd2019
Copy link
Contributor Author

Published as 0.1.14

Forgive my rust ignorance, but how do I use this when building rustc? There's a Cargo.lock file that references:

[[package]]
name = "psm"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96e0536f6528466dbbbbe6b986c34175a8d0ff25b794c4bacda22e068cd2f2c5"
dependencies = [
 "cc",
]

I guess I can update the version to "0.1.14" but where do I find the checksum? This seems to be a file intended to be updated by cargo, but having not successfully built rust yet...

@nagisa
Copy link
Member

nagisa commented Jul 19, 2021 via email

@nagisa
Copy link
Member

nagisa commented Jul 19, 2021 via email

@jeremyd2019
Copy link
Contributor Author

Well, that updated it to 0.1.13 but I'm trying to get 0.1.14

@mati865
Copy link
Contributor

mati865 commented Jul 23, 2021

@nagisa it's not actually published. When I go to https://crates.io/crates/psm/versions version 0.1.13 is the most recent one.

@nagisa
Copy link
Member

nagisa commented Jul 23, 2021

Ran cargo publish. Not sure how this happened 🤷 but I guess it suggests there's some space for automation here ^^

Really sorry about that.

@mati865
Copy link
Contributor

mati865 commented Jul 23, 2021

No problem, it's easy to use git version in Cargo.

@jeremyd2019
Copy link
Contributor Author

Thanks, that got the Cargo.lock file to update through the command you gave.

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 3, 2021
…Simulacrum

Update stacker and psm crates

Primarily to include rust-lang/stacker#54
camsteffen added a commit to camsteffen/rust that referenced this pull request Aug 19, 2021
…Simulacrum

Update stacker and psm crates

Primarily to include rust-lang/stacker#54
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 30, 2021
…mulacrum,nagisa

Update stacker and psm crates

Primarily to include rust-lang/stacker#54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants