Skip to content

Commit fc5c3ca

Browse files
committed
Auto merge of rust-lang#90392 - solid-rs:fix-solid-support, r=Mark-Simulacrum
kmc-solid: Fix SOLID target This PR is a follow-up for rust-lang#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 <rust-lang/libc#2227>. - Applies the change made by rust-lang#89324 to this target's target-specific code.
2 parents 70496c1 + 8b1328a commit fc5c3ca

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

std/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
1515
panic_unwind = { path = "../panic_unwind", optional = true }
1616
panic_abort = { path = "../panic_abort" }
1717
core = { path = "../core" }
18-
libc = { version = "0.2.103", default-features = false, features = ['rustc-dep-of-std'] }
18+
libc = { version = "0.2.106", default-features = false, features = ['rustc-dep-of-std'] }
1919
compiler_builtins = { version = "0.1.44" }
2020
profiler_builtins = { path = "../profiler_builtins", optional = true }
2121
unwind = { path = "../unwind" }

std/src/sys/itron/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,6 @@ unsafe fn terminate_and_delete_current_task() -> ! {
347347
unsafe { crate::hint::unreachable_unchecked() };
348348
}
349349

350-
pub fn available_concurrency() -> io::Result<crate::num::NonZeroUsize> {
350+
pub fn available_parallelism() -> io::Result<crate::num::NonZeroUsize> {
351351
super::unsupported()
352352
}

0 commit comments

Comments
 (0)