From: Brad Smith <brad@comstyle.com>
Date: Sun, 1 Sep 2024 05:07:16 +0000 (-0400)
Subject: Add support for elf_aux_info() on OpenBSD
X-Git-Tag: openssl-3.4.0-alpha1~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01f4b44e075a796d62d3b007a80c5c04d0e77bfb;p=thirdparty%2Fopenssl.git

Add support for elf_aux_info() on OpenBSD

CLA: trivial

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25346)
---

diff --git a/crypto/armcap.c b/crypto/armcap.c
index 01be1a4d677..33b9dd4df08 100644
--- 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
index a38c819d2d2..38c08703ae3 100644
--- 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