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

Subtree sync for rustc_codegen_cranelift #135776

Merged
merged 16 commits into from
Jan 20, 2025

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jan 20, 2025

Nothing too exciting this time, but this includes a fix for a linker hang on Windows: rust-lang/rustc_codegen_cranelift#1554

r? @ghost

@rustbot label +A-codegen +A-cranelift +T-compiler

bjorn3 and others added 16 commits January 10, 2025 09:02
To workaround a hang in link.exe.
Disable -Zfunction-sections by default on Windows
0.1.141 syncs changes from `libm`. Most of the `libm` changes are
testing- or configuration-related.
Combined with [1], this will change the overflowing multiplication
operations to return an `extern "C"`-safe type.

Link: rust-lang/compiler-builtins#735 [1]
0.1.142 fixes an issue parsing optimization flags, and 0.1.143 changes
`__rust_[ui]128_*` builtins to use a C-safe signature.
The amdgpu-kernel calling convention was reverted in commit
f6b21e9 due to inactivity in the amdgpu
target.

Introduce a `gpu-kernel` calling convention that translates to
`ptx_kernel` or `amdgpu_kernel`, depending on the target that rust
compiles for.
…ubilee

Add gpu-kernel calling convention

The amdgpu-kernel calling convention was reverted in commit f6b21e9 (rust-lang#120495 and rust-lang/rust-analyzer#16463) due to inactivity in the amdgpu target.

Introduce a `gpu-kernel` calling convention that translates to `ptx_kernel` or `amdgpu_kernel`, depending on the target that rust compiles for.

Tracking issue: rust-lang#135467
amdgpu target tracking issue: rust-lang#135024
… r=matthewjasper"

This reverts commit e108481, reversing
changes made to 303e8bd.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 20, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 20, 2025

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease

The following commits are merge commits:

@rustbot rustbot added A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend labels Jan 20, 2025
@bjorn3
Copy link
Member Author

bjorn3 commented Jan 20, 2025

@bors r+ p=1 subtree sync

@bors
Copy link
Contributor

bors commented Jan 20, 2025

📌 Commit d740a3f has been approved by bjorn3

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 20, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 20, 2025
…bjorn3

Subtree sync for rustc_codegen_cranelift

Nothing too exciting this time, but this includes a fix for a linker hang on Windows: rust-lang/rustc_codegen_cranelift#1554

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#133695 (Reexport likely/unlikely in std::hint)
 - rust-lang#135330 (Respect --sysroot for rustc -vV and -Cpasses=list)
 - rust-lang#135333 (Partial progress on rust-lang#132735: Replace extern "rust-intrinsic" with #[rustc_intrinsic] across the codebase)
 - rust-lang#135741 (Recognise new IPv6 documentation range from IETF RFC 9637)
 - rust-lang#135770 (Update contributing docs for submodule/subtree changes)
 - rust-lang#135775 (Subtree update of `rust-analyzer`)
 - rust-lang#135776 (Subtree sync for rustc_codegen_cranelift)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 67b609a into rust-lang:master Jan 20, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 20, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
Rollup merge of rust-lang#135776 - bjorn3:sync_cg_clif-2025-01-20, r=bjorn3

Subtree sync for rustc_codegen_cranelift

Nothing too exciting this time, but this includes a fix for a linker hang on Windows: rust-lang/rustc_codegen_cranelift#1554

r? ``@ghost``

``@rustbot`` label +A-codegen +A-cranelift +T-compiler
@bjorn3 bjorn3 deleted the sync_cg_clif-2025-01-20 branch January 21, 2025 09:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend has-merge-commits PR has merge commits, merge with caution. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants