Skip to content

Commit 90f6d7b

Browse files
authored
Rollup merge of #87354 - Wind-River:2021_master, r=kennytm
Update VxWork's UNIX support 1. VxWorks does not provide glibc 2. VxWorks does provide `sigemptyset` and `sigaddset` Note: these changes are concurrent to [this PR](rust-lang/libc#2295) in libc.
2 parents 4e1ebf2 + 7a9dd00 commit 90f6d7b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

library/std/src/sys/unix/os/tests.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
use super::*;
22

33
#[test]
4+
#[cfg(not(target_os = "vxworks"))]
45
fn test_glibc_version() {
56
// This mostly just tests that the weak linkage doesn't panic wildly...
67
glibc_version();
78
}
89

910
#[test]
11+
#[cfg(not(target_os = "vxworks"))]
1012
fn test_parse_glibc_version() {
1113
let cases = [
1214
("0.0", Some((0, 0))),

library/std/src/sys/unix/process/process_common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ cfg_if::cfg_if! {
5050
raw[bit / 8] |= 1 << (bit % 8);
5151
return 0;
5252
}
53-
} else if #[cfg(not(target_os = "vxworks"))] {
53+
} else {
5454
pub use libc::{sigemptyset, sigaddset};
5555
}
5656
}

0 commit comments

Comments
 (0)