detect: Support run-time detection on aarch64 NetBSD

taiki-e · Mar 26, 2023 · 62db952 · 62db952
1 parent 68f93e1
commit 62db952
Show file tree

Hide file tree

Showing 10 changed files with 478 additions and 7 deletions.
diff --git a/.github/.cspell/project-dictionary.txt b/.github/.cspell/project-dictionary.txt
@@ -5,6 +5,7 @@ alcgr
 algr
 armasm
 armel
+armreg
 autogen
 auxv
 auxvec
@@ -20,6 +21,7 @@ cdsg
 cfgs
 cinc
 cirruslabs
+clidr
 cmovae
 cmovb
 cmovge
@@ -32,6 +34,7 @@ cpsid
 cpsie
 CPSR
 cpuid
+cpus
 crand
 crandc
 cror
@@ -76,16 +79,23 @@ memcpy
 metavar
 mfence
 mgba
+midr
 miscompilation
 mmfr
 moreutils
+mpidr
 mstatus
+mvfr
+NCPU
+NCPUONLINE
 negs
 neoverse
 newrepo
 newtype
 nographic
 nostdinc
+NPROCESSORS
+ONLN
 opensbi
 osfmk
 osxsave
@@ -98,6 +108,7 @@ qword
 RAII
 rcpc
 reentrancy
+revidr
 sbcs
 seqlock
 setb

diff --git a/src/imp/atomic128/README.md b/src/imp/atomic128/README.md
@@ -29,7 +29,7 @@ Here is the table of targets that support run-time feature detection and the ins
 | aarch64     | linux-gnu/android    | getauxval       |
 | aarch64     | other linux          | dlsym(getauxval) (via is_aarch64_feature_detected) |
 | aarch64     | freebsd              | elf_aux_info    |
-| aarch64     | macos/openbsd        | sysctl          |
+| aarch64     | macos/netbsd/openbsd | sysctl          |
 | aarch64     | windows              | IsProcessorFeaturePresent |
 | aarch64     | fuchsia              | zx_system_get_features |
 

diff --git a/src/imp/atomic128/aarch64.rs b/src/imp/atomic128/aarch64.rs
@@ -61,7 +61,7 @@ include!("macros.rs");
 #[path = "detect/aarch64_auxv.rs"]
 mod detect;
 #[cfg(not(portable_atomic_no_outline_atomics))]
-#[cfg(target_os = "openbsd")]
+#[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
 #[path = "detect/aarch64_aa64reg.rs"]
 mod detect;
 #[cfg(not(portable_atomic_no_outline_atomics))]
@@ -313,6 +313,7 @@ unsafe fn atomic_compare_exchange(
             target_os = "linux",
             target_os = "android",
             target_os = "freebsd",
+            target_os = "netbsd",
             target_os = "openbsd",
             target_os = "fuchsia",
             target_os = "windows",
@@ -328,6 +329,7 @@ unsafe fn atomic_compare_exchange(
             target_os = "linux",
             target_os = "android",
             target_os = "freebsd",
+            target_os = "netbsd",
             target_os = "openbsd",
             target_os = "fuchsia",
             target_os = "windows",