Add support for elf_aux_info() on OpenBSD

CLA: trivial Reviewed-by: Dmitry Belyavskiy <[email protected]> Reviewed-by: Tom Cosgrove <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from openssl#25346)
quictls · Sep 2, 2024 · 01f4b44 · 01f4b44
1 parent 16e7da0
commit 01f4b44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/crypto/armcap.c b/crypto/armcap.c
@@ -78,9 +78,10 @@ void OPENSSL_cpuid_setup(void) __attribute__ ((constructor));
 #   define OSSL_IMPLEMENT_GETAUXVAL
 #  endif
 # endif
-# if defined(__FreeBSD__)
+# if defined(__FreeBSD__) || defined(__OpenBSD__)
 #  include <sys/param.h>
-#  if __FreeBSD_version >= 1200000
+#  if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || \
+    (defined(__OpenBSD__) && OpenBSD >= 202409)
 #   include <sys/auxv.h>
 #   define OSSL_IMPLEMENT_GETAUXVAL
 

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
@@ -99,9 +99,10 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
 # endif
 #endif
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 # include <sys/param.h>
-# if __FreeBSD_version >= 1200000
+# if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || \
+    (defined(__OpenBSD__) && OpenBSD >= 202409)
 #  include <sys/auxv.h>
 #  define OSSL_IMPLEMENT_GETAUXVAL