Skip to content

Update Xtensa target data layouts to match upstream LLVM#157056

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
esp-rs:update-xtensa-datalayout
May 28, 2026
Merged

Update Xtensa target data layouts to match upstream LLVM#157056
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
esp-rs:update-xtensa-datalayout

Conversation

@MabezDev
Copy link
Copy Markdown
Contributor

@MabezDev MabezDev commented May 28, 2026

Born from #156568 (comment).

We've been using a fork to distribute compiler builds that support the Xtensa arch whilst we're upstreaming. At a certain point we received some changes on our fork, which haven't been upstreamed, which I now to believe to be a mistake - therefore I'm reverting to the upstream LLVM datalayout.

r? @folkertdev

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 28, 2026

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

@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 May 28, 2026
@folkertdev
Copy link
Copy Markdown
Contributor

Just for the paper trail, can you motivate this change a bit more in the PR description?

Copy link
Copy Markdown
Contributor

@folkertdev folkertdev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently LLVM gives this error

error: data-layout for target `xtensa-esp32-none-elf`, `e-m:e-p:32:32-v1:8:8-i64:64-i128:128-n32`, differs from LLVM target's `xtensa-none-elf` default layout, `e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32`error: data-layout for target `xtensa-esp32-none-elf`, `e-m:e-p:32:32-v1:8:8-i64:64-i128:128-n32`, differs from LLVM target's `xtensa-none-elf` default layout, `e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32`

r=me when CI is green

View changes since this review

@MabezDev
Copy link
Copy Markdown
Contributor Author

@bors r=folkertdev

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 28, 2026

@MabezDev: 🔑 Insufficient privileges: not in review users

@MabezDev MabezDev requested a review from folkertdev May 28, 2026 12:34
@folkertdev
Copy link
Copy Markdown
Contributor

@bors r+ rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 28, 2026

📌 Commit d061e0b has been approved by folkertdev

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 May 28, 2026
rust-bors Bot pushed a commit that referenced this pull request May 28, 2026
…uwer

Rollup of 7 pull requests

Successful merges:

 - #157046 (file locking: clarify that double-locking is underspecified)
 - #156401 (rustdoc: deterministic sorting for `doc_cfg` badges)
 - #156746 (cg_llvm: Use `LLVMDIBuilderCreateEnumeratorOfArbitraryPrecision`)
 - #156889 (Suggest function-local constructors without enclosing function path)
 - #157012 (Fix missing note of escaping `{` for braces including whitespaces)
 - #157056 (Update Xtensa target data layouts to match upstream LLVM)
 - #157062 (Add link to RFMF Sponsors page)
@rust-bors rust-bors Bot merged commit c727a40 into rust-lang:main May 28, 2026
12 checks passed
@rustbot rustbot added this to the 1.98.0 milestone May 28, 2026
rust-timer added a commit that referenced this pull request May 28, 2026
Rollup merge of #157056 - esp-rs:update-xtensa-datalayout, r=folkertdev

Update Xtensa target data layouts to match upstream LLVM

Born from #156568 (comment).

We've been using a fork to distribute compiler builds that support the Xtensa arch whilst we're upstreaming. At a certain point we received some changes on our fork, which haven't been upstreamed, which I now to believe to be a mistake - therefore I'm reverting to the upstream LLVM datalayout.

r? @folkertdev
@MabezDev MabezDev deleted the update-xtensa-datalayout branch May 29, 2026 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

3 participants