Skip to content

Conversation

maurer
Copy link
Contributor

@maurer maurer commented Oct 15, 2024

LLVM has added 3 new address spaces to support special Windows use cases. These shouldn't trouble us for now, but LLVM requires matching data layouts.

See llvm/llvm-project#111879 for details

@maurer
Copy link
Contributor Author

maurer commented Oct 15, 2024

@rustbot +llvm-main

@rustbot
Copy link
Collaborator

rustbot commented Oct 15, 2024

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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. labels Oct 15, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 15, 2024

These commits modify compiler targets.
(See the Target Tier Policy.)

@maurer
Copy link
Contributor Author

maurer commented Oct 15, 2024

@rustbot label: +llvm-main

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Oct 15, 2024
@durin42
Copy link
Contributor

durin42 commented Oct 15, 2024

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 15, 2024

📌 Commit 639f5ea has been approved by durin42

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. labels Oct 15, 2024
@maurer maurer force-pushed the data-layout-aarch64 branch from 639f5ea to 0a20e4c Compare October 15, 2024 22:49
@maurer
Copy link
Contributor Author

maurer commented Oct 15, 2024

Integration test failed on the initial patch - it looks like I missed a few aarch64/arm64es that had slightly different targets.

@maurer maurer force-pushed the data-layout-aarch64 branch from 0a20e4c to 40eccb1 Compare October 15, 2024 23:28
@cuviper cuviper added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 16, 2024
LLVM has added 3 new address spaces to support special Windows use
cases. These shouldn't trouble us for now, but LLVM requires matching
data layouts.

See llvm/llvm-project#111879 for details
@maurer maurer force-pushed the data-layout-aarch64 branch from 40eccb1 to e985396 Compare October 16, 2024 01:17
@maurer
Copy link
Contributor Author

maurer commented Oct 16, 2024

This has now cleared integration tests and they've gone green again.

@nikic
Copy link
Contributor

nikic commented Oct 16, 2024

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 16, 2024

📌 Commit e985396 has been approved by nikic

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. labels Oct 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
Rollup of 10 pull requests

Successful merges:

 - rust-lang#131582 (Add wasm32-unknown-emscripten platform support document)
 - rust-lang#131694 (Make fuchsia-test-runner.py compatible with new JSON output from llvm-readelf)
 - rust-lang#131700 (Fix match_same_arms in stable_mir)
 - rust-lang#131712 (Mark the unstable LazyCell::into_inner const)
 - rust-lang#131746 (Relax a memory order in `once_box`)
 - rust-lang#131754 (Don't report bivariance error when nesting a struct with field errors into another struct)
 - rust-lang#131760 (llvm: Match aarch64 data layout to new LLVM layout)
 - rust-lang#131764 (Fix unnecessary nesting in run-make test output directories)
 - rust-lang#131766 (Add mailmap entry for my dev-desktop setup)
 - rust-lang#131771 (Handle gracefully true/false in `cfg(target(..))` compact)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6b27c30 into rust-lang:master Oct 16, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
Rollup merge of rust-lang#131760 - maurer:data-layout-aarch64, r=nikic

llvm: Match aarch64 data layout to new LLVM layout

LLVM has added 3 new address spaces to support special Windows use cases. These shouldn't trouble us for now, but LLVM requires matching data layouts.

See llvm/llvm-project#111879 for details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) 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.

7 participants