From: Niels Möller Date: Sun, 8 Sep 2024 16:41:59 +0000 (+0200) Subject: Simplify fat logic for freebsd on ppc. X-Git-Tag: nettle_3.10.1_release_20241230~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe776756141e5def2e2eec394a020cbec0bf270f;p=thirdparty%2Fnettle.git Simplify fat logic for freebsd on ppc. --- diff --git a/fat-ppc.c b/fat-ppc.c index c4dae3a1..9d50e5b1 100644 --- a/fat-ppc.c +++ b/fat-ppc.c @@ -55,7 +55,7 @@ # endif # ifdef HAVE_ELF_AUX_INFO # include -# elif !defined(__OpenBSD__) +# elif defined(__FreeBSD__) # include # endif #endif @@ -129,17 +129,15 @@ get_ppc_features (struct ppc_features *features) # if USE_GETAUXVAL hwcap = getauxval(AT_HWCAP); hwcap2 = getauxval(AT_HWCAP2); -# elif defined(__FreeBSD__) || defined(__OpenBSD__) -# ifdef HAVE_ELF_AUX_INFO +# elif defined(HAVE_ELF_AUX_INFO) elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); elf_aux_info(AT_HWCAP2, &hwcap2, sizeof(hwcap2)); -# elif !defined(__OpenBSD__) +# elif defined(__FreeBSD__) size_t len; len = sizeof(hwcap); sysctlbyname("hw.cpu_features", &hwcap, &len, NULL, 0); len = sizeof(hwcap2); sysctlbyname("hw.cpu_features2", &hwcap2, &len, NULL, 0); -# endif # endif features->have_crypto_ext = ((hwcap2 & PPC_FEATURE2_VEC_CRYPTO) == PPC_FEATURE2_VEC_CRYPTO);