Re: [PATCH] util/cpuinfo: Make use of elf_aux_info(3) on OpenBSD

[Philippe Mathieu-Daudé]

Hi Brad,

On 28/7/24 05:58, Brad Smith wrote:
> util/cpuinfo: Make use of elf_aux_info(3) on OpenBSD
>
> Signed-off-by: Brad Smith <brad@comstyle.com>
> ---
>   meson.build            | 8 ++++++++
>   util/cpuinfo-aarch64.c | 9 ++++++---
>   util/cpuinfo-ppc.c     | 5 +++--
>   util/getauxval.c       | 2 +-
>   4 files changed, 18 insertions(+), 6 deletions(-)


> diff --git a/util/cpuinfo-ppc.c b/util/cpuinfo-ppc.c
> index 1304f9aa80..ccfcaa0754 100644
> --- a/util/cpuinfo-ppc.c
> +++ b/util/cpuinfo-ppc.c
> @@ -14,7 +14,8 @@
>   #  include "elf.h"
>   # endif
>   #endif
> -#ifdef __FreeBSD__
> +#if defined(CONFIG_ELF_AUX_INFO)
> +# include <sys/auxv.h>
>   # include <machine/cpu.h>
>   # ifndef PPC_FEATURE2_ARCH_3_1
>   #  define PPC_FEATURE2_ARCH_3_1   0
> @@ -35,7 +36,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(void)
>   
>       info = CPUINFO_ALWAYS;
>   
> -#if defined(CONFIG_LINUX) || defined(__FreeBSD__)
> +#if defined(CONFIG_LINUX) || deinfed(CONFIG_ELF_AUX_INFO)

Typo!

>       unsigned long hwcap = qemu_getauxval(AT_HWCAP);
>       unsigned long hwcap2 = qemu_getauxval(AT_HWCAP2);
>   
> diff --git a/util/getauxval.c b/util/getauxval.c
> index b124107d61..5bdbb04f8f 100644
> --- a/util/getauxval.c
> +++ b/util/getauxval.c
> @@ -98,7 +98,7 @@ unsigned long qemu_getauxval(unsigned long type)
>       return 0;
>   }
>   
> -#elif defined(__FreeBSD__)
> +#elif deinfed(CONFIG_ELF_AUX_INFO)

Same typo, has this patch been tested?

>   #include <sys/auxv.h>
>   
>   unsigned long qemu_getauxval(unsigned long type)

Except typos, code LGTM, so:

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>