From: Brad Smith <brad@comstyle.com>
Date: Wed, 17 Sep 2025 03:16:48 +0000 (-0400)
Subject: Correct version used to check for elf_aux_info() on FreeBSD
X-Git-Tag: 4.0-PRE-CLANG-FORMAT-WEBKIT~456
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a02b921cf2514c112f76068f06da9289cd2e7500;p=thirdparty%2Fopenssl.git

Correct version used to check for elf_aux_info() on FreeBSD

FreeBSD also added elf_aux_info() to the 11 branch and was shipped
with 11.4.

https://github.com/freebsd/freebsd-src/commit/03444a7d439755189e4dc8ccd56403bbaef3d6b0

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28581)
---

diff --git a/crypto/armcap.c b/crypto/armcap.c
index b9ccae72adc..e294b1d44cd 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -76,7 +76,7 @@ uint32_t OPENSSL_rdtsc(void)
 # endif
 # if defined(__FreeBSD__) || defined(__OpenBSD__)
 #  include <sys/param.h>
-#  if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || \
+#  if (defined(__FreeBSD__) && __FreeBSD_version >= 1104000) || \
     (defined(__OpenBSD__) && OpenBSD >= 202409)
 #   include <sys/auxv.h>
 #   define OSSL_IMPLEMENT_GETAUXVAL
diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 13ebf973158..d4d3c8206d6 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -101,7 +101,7 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
 # include <sys/param.h>
-# if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || \
+# if (defined(__FreeBSD__) && __FreeBSD_version >= 1104000) || \
     (defined(__OpenBSD__) && OpenBSD >= 202409)
 #  include <sys/auxv.h>
 #  define OSSL_IMPLEMENT_GETAUXVAL