diff options
| author | bors <bors@rust-lang.org> | 2021-11-04 03:48:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-04 03:48:43 +0000 |
| commit | 0b4ac62ddaf9ee01b8aaf9dd7097f1f541d64551 (patch) | |
| tree | b2ba4eb8ffa027960716bdb70fcc309b68955950 | |
| parent | e60e19bc6553ba02b8677ab7e397af738c076c8e (diff) | |
| parent | 26a6cc45152e591172fda717d3d03543f0b490ac (diff) | |
| download | rust-0b4ac62ddaf9ee01b8aaf9dd7097f1f541d64551.tar.gz rust-0b4ac62ddaf9ee01b8aaf9dd7097f1f541d64551.zip | |
Auto merge of #90392 - solid-rs:fix-solid-support, r=Mark-Simulacrum
kmc-solid: Fix SOLID target This PR is a follow-up for #86191 and necessary to make the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets actually usable. - Bumps `libc` to 0.2.106, which includes <https://github.com/rust-lang/libc/pull/2227>. - Applies the change made by #89324 to this target's target-specific code.
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | library/std/Cargo.toml | 2 | ||||
| -rw-r--r-- | library/std/src/sys/itron/thread.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 06444b76e56..14aaa80c259 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1900,9 +1900,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.103" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" +checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673" dependencies = [ "rustc-std-workspace-core", ] diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 6bc445c6f2b..248ecdf4bef 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -15,7 +15,7 @@ cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] } panic_unwind = { path = "../panic_unwind", optional = true } panic_abort = { path = "../panic_abort" } core = { path = "../core" } -libc = { version = "0.2.103", default-features = false, features = ['rustc-dep-of-std'] } +libc = { version = "0.2.106", default-features = false, features = ['rustc-dep-of-std'] } compiler_builtins = { version = "0.1.44" } profiler_builtins = { path = "../profiler_builtins", optional = true } unwind = { path = "../unwind" } diff --git a/library/std/src/sys/itron/thread.rs b/library/std/src/sys/itron/thread.rs index 4feb9c5a6d7..bb9fa54d02e 100644 --- a/library/std/src/sys/itron/thread.rs +++ b/library/std/src/sys/itron/thread.rs @@ -347,6 +347,6 @@ unsafe fn terminate_and_delete_current_task() -> ! { unsafe { crate::hint::unreachable_unchecked() }; } -pub fn available_concurrency() -> io::Result<crate::num::NonZeroUsize> { +pub fn available_parallelism() -> io::Result<crate::num::NonZeroUsize> { super::unsupported() } |