Support new qnx targets by jonathanpallant · Pull Request #5241 · rust-lang/libc

jonathanpallant · 2026-07-02T16:01:10Z

Description

Updates libc to support the newly renamed targets for QNX SDP 8

This PR largely involves adding target_os = "qnx" everywhere that said target_os = "nto", and replacing target_env = "nto800" with target_os = "qnx".

Plus there are some pthread mutex fixes, which we took from the our header files.

Sources

For QNX SDP 8.0:

$ grep "#define PTHREAD_MUTEX_INITIALIZER" /home/ubuntu/qnx800/target/qnx/usr/include/pthread.h -A1
#define PTHREAD_MUTEX_INITIALIZER                   \
	{ .__u = { .__count = _NTO_SYNC_NONRECURSIVE }, .__owner = _NTO_SYNC_MUTEX_FREE }
$ rg "#define _NTO_SYNC_NONRECURSIVE" /home/ubuntu/qnx800
/home/ubuntu/qnx800/target/qnx/usr/include/sys/target_nto.h
540:#define _NTO_SYNC_NONRECURSIVE	0x80000000U	/* mutexes */
$ rg "#define _NTO_SYNC_MUTEX_FREE" /home/ubuntu/qnx800
/home/ubuntu/qnx800/target/qnx/usr/include/sys/target_nto.h
550:#define _NTO_SYNC_MUTEX_FREE	0x00000000U	/*    0  newly-initialized mutex */

For QNX SDP 7.1:

$ grep "#define PTHREAD_MUTEX_INITIALIZER" /home/ubuntu/qnx710/target/qnx7/usr/include/pthread.h -A1
#define PTHREAD_MUTEX_INITIALIZER	\
	{ .__u = { .__count = (_NTO_SYNC_NONRECURSIVE | _NTO_SYNC_NODESTROY) }, .__owner = _NTO_SYNC_MUTEX_FREE }
$ rg "#define _NTO_SYNC_NONRECURSIVE" /home/ubuntu/qnx710
/home/ubuntu/qnx710/target/qnx7/usr/include/sys/target_nto.h
470:#define _NTO_SYNC_NONRECURSIVE	0x80000000U	/* mutexes */
$ rg "#define _NTO_SYNC_NODESTROY" /home/ubuntu/qnx710
/home/ubuntu/qnx710/target/qnx7/usr/include/sys/target_nto.h
476:#define _NTO_SYNC_NODESTROY		0x02000000U /* mutexes */
$ rg "#define _NTO_SYNC_MUTEX_FREE" /home/ubuntu/qnx710
/home/ubuntu/qnx710/target/qnx7/usr/include/sys/target_nto.h
479:#define _NTO_SYNC_MUTEX_FREE	0x00000000U	/*    0  mutexes, and old cond, sem, spin */

I don't have QNX SDP 7.0 available, so the old code path was left as-is.

Checklist

Relevant tests in libc-test/semver have been updated (there are none)
No placeholder or unstable values like *LAST or *MAX are
included (see #3131)
Tested locally (cd libc-test && cargo test --target mytarget);
especially relevant for platforms that may not be checked in CI
- These tests do not pass but they didn't pass before this PR either

@rustbot label +stable-nominated

jonathanpallant · 2026-07-02T16:03:10Z

Well this seems to fail because the copy of rustc used doesn't know about target_os = "qnx".

tgross35 · 2026-07-02T21:02:07Z

    (
        "target_os",
        &[
            "switch", "aix", "ohos", "hurd", "rtems", "visionos", "nuttx", "cygwin", "qurt",
        ],
    ),


If that's a new config only in nightly, you'll need to update this

View changes since the review

rustbot · 2026-07-03T08:37:56Z

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.

rustbot · 2026-07-03T08:37:57Z

⚠️ Warning ⚠️

The following commits have 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.
- 196df63
You can start a rebase with the following commands:
```
$ # rebase
$ git pull --rebase https://github.com/rust-lang/libc.git main
$ git push --force-with-lease
```

jonathanpallant · 2026-07-03T08:38:25Z

sigh. I clicked the "Merge changes from main" button, but the bot tells me I shouldn't have clicked the button. I'll rebase.

tgross35 · 2026-07-03T08:41:03Z

I wish I could disable that button or make it rebase-only, unfortunately nothing we've tried can make it disappear

Without this, using a mutex on QNX will fail with -EINVAL.

jonathanpallant · 2026-07-03T08:52:38Z

+ /usr/sbin/pkg_add curl
  pkg_add: Can't process [http://cdn.NetBSD.org:80/pub/pkgsrc/packages/NetBSD/x86_64/10.1/All//curl*:](http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/x86_64/10.1/All//curl*:) 
  pkg_add: no pkg found for 'curl', sorry.

tgross35

LGTM, CI has been flaky so I'll try to merge later

View changes since this review

jonathanpallant · 2026-07-06T10:42:41Z

@tgross35 should I prepare a libc-0.2 patch for this, so we can get it into the Rust toolchain?

tgross35 · 2026-07-06T13:44:58Z

No need, I do cherry picks before releases. Planning on something in the next few days.

jonathanpallant · 2026-07-06T13:48:33Z

Fantastic. Do I need to poke rust-lang/rust to pick that release up, or does that happen automatically?

tgross35 · 2026-07-06T14:48:55Z

There are automatic lockfile bump PRs but they kind of tend to get stuck, so you can always do your own just for libc. I'll ping here when it's out :)

Fixes for QNX SDP 8 This PR contains libstd fixes so libstd can be build for QNX SDP 8. It requires patches to libc-0.2 and cc-rs. The cc-rs patch [was merged]([rust-lang/cc-rs#1775](rust-lang/cc-rs#1775)) already. I have a patch for libc-1.0 [here](rust-lang/libc#5241) which will need backporting to libc-0.2 once merged. With these in place, I was able to remotely `test tests/ui library/std library/alloc library/core` for `x86_64-pc-qnx` using a remote-test-server running on QNX SDP 8.0's QEMU BSP image. The only tests that failed were the two `tests/ui/codegen/huge-stacks.rs` tests, and I did not have enough RAM to run them.

Rollup merge of #158697 - ferrocene:qnx-sdp-8-fixes, r=aapoalas Fixes for QNX SDP 8 This PR contains libstd fixes so libstd can be build for QNX SDP 8. It requires patches to libc-0.2 and cc-rs. The cc-rs patch [was merged]([rust-lang/cc-rs#1775](rust-lang/cc-rs#1775)) already. I have a patch for libc-1.0 [here](rust-lang/libc#5241) which will need backporting to libc-0.2 once merged. With these in place, I was able to remotely `test tests/ui library/std library/alloc library/core` for `x86_64-pc-qnx` using a remote-test-server running on QNX SDP 8.0's QEMU BSP image. The only tests that failed were the two `tests/ui/codegen/huge-stacks.rs` tests, and I did not have enough RAM to run them.

(backport <rust-lang#5241>) (cherry picked from commit fe8ef15)

Without this, using a mutex on QNX will fail with -EINVAL. (backport <rust-lang#5241>) (cherry picked from commit 238da5e)

(backport <rust-lang#5241>) (cherry picked from commit a235a11)

(backport <rust-lang#5241>) (cherry picked from commit fe8ef15)

Without this, using a mutex on QNX will fail with -EINVAL. (backport <rust-lang#5241>) (cherry picked from commit 238da5e)

(backport <rust-lang#5241>) (cherry picked from commit a235a11)

(backport <rust-lang#5241>) (cherry picked from commit fe8ef15)

Without this, using a mutex on QNX will fail with -EINVAL. (backport <rust-lang#5241>) (cherry picked from commit 238da5e)

(backport <rust-lang#5241>) (cherry picked from commit a235a11)

libc versions >= 0.2.187 introduced an io_pkt/io_sock cfg_if split in src/unix/nto/mod.rs with no arm for target_env="nto80" (QNX SDP 8), causing a panic!("Unsupported arch") compile error for QNX8 targets whose rustc still reports target_os="nto" (see rust-lang/libc#5241 and rust-lang/rust#158449 for the eventual upstream QNX8 target rename that libc expects). The previous "0.2.186" version spec is a caret/minimum requirement, so crate_universe re-resolution could still silently pick a newer, broken libc release. Pin it exactly to prevent that.

score_crates only constrained libc to a minimum version ("0.2.186"), so a routine crate_universe re-resolution could silently pick up a newer, broken libc release: since libc 0.2.187 (the io_pkt/io_sock split added upstream, see rust-lang/libc#5241 tracking QNX SDP 8 support) the `target_env = "nto80"` case falls through to `panic!("Unsupported arch")` in src/unix/nto/mod.rs, because our current Ferrocene rustc still reports `target_os = "nto"` (not the newer `target_os = "qnx"` introduced by rust-lang/rust#158449, which our toolchain predates). This commit exactly pins libc to "=0.2.186", the last known-good release for our QNX8 target (eclipse-score/score-crates#60, not yet released/tagged).

rustbot added S-waiting-on-review stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Jul 2, 2026

jonathanpallant mentioned this pull request Jul 2, 2026

Fixes for QNX SDP 8 rust-lang/rust#158697

Merged

tgross35 reviewed Jul 2, 2026

View reviewed changes

jonathanpallant added 3 commits July 3, 2026 08:42

Support new QNX targets

059d129

Fix pthread mutex initializer for QNX

4b007a2

Without this, using a mutex on QNX will fail with -EINVAL.

Add "qnx" to list of allowed target_os values.

825590e

jonathanpallant force-pushed the support-new-qnx-targets branch from 196df63 to 825590e Compare July 3, 2026 08:42

tgross35 approved these changes Jul 3, 2026

View reviewed changes

tgross35 enabled auto-merge July 3, 2026 14:32

tgross35 added this pull request to the merge queue Jul 3, 2026

Merged via the queue into rust-lang:main with commit a235a11 Jul 3, 2026
106 of 111 checks passed

rustbot removed the S-waiting-on-review label Jul 3, 2026

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Support new QNX targets

9b5c5ae

(backport <rust-lang#5241>) (cherry picked from commit fe8ef15)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Fix pthread mutex initializer for QNX

4c87050

Without this, using a mutex on QNX will fail with -EINVAL. (backport <rust-lang#5241>) (cherry picked from commit 238da5e)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Add "qnx" to list of allowed target_os values.

a760374

(backport <rust-lang#5241>) (cherry picked from commit a235a11)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Support new QNX targets

00a3677

(backport <rust-lang#5241>) (cherry picked from commit fe8ef15)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Fix pthread mutex initializer for QNX

da28884

Without this, using a mutex on QNX will fail with -EINVAL. (backport <rust-lang#5241>) (cherry picked from commit 238da5e)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Add "qnx" to list of allowed target_os values.

32a95f5

(backport <rust-lang#5241>) (cherry picked from commit a235a11)

This was referenced Jul 20, 2026

[0.2] Backports #5293

Merged

[0.2] Backports #5294

Merged

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Support new QNX targets

a446e0f

(backport <rust-lang#5241>) (cherry picked from commit fe8ef15)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Fix pthread mutex initializer for QNX

cd5a29e

Without this, using a mutex on QNX will fail with -EINVAL. (backport <rust-lang#5241>) (cherry picked from commit 238da5e)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

Add "qnx" to list of allowed target_os values.

31f9581

(backport <rust-lang#5241>) (cherry picked from commit a235a11)

tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Jul 21, 2026

LittleHuba mentioned this pull request Jul 24, 2026

Pin libc to exact 0.2.186 for QNX8 compatibility eclipse-score/score-crates#60

Merged

Uh oh!

Conversation

jonathanpallant commented Jul 2, 2026

Description

Sources

Checklist

Uh oh!

jonathanpallant commented Jul 2, 2026

Uh oh!

tgross35 Jul 2, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Jul 3, 2026

Uh oh!

rustbot commented Jul 3, 2026

Uh oh!

jonathanpallant commented Jul 3, 2026

Uh oh!

tgross35 commented Jul 3, 2026

Uh oh!

jonathanpallant commented Jul 3, 2026

Uh oh!

tgross35 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jonathanpallant commented Jul 6, 2026

Uh oh!

tgross35 commented Jul 6, 2026

Uh oh!

jonathanpallant commented Jul 6, 2026

Uh oh!

tgross35 commented Jul 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tgross35 Jul 2, 2026 •

edited by rustbot

Loading

tgross35 left a comment •

edited by rustbot

Loading