Skip to content
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

Jump to bottom

Update Cargo.lock #1083

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Update Cargo.lock #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d25fef
Update Cargo.lock
newpavlov Jun 19, 2024
43c5cbd
Fix loongarch build
newpavlov Jun 19, 2024
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
54 changes: 27 additions & 27 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cpufeatures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ edition = "2018"
readme = "README.md"

[target.'cfg(all(target_arch = "aarch64", target_vendor = "apple"))'.dependencies]
libc = "0.2.149"
libc = "0.2.155"

[target.'cfg(all(target_arch = "aarch64", target_os = "linux"))'.dependencies]
libc = "0.2.149"
libc = "0.2.155"

[target.'cfg(all(target_arch = "loongarch64", target_os = "linux"))'.dependencies]
libc = "0.2.149"
libc = "0.2.155"

[target.aarch64-linux-android.dependencies]
libc = "0.2.149"
libc = "0.2.155"
28 changes: 14 additions & 14 deletions cpufeatures/src/loongarch64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,20 @@ __expand_check_macro! {
pub mod hwcaps {
use libc::c_ulong;

pub const CPUCFG: c_ulong = libc::HWCAP_CPUCFG;
pub const LAM: c_ulong = libc::HWCAP_LAM;
pub const UAL: c_ulong = libc::HWCAP_UAL;
pub const FPU: c_ulong = libc::HWCAP_FPU;
pub const LSX: c_ulong = libc::HWCAP_LSX;
pub const LASX: c_ulong = libc::HWCAP_LASX;
pub const CRC32: c_ulong = libc::HWCAP_CRC32;
pub const COMPLEX: c_ulong = libc::HWCAP_COMPLEX;
pub const CRYPTO: c_ulong = libc::HWCAP_CRYPTO;
pub const LVZ: c_ulong = libc::HWCAP_LVZ;
pub const LBT_X86: c_ulong = libc::HWCAP_LBT_X86;
pub const LBT_ARM: c_ulong = libc::HWCAP_LBT_ARM;
pub const LBT_MIPS: c_ulong = libc::HWCAP_LBT_MIPS;
pub const PTW: c_ulong = libc::HWCAP_PTW;
pub const CPUCFG: c_ulong = libc::HWCAP_LOONGARCH_CPUCFG;
pub const LAM: c_ulong = libc::HWCAP_LOONGARCH_LAM;
pub const UAL: c_ulong = libc::HWCAP_LOONGARCH_UAL;
pub const FPU: c_ulong = libc::HWCAP_LOONGARCH_FPU;
pub const LSX: c_ulong = libc::HWCAP_LOONGARCH_LSX;
pub const LASX: c_ulong = libc::HWCAP_LOONGARCH_LASX;
pub const CRC32: c_ulong = libc::HWCAP_LOONGARCH_CRC32;
pub const COMPLEX: c_ulong = libc::HWCAP_LOONGARCH_COMPLEX;
pub const CRYPTO: c_ulong = libc::HWCAP_LOONGARCH_CRYPTO;
pub const LVZ: c_ulong = libc::HWCAP_LOONGARCH_LVZ;
pub const LBT_X86: c_ulong = libc::HWCAP_LOONGARCH_LBT_X86;
pub const LBT_ARM: c_ulong = libc::HWCAP_LOONGARCH_LBT_ARM;
pub const LBT_MIPS: c_ulong = libc::HWCAP_LOONGARCH_LBT_MIPS;
pub const PTW: c_ulong = libc::HWCAP_LOONGARCH_PTW;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These constants were renamed in rust-lang/libc#3551. Strictly speaking, it's a breaking change on the libc side, but I guess nobody cares...

}

// On other targets, runtime CPU feature detection is unavailable
Expand Down
Loading