Skip to content

Update to linux-raw-sys 0.12.0, MSRV 1.88, and latest Rust nightly. #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 3 commits into from
Oct 25, 2025
Merged

Update to linux-raw-sys 0.12.0, MSRV 1.88, and latest Rust nightly. #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c216e6f
Update to linux-raw-sys 0.12.0, MSRV 1.88, and latest Rust nightly.
sunfishcode Oct 24, 2025
9839435
Fix aarch64.
sunfishcode Oct 24, 2025
dc2057a
Fix spelling.
sunfishcode Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
build: [ubuntu, i686-linux, aarch64-linux, riscv64-linux]
rust: [1.85, nightly-2025-04-28]
rust: [1.88, nightly-2025-10-23]
include:
- build: ubuntu
os: ubuntu-latest
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
qemu: qemu-riscv64 -L /usr/riscv64-linux-gnu
qemu_target: riscv64-linux-user
host_target: riscv64gc-unknown-linux-gnu
- rust: nightly-2025-04-28
- rust: nightly-2025-10-23
features: nightly
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ edition = "2024"
keywords = ["linux"]
categories = ["no-std"]
include = ["src", "Cargo.toml", "COPYRIGHT", "LICENSE*", "/*.md"]
rust-version = "1.85"
rust-version = "1.88"

[dependencies]
linux-raw-sys = { version = "0.9.2", default-features = false, optional = true, features = ["general", "no_std", "elf"] }
linux-raw-sys = { version = "0.12.0", default-features = false, optional = true, features = ["general", "no_std", "elf", "auxvec"] }
rustix = { version = "1.0.0", default-features = false }
bitflags = { version = "2.4.0", default-features = false }
log = { version = "0.4.14", default-features = false, optional = true }
Expand Down
6 changes: 3 additions & 3 deletions src/getauxval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ unsafe extern "C" fn __getauxval(type_: c_ulong) -> *mut c_void {

fn _getauxval(type_: c_ulong) -> *mut c_void {
match type_ as _ {
linux_raw_sys::general::AT_HWCAP => without_provenance_mut(rustix::param::linux_hwcap().0),
linux_raw_sys::general::AT_HWCAP2 => without_provenance_mut(rustix::param::linux_hwcap().1),
linux_raw_sys::general::AT_MINSIGSTKSZ => {
linux_raw_sys::auxvec::AT_HWCAP => without_provenance_mut(rustix::param::linux_hwcap().0),
linux_raw_sys::auxvec::AT_HWCAP2 => without_provenance_mut(rustix::param::linux_hwcap().1),
linux_raw_sys::auxvec::AT_MINSIGSTKSZ => {
without_provenance_mut(rustix::param::linux_minsigstksz())
}
_ => todo!("unrecognized __getauxval {}", type_),
Expand Down
2 changes: 1 addition & 1 deletion src/relocate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ use crate::arch::{
use core::ffi::c_void;
use core::mem;
use core::ptr::{null, null_mut};
use linux_raw_sys::auxvec::{AT_BASE, AT_ENTRY, AT_NULL, AT_PAGESZ};
use linux_raw_sys::elf::*;
use linux_raw_sys::general::{AT_BASE, AT_ENTRY, AT_NULL, AT_PAGESZ};

// The Linux UAPI headers don't define the .relr types and consts yet.
#[allow(non_camel_case_types)]
Expand Down