diff options
| author | Jack Lloyd <[email protected]> | 2019-03-27 09:14:06 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-03-27 09:14:06 -0400 |
| commit | 1c6803e9f6da35de07e6f220c93e7d7512e07588 (patch) | |
| tree | 2270e0f81b7a6e23f820033226fd429bcd4c4fb5 /src/lib/utils/cpuid | |
| parent | e16e981152236703bdaf482b867fb90c5f1f9f6a (diff) | |
Rename 'darwin' target to 'macos'
Both because that's the more common term, and because iOS/watchOS also
uses the Darwin kernel, but we have a distinct target for mobile.
Diffstat (limited to 'src/lib/utils/cpuid')
| -rw-r--r-- | src/lib/utils/cpuid/cpuid.h | 2 | ||||
| -rw-r--r-- | src/lib/utils/cpuid/cpuid_ppc.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/utils/cpuid/cpuid.h b/src/lib/utils/cpuid/cpuid.h index 46eef2095..d278a8fcc 100644 --- a/src/lib/utils/cpuid/cpuid.h +++ b/src/lib/utils/cpuid/cpuid.h @@ -25,7 +25,7 @@ namespace Botan { * - x86 features using CPUID. x86 is also the only processor with * accurate cache line detection currently. * -* - PowerPC AltiVec detection on Linux, NetBSD, OpenBSD, and Darwin +* - PowerPC AltiVec detection on Linux, NetBSD, OpenBSD, and macOS * * - ARM NEON and crypto extensions detection. On Linux and Android * systems which support getauxval, that is used to access CPU diff --git a/src/lib/utils/cpuid/cpuid_ppc.cpp b/src/lib/utils/cpuid/cpuid_ppc.cpp index 3afca539c..1c1b68658 100644 --- a/src/lib/utils/cpuid/cpuid_ppc.cpp +++ b/src/lib/utils/cpuid/cpuid_ppc.cpp @@ -11,9 +11,9 @@ #if defined(BOTAN_TARGET_CPU_IS_PPC_FAMILY) /* -* On Darwin and OpenBSD ppc, use sysctl to detect AltiVec +* On macOS and OpenBSD ppc, use sysctl to detect AltiVec */ -#if defined(BOTAN_TARGET_OS_IS_DARWIN) +#if defined(BOTAN_TARGET_OS_IS_MACOS) #include <sys/sysctl.h> #elif defined(BOTAN_TARGET_OS_IS_OPENBSD) #include <sys/param.h> @@ -37,8 +37,8 @@ uint64_t CPUID::CPUID_Data::detect_cpu_features(size_t* cache_line_size) { BOTAN_UNUSED(cache_line_size); -#if defined(BOTAN_TARGET_OS_IS_DARWIN) || defined(BOTAN_TARGET_OS_IS_OPENBSD) - // On Darwin/OS X and OpenBSD, use sysctl +#if defined(BOTAN_TARGET_OS_IS_MACOS) || defined(BOTAN_TARGET_OS_IS_OPENBSD) + // On macOS and OpenBSD, use sysctl int sels[2] = { #if defined(BOTAN_TARGET_OS_IS_OPENBSD) |