c02ea4f1b2
* Simplify installation of the "maturin" binary. Changelog since 0.8.3: https://github.com/PyO3/maturin/blob/v0.11.3/Changelog.md PR: 258390 MFH: No (requires Rust >= 1.55 which isn't present in 2021Q3)
108 lines
3.8 KiB
Rust
108 lines
3.8 KiB
Rust
--- cargo-crates/ring-0.16.20/src/cpu.rs.orig 2021-01-27 22:49:11 UTC
|
|
+++ cargo-crates/ring-0.16.20/src/cpu.rs
|
|
@@ -31,7 +31,7 @@ pub(crate) fn features() -> Features {
|
|
target_arch = "x86_64",
|
|
all(
|
|
any(target_arch = "aarch64", target_arch = "arm"),
|
|
- any(target_os = "android", target_os = "fuchsia", target_os = "linux")
|
|
+ any(target_os = "android", target_os = "fuchsia", target_os = "freebsd", target_os = "linux")
|
|
)
|
|
))]
|
|
{
|
|
@@ -49,7 +49,7 @@ pub(crate) fn features() -> Features {
|
|
|
|
#[cfg(all(
|
|
any(target_arch = "aarch64", target_arch = "arm"),
|
|
- any(target_os = "android", target_os = "fuchsia", target_os = "linux")
|
|
+ any(target_os = "android", target_os = "fuchsia", target_os = "freebsd", target_os = "linux")
|
|
))]
|
|
{
|
|
arm::setup();
|
|
@@ -62,28 +62,58 @@ pub(crate) fn features() -> Features {
|
|
|
|
pub(crate) mod arm {
|
|
#[cfg(all(
|
|
- any(target_os = "android", target_os = "linux"),
|
|
+ any(target_os = "android", target_os = "freebsd", target_os = "linux"),
|
|
any(target_arch = "aarch64", target_arch = "arm")
|
|
))]
|
|
pub fn setup() {
|
|
use libc::c_ulong;
|
|
+ #[cfg(target_os = "freebsd")]
|
|
+ use libc::{c_int, c_void};
|
|
+ #[cfg(target_os = "freebsd")]
|
|
+ extern crate std;
|
|
|
|
// XXX: The `libc` crate doesn't provide `libc::getauxval` consistently
|
|
// across all Android/Linux targets, e.g. musl.
|
|
+ #[cfg(any(target_os = "android", target_os = "linux"))]
|
|
extern "C" {
|
|
fn getauxval(type_: c_ulong) -> c_ulong;
|
|
}
|
|
|
|
+ #[cfg(target_os = "freebsd")]
|
|
+ extern "C" {
|
|
+ fn elf_aux_info(aux: c_int, buf: *mut c_void, buflen: c_int) -> c_int;
|
|
+ }
|
|
+
|
|
+ #[cfg(not(target_os = "freebsd"))]
|
|
const AT_HWCAP: c_ulong = 16;
|
|
|
|
+ #[cfg(target_os = "freebsd")]
|
|
+ const AT_HWCAP: c_int = 25;
|
|
+
|
|
#[cfg(target_arch = "aarch64")]
|
|
const HWCAP_NEON: c_ulong = 1 << 1;
|
|
|
|
#[cfg(target_arch = "arm")]
|
|
const HWCAP_NEON: c_ulong = 1 << 12;
|
|
|
|
+ #[cfg(not(target_os = "freebsd"))]
|
|
let caps = unsafe { getauxval(AT_HWCAP) };
|
|
|
|
+ #[cfg(target_os = "freebsd")]
|
|
+ let caps: c_ulong = 0;
|
|
+
|
|
+ #[cfg(target_os = "freebsd")]
|
|
+ {
|
|
+ let buffer : *mut c_void = { let t: *const c_ulong = ∩︀ t} as *mut c_void;
|
|
+ unsafe {
|
|
+ let _ret = elf_aux_info(
|
|
+ AT_HWCAP,
|
|
+ buffer,
|
|
+ std::mem::size_of_val(&caps) as i32
|
|
+ );
|
|
+ }
|
|
+ }
|
|
+
|
|
// We assume NEON is available on AARCH64 because it is a required
|
|
// feature.
|
|
#[cfg(target_arch = "aarch64")]
|
|
@@ -100,11 +130,26 @@ pub(crate) mod arm {
|
|
#[cfg(target_arch = "arm")]
|
|
const OFFSET: c_ulong = 0;
|
|
|
|
- #[cfg(target_arch = "arm")]
|
|
+ #[cfg(target_os = "freebsd")]
|
|
+ let buffer : *mut c_void = { let t: *const c_ulong = ∩︀ t} as *mut c_void;
|
|
+
|
|
+ #[cfg(not(target_os = "freebsd"))]
|
|
let caps = {
|
|
const AT_HWCAP2: c_ulong = 26;
|
|
unsafe { getauxval(AT_HWCAP2) }
|
|
};
|
|
+
|
|
+ #[cfg(target_os = "freebsd")]
|
|
+ {
|
|
+ const AT_HWCAP2: c_int = 26;
|
|
+ unsafe {
|
|
+ let _ret = elf_aux_info(
|
|
+ AT_HWCAP2,
|
|
+ buffer,
|
|
+ std::mem::size_of_val(&caps) as i32
|
|
+ );
|
|
+ };
|
|
+ }
|
|
|
|
const HWCAP_AES: c_ulong = 1 << 0 + OFFSET;
|
|
const HWCAP_PMULL: c_ulong = 1 << 1 + OFFSET;
|