about summary refs log tree commit diff
path: root/library/stdarch/crates/std_detect
diff options
context:
space:
mode:
authorgendx <gendx@users.noreply.github.com>2022-11-09 18:38:48 +0000
committerGitHub <noreply@github.com>2022-11-09 18:38:48 +0000
commit45e3039ee9618e8af0708467e34e8e92b9bee7ac (patch)
treed6c863594baae6f48439dc5024ae02a89a0ef163 /library/stdarch/crates/std_detect
parent9f7ded4282ac7362fe5da07d1ee1b8b9646659ab (diff)
downloadrust-45e3039ee9618e8af0708467e34e8e92b9bee7ac.tar.gz
rust-45e3039ee9618e8af0708467e34e8e92b9bee7ac.zip
Detect CPU features with Linux methods on Android for non-Intel CPUs. (#1351)
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
Diffstat (limited to 'library/stdarch/crates/std_detect')
-rw-r--r--library/stdarch/crates/std_detect/src/detect/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/stdarch/crates/std_detect/src/detect/mod.rs b/library/stdarch/crates/std_detect/src/detect/mod.rs
index 2bca84ca127..9a135c90a39 100644
--- a/library/stdarch/crates/std_detect/src/detect/mod.rs
+++ b/library/stdarch/crates/std_detect/src/detect/mod.rs
@@ -47,7 +47,7 @@ cfg_if! {
         // On x86/x86_64 no OS specific functionality is required.
         #[path = "os/x86.rs"]
         mod os;
-    } else if #[cfg(all(target_os = "linux", feature = "libc"))] {
+    } else if #[cfg(all(any(target_os = "linux", target_os = "android"), feature = "libc"))] {
         #[path = "os/linux/mod.rs"]
         mod os;
     } else if #[cfg(all(target_os = "freebsd", feature = "libc"))] {