Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 20 insertions, 20 deletions

diff --git a/library/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs b/library/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs
index 7d972b373..ccc48f536 100644
--- a/library/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs
+++ b/library/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs
@@ -1,21 +1,3 @@
 //! Run-time feature detection for Aarch64 on FreeBSD.
 
 pub(crate) use super::super::aarch64::detect_features;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn dump() {
-        println!("asimd: {:?}", is_aarch64_feature_detected!("asimd"));
-        println!("pmull: {:?}", is_aarch64_feature_detected!("pmull"));
-        println!("fp: {:?}", is_aarch64_feature_detected!("fp"));
-        println!("fp16: {:?}", is_aarch64_feature_detected!("fp16"));
-        println!("sve: {:?}", is_aarch64_feature_detected!("sve"));
-        println!("crc: {:?}", is_aarch64_feature_detected!("crc"));
-        println!("lse: {:?}", is_aarch64_feature_detected!("lse"));
-        println!("rdm: {:?}", is_aarch64_feature_detected!("rdm"));
-        println!("rcpc: {:?}", is_aarch64_feature_detected!("rcpc"));
-        println!("dotprod: {:?}", is_aarch64_feature_detected!("dotprod"));
-        println!("tme: {:?}", is_aarch64_feature_detected!("tme"));
-    }
-}
diff --git a/library/stdarch/crates/std_detect/src/detect/os/freebsd/arm.rs b/library/stdarch/crates/std_detect/src/detect/os/freebsd/arm.rs
index 4c9d763b4..97ede1d26 100644
--- a/library/stdarch/crates/std_detect/src/detect/os/freebsd/arm.rs
+++ b/library/stdarch/crates/std_detect/src/detect/os/freebsd/arm.rs
@@ -3,6 +3,15 @@
 use super::auxvec;
 use crate::detect::{cache, Feature};
 
+// Defined in machine/elf.h.
+// https://github.com/freebsd/freebsd-src/blob/deb63adf945d446ed91a9d84124c71f15ae571d1/sys/arm/include/elf.h
+const HWCAP_NEON: usize = 0x00001000;
+const HWCAP2_AES: usize = 0x00000001;
+const HWCAP2_PMULL: usize = 0x00000002;
+const HWCAP2_SHA1: usize = 0x00000004;
+const HWCAP2_SHA2: usize = 0x00000008;
+const HWCAP2_CRC32: usize = 0x00000010;
+
 /// Try to read the features from the auxiliary vector
 pub(crate) fn detect_features() -> cache::Initializer {
     let mut value = cache::Initializer::default();
@@ -13,8 +22,17 @@ pub(crate) fn detect_features() -> cache::Initializer {
     };
 
     if let Ok(auxv) = auxvec::auxv() {
-        enable_feature(&mut value, Feature::neon, auxv.hwcap & 0x00001000 != 0);
-        enable_feature(&mut value, Feature::pmull, auxv.hwcap2 & 0x00000002 != 0);
+        enable_feature(&mut value, Feature::neon, auxv.hwcap & HWCAP_NEON != 0);
+        let pmull = auxv.hwcap2 & HWCAP2_PMULL != 0;
+        enable_feature(&mut value, Feature::pmull, pmull);
+        enable_feature(&mut value, Feature::crc, auxv.hwcap2 & HWCAP2_CRC32 != 0);
+        let aes = auxv.hwcap2 & HWCAP2_AES != 0;
+        enable_feature(&mut value, Feature::aes, aes);
+        // SHA2 requires SHA1 & SHA2 features
+        let sha1 = auxv.hwcap2 & HWCAP2_SHA1 != 0;
+        let sha2 = auxv.hwcap2 & HWCAP2_SHA2 != 0;
+        enable_feature(&mut value, Feature::sha2, sha1 && sha2);
+        enable_feature(&mut value, Feature::crypto, aes && pmull && sha1 && sha2);
         return value;
     }
     value