Fix other platforms

aws · Jul 1, 2024 · abe2889 · abe2889
1 parent 3e90aab
commit abe2889
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/crypto/fipsmodule/cpucap/cpu_arm_freebsd.c b/crypto/fipsmodule/cpucap/cpu_arm_freebsd.c
@@ -30,7 +30,9 @@ void OPENSSL_cpuid_setup(void) {
   // left at zero. The rest of this function will then gracefully report
   // the features are absent.
   elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+#if defined(AT_HWCAP2)
   elf_aux_info(AT_HWCAP2, &hwcap2, sizeof(hwcap2));
+#endif
 
   // Matching OpenSSL, only report other features if NEON is present.
   if (hwcap & HWCAP_NEON) {

diff --git a/crypto/fipsmodule/cpucap/cpu_ppc64le.c b/crypto/fipsmodule/cpucap/cpu_ppc64le.c
@@ -68,7 +68,11 @@ static void handle_cpu_env(unsigned long *out, const char *in) {
 extern uint8_t OPENSSL_cpucap_initialized;
 
 void OPENSSL_cpuid_setup(void) {
+#if defined(AT_HWCAP2)
   OPENSSL_ppc64le_hwcap2 = getauxval(AT_HWCAP2);
+#else
+  OPENSSL_ppc64le_hwcap2 = 0;
+#endif
   OPENSSL_cpucap_initialized = 1;
 
   // OPENSSL_ppccap is a 64-bit hex string which may start with "0x".