Skip to content

Commit 05f925a

Browse files
bors[bot]rtzoeller
andauthored
Merge #1902
1902: Enable ucontext module on aarch64-unknown-linux-gnu r=asomers a=rtzoeller Untested, but I saw rust-lang/libc@fd32da6 and figured we should uptake it. Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
2 parents 691ab13 + d26534f commit 05f925a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
77
### Added
88
- Add `PF_ROUTE` to `SockType` on macOS, iOS, all of the BSDs, Fuchsia, Haiku, Illumos.
99
([#1867](https://github.com/nix-rust/nix/pull/1867))
10+
- Added `nix::ucontext` module on `aarch64-unknown-linux-gnu`.
11+
(#[1662](https://github.com/nix-rust/nix/pull/1662))
1012

1113
### Changed
1214
### Fixed
@@ -216,7 +218,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
216218
(#[1563](https://github.com/nix-rust/nix/pull/1563))
217219
- Added `process_vm_readv` and `process_vm_writev` on Android.
218220
(#[1557](https://github.com/nix-rust/nix/pull/1557))
219-
- Added `nix::uncontext` module on s390x.
221+
- Added `nix::ucontext` module on s390x.
220222
(#[1662](https://github.com/nix-rust/nix/pull/1662))
221223
- Implemented `Extend`, `FromIterator`, and `IntoIterator` for `SigSet` and
222224
added `SigSet::iter` and `SigSetIter`.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ targets = [
2727
]
2828

2929
[dependencies]
30-
libc = { version = "0.2.137", features = [ "extra_traits" ] }
30+
libc = { git = "https://github.com/rust-lang/libc", rev = "15d27952bfa93e5e4f419c603f275486f15a050c", features = [ "extra_traits" ] }
3131
bitflags = "1.1"
3232
cfg-if = "1.0"
3333
pin-utils = { version = "0.1.0", optional = true }

src/lib.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,12 @@ feature! {
144144
// provides bindings for them.
145145
#[cfg(all(
146146
target_os = "linux",
147-
any(target_arch = "s390x", target_arch = "x86", target_arch = "x86_64")
147+
any(
148+
target_arch = "aarch64",
149+
target_arch = "s390x",
150+
target_arch = "x86",
151+
target_arch = "x86_64"
152+
)
148153
))]
149154
feature! {
150155
#![feature = "ucontext"]

0 commit comments

Comments
 (0)