Skip to content

build: Rename thumb_1 to thumb_1_only and add a disabled assertion - #1319

Merged
tgross35 merged 2 commits into
rust-lang:mainfrom
tgross35:thumb-config
Sep 8, 2026
Merged

build: Rename thumb_1 to thumb_1_only and add a disabled assertion#1319
tgross35 merged 2 commits into
rust-lang:mainfrom
tgross35:thumb-config

Conversation

@tgross35

@tgross35 tgross35 commented Sep 8, 2026

Copy link
Copy Markdown
Member

See commit messages for details

@tgross35
tgross35 force-pushed the thumb-config branch 4 times, most recently from 59e67a3 to 01fba10 Compare September 8, 2026 05:47
@rustbot

rustbot commented Sep 8, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@tgross35
tgross35 enabled auto-merge (rebase) September 8, 2026 05:47
This is a rather old config, added in c924aed ("Fix Armv8-M
Baseline compilation"). `thumb_1` is somewhat misleading, since targets
with `thumb2` also support basic `thumb` instructions. Rename it to be
more clear about what this is actually checking.

The config is not currently used but may be in the future.
We still match on target name because we can't always rely on config
from the unstable `arm_target_feature`. However, we can still assert
that things match up when running in the compiler-builtins CI.

This is disabled for now because it fails on three thumb targets:

* thumbv4t-none-eabi
* thumbv5te-none-eabi
* thumbv6-none-eabi

This will be resolved in a future commit.

Checking for the verbose build is a good indicator that we are in our
CI, rather than any other that might set the `CI` env.
@tgross35
tgross35 disabled auto-merge September 8, 2026 05:59
@tgross35
tgross35 enabled auto-merge (rebase) September 8, 2026 06:00
@tgross35
tgross35 merged commit 81d1403 into rust-lang:main Sep 8, 2026
45 checks passed
@tgross35
tgross35 deleted the thumb-config branch September 8, 2026 06:28
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