Add FreeBSD arm cpu features detection

briansmith · Sep 24, 2021 · a5dfa60 · a5dfa60
1 parent 92e15f2
commit a5dfa60
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -162,10 +162,10 @@ name = "ring"
 [dependencies]
 untrusted = { version = "0.9" }
 
-[target.'cfg(any(target_arch = "x86",target_arch = "x86_64", all(any(target_arch = "aarch64", target_arch = "arm"), any(target_os = "android", target_os = "fuchsia", target_os = "linux", target_os = "windows"))))'.dependencies]
+[target.'cfg(any(target_arch = "x86",target_arch = "x86_64", all(any(target_arch = "aarch64", target_arch = "arm"), any(target_os = "android", target_os = "freebsd", target_os = "fuchsia", target_os = "linux", target_os = "windows"))))'.dependencies]
 spin = { version = "0.9.2", default-features = false, features = ["once"] }
 
-[target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
+[target.'cfg(any(target_os = "android", target_os = "freebsd", target_os = "linux"))'.dependencies]
 libc = { version = "0.2.100", default-features = false }
 once_cell = { version = "1.8.0", default-features = false, features=["std"], optional = true }
 

diff --git a/src/cpu.rs b/src/cpu.rs
@@ -33,6 +33,7 @@ pub(crate) fn features() -> Features {
             any(target_arch = "aarch64", target_arch = "arm"),
             any(
                 target_os = "android",
+                target_os = "freebsd",
                 target_os = "fuchsia",
                 target_os = "linux",
                 target_os = "windows"
@@ -56,6 +57,7 @@ pub(crate) fn features() -> Features {
                 any(target_arch = "aarch64", target_arch = "arm"),
                 any(
                     target_os = "android",
+                    target_os = "freebsd",
                     target_os = "fuchsia",
                     target_os = "linux",
                     target_os = "windows"
@@ -72,28 +74,57 @@ 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 = &caps;
+                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")]
@@ -110,12 +141,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 = &caps;
+                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;
             const HWCAP_SHA2: c_ulong = 1 << 3 + OFFSET;