Skip to content

ty: Deal with clang's new CXType_PredefinedSugar. - #3510

Merged
emilio merged 2 commits into
rust-lang:mainfrom
emilio:predefined-sugar
Oct 5, 2026
Merged

emilio merged 2 commits into
rust-lang:mainfrom
emilio:predefined-sugar

Conversation

@emilio

@emilio emilio commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

Fixes #3509

@emilio
emilio enabled auto-merge October 5, 2026 12:05
@emilio

emilio commented Oct 5, 2026

Copy link
Copy Markdown
Contributor Author

Hmm, the rust for linux job seems to have failed @ojeda:

error: error loading target specification: rustc-abi: invalid rustc abi: 'x86-softfloat'. allowed values: 'x86-sse2', 'powerpc-spe', 'softfloat' at line 3 column 32

Do you know what that is about? I'll try to bump it for now.

@emilio
emilio added this pull request to the merge queue Oct 5, 2026
@emilio

emilio commented Oct 5, 2026

Copy link
Copy Markdown
Contributor Author

That seems to have worked :)

Merged via the queue into rust-lang:main with commit 303e353 Oct 5, 2026
52 checks passed
@ojeda

ojeda commented Oct 11, 2026

Copy link
Copy Markdown
Contributor

Do you know what that is about? I'll try to bump it for now.

@emilio Upstream Rust changed the target spec files -- I sent commit 905b06d32a52 ("rust: x86: support Rust >= 1.98.0 target spec") in Linux back then to update it:

rust: x86: support Rust >= 1.98.0 target spec

Starting with Rust 1.98.0 (expected 2026-08-20), the target spec will not
support `x86-softfloat` anymore [1]. Instead, `softfloat` should be used,
which is an alias. Otherwise, one gets:

    error: error loading target specification: rustc-abi: invalid rustc abi: 'x86-softfloat'. allowed values: 'x86-sse2', 'softfloat' at line 3 column 32
      |
      = help: run `rustc --print target-list` for a list of built-in targets

Thus conditionally use one or the other depending on the version.

The alias has existed since Rust 1.95.0 (released 2026-04-16) [2], but
use the newer version instead to avoid changing how the build works for
existing compilers, at least until more testing takes place.

So bumping the Linux version was the right thing to do :)

Thanks! (and apologies for the delay -- I was at a conference and missed this)

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.

Opaque type instead of ulong for builtin functions on clang 23.1

2 participants