diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-07-27 19:52:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 19:52:42 +0900 |
| commit | 90f6d7becb6bce73b8a8a709c76c23554f859770 (patch) | |
| tree | 51c577696902126a4b5d7bd091cb8e37650864ed /library/std/src/sys | |
| parent | 4e1ebf23cdbbba57126908d0ba07e35c47bd71ca (diff) | |
| parent | 7a9dd00506f496f511d87fda5a286813322f8e55 (diff) | |
| download | rust-90f6d7becb6bce73b8a8a709c76c23554f859770.tar.gz rust-90f6d7becb6bce73b8a8a709c76c23554f859770.zip | |
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](https://github.com/rust-lang/libc/pull/2295) in libc.
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/unix/os/tests.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/unix/process/process_common.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/library/std/src/sys/unix/os/tests.rs b/library/std/src/sys/unix/os/tests.rs index 0e1dcb390a0..c445acf2722 100644 --- a/library/std/src/sys/unix/os/tests.rs +++ b/library/std/src/sys/unix/os/tests.rs @@ -1,12 +1,14 @@ use super::*; #[test] +#[cfg(not(target_os = "vxworks"))] fn test_glibc_version() { // This mostly just tests that the weak linkage doesn't panic wildly... glibc_version(); } #[test] +#[cfg(not(target_os = "vxworks"))] fn test_parse_glibc_version() { let cases = [ ("0.0", Some((0, 0))), diff --git a/library/std/src/sys/unix/process/process_common.rs b/library/std/src/sys/unix/process/process_common.rs index c5bdd1bda4a..f2f161e4eaa 100644 --- a/library/std/src/sys/unix/process/process_common.rs +++ b/library/std/src/sys/unix/process/process_common.rs @@ -50,7 +50,7 @@ cfg_if::cfg_if! { raw[bit / 8] |= 1 << (bit % 8); return 0; } - } else if #[cfg(not(target_os = "vxworks"))] { + } else { pub use libc::{sigemptyset, sigaddset}; } } |