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

rust: update to 1.84.0 #23028

Merged
merged 2 commits into from
Jan 10, 2025
Merged

rust: update to 1.84.0 #23028

merged 2 commits into from
Jan 10, 2025

Conversation

ognevny
Copy link
Collaborator

@ognevny ognevny commented Jan 7, 2025

config changes:

  • enable CFG for gnullvm targets (closes rust: enable Control Flow Guard on gnullvm #22325, thanks mati865)
  • remove parallel_compiler, it's now always true (but -Zthreads is still unstable)
  • add wasm32v1-none target (backport cc update to make it buildable)
  • set default-linker for wasm targets
  • disable llvm-tools to remove unneeded rust-objcopy.exe and...

backport a fix for proper rust-objcopy.exe distribution

@ognevny ognevny marked this pull request as draft January 7, 2025 11:09
@ognevny
Copy link
Collaborator Author

ognevny commented Jan 7, 2025

that clang 19 thing again

CFLAGS_wasm32v1_none = Some(-ffunction-sections -fdata-sections --target=wasm32v1-none -mtune=generic -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1)
cargo:rerun-if-env-changed=CC_SHELL_ESCAPED_FLAGS
CC_SHELL_ESCAPED_FLAGS = None
cargo:warning=clang: warning: argument unused during compilation: '-mtune=generic' [-Wunused-command-line-argument]
cargo:warning=error: unknown target triple 'wasm32v1-none'

I'll comment wasm32v1-none target now

@ognevny ognevny force-pushed the update-rust branch 3 times, most recently from 7dd4baf to c78663d Compare January 8, 2025 12:53
@ognevny
Copy link
Collaborator Author

ognevny commented Jan 8, 2025

@mati865 there is a new binary shipped: rust-objcopy.exe. is it better to remove it? there shouldn't be a problem if it's not shipped here

@ognevny ognevny force-pushed the update-rust branch 3 times, most recently from d1a4480 to b9e353b Compare January 8, 2025 17:20
@mati865
Copy link
Collaborator

mati865 commented Jan 8, 2025

@mati865 there is a new binary shipped: rust-objcopy.exe. is it better to remove it? there shouldn't be a problem if it's not shipped here

I doubt lack of it would be a problem for us.

Wasn't the only blocker there the decision whether MSYS2 should enable it, since upstream does not?

@ognevny
Copy link
Collaborator Author

ognevny commented Jan 9, 2025

Wasn't the only blocker there the decision whether MSYS2 should enable it, since upstream does not?

I've been waiting for a patch that adds CFG support for gnullvm

@mati865
Copy link
Collaborator

mati865 commented Jan 9, 2025

Oh, I must have messed up the rebase. I have backported that patch previously.

@ognevny ognevny marked this pull request as ready for review January 9, 2025 15:49
@ognevny ognevny merged commit 531363f into msys2:master Jan 10, 2025
7 checks passed
@ognevny ognevny deleted the update-rust branch January 10, 2025 02:52
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.

2 participants