From: David Carlier <devnexen@gmail.com>
Date: Sat, 9 Jan 2021 14:17:29 +0000 (+0000)
Subject: OPENSSL_cpuid_setup FreeBSD PowerPC update
X-Git-Tag: OpenSSL_1_1_1j~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc4ca443c7b999bb47bec6b8ea828973e3c4c7e1;p=thirdparty%2Fopenssl.git

OPENSSL_cpuid_setup FreeBSD PowerPC update

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13821)

(cherry picked from commit b57ec7394aace731c460b509aa84039274337600)
---

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index b12cd949ccf..1d622269656 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -214,6 +214,24 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
 # endif
 #endif
 
+#if defined(__FreeBSD__)
+# include <sys/param.h>
+# if __FreeBSD_version >= 1200000
+#  include <sys/auxv.h>
+#  define OSSL_IMPLEMENT_GETAUXVAL
+
+static unsigned long getauxval(unsigned long key)
+{
+  unsigned long val = 0ul;
+
+  if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
+    return 0ul;
+
+  return val;
+}
+# endif
+#endif
+
 /* I wish <sys/auxv.h> was universally available */
 #define HWCAP                   16      /* AT_HWCAP */
 #define HWCAP_PPC64             (1U << 30)