Skip to content

Commit 0b4ac62

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 e60e19b + 26a6cc4 commit 0b4ac62

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1900,9 +1900,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
19001900

19011901
[[package]]
19021902
name = "libc"
1903-
version = "0.2.103"
1903+
version = "0.2.106"
19041904
source = "registry+https://github.com/rust-lang/crates.io-index"
1905-
checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6"
1905+
checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673"
19061906
dependencies = [
19071907
"rustc-std-workspace-core",
19081908
]

library/std/Cargo.toml

+1-1
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" }

library/std/src/sys/itron/thread.rs

+1-1
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)