Skip to content

Commit

Permalink
Merge #1662
Browse files Browse the repository at this point in the history
1662: Enable uconxtext module for s390x r=asomers a=rtzoeller

Added to libc by rust-lang/libc@38569c7

Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
  • Loading branch information
bors[bot] and rtzoeller committed Feb 13, 2022
2 parents 432fb90 + 263e870 commit b38a88a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -45,6 +45,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
(#[1563](https://github.com/nix-rust/nix/pull/1563))
- Added `process_vm_readv` and `process_vm_writev` on Android.
(#[1557](https://github.com/nix-rust/nix/pull/1557))
- Added `nix::uncontext` module on s390x.
(#[1662](https://github.com/nix-rust/nix/pull/1662))

### Changed

Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Expand Up @@ -146,7 +146,8 @@ feature! {
// This can be implemented for other platforms as soon as libc
// provides bindings for them.
#[cfg(all(target_os = "linux",
any(target_arch = "x86", target_arch = "x86_64")))]
any(target_arch = "s390x", target_arch = "x86",
target_arch = "x86_64")))]
feature! {
#![feature = "ucontext"]
#[allow(missing_docs)]
Expand Down

0 comments on commit b38a88a

Please sign in to comment.