| Message ID | ZneCVxqGDjKpa5Jp@humpty.home.comstyle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | util: fix building on OpenBSD/powerpc | expand |
On 6/22/24 19:03, Brad Smith wrote: > util: fix building on OpenBSD/powerpc > > Signed-off-by: Brad Smith<brad@comstyle.com> > --- > util/cpuinfo-ppc.c | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 6/23/24 10:53, Richard Henderson wrote: > On 6/22/24 19:03, Brad Smith wrote: >> util: fix building on OpenBSD/powerpc >> >> Signed-off-by: Brad Smith<brad@comstyle.com> >> --- >> util/cpuinfo-ppc.c | 20 ++++++++++++-------- >> 1 file changed, 12 insertions(+), 8 deletions(-) > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > > r~ Queued to tcg-next. r~
On 2024-06-23 6:03 p.m., Richard Henderson wrote: > On 6/23/24 10:53, Richard Henderson wrote: >> On 6/22/24 19:03, Brad Smith wrote: >>> util: fix building on OpenBSD/powerpc >>> >>> Signed-off-by: Brad Smith<brad@comstyle.com> >>> --- >>> util/cpuinfo-ppc.c | 20 ++++++++++++-------- >>> 1 file changed, 12 insertions(+), 8 deletions(-) >> >> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> >> >> r~ > > Queued to tcg-next. There was one minor change I wanted to make to this. Do I send a v2?
On 26/6/24 06:38, Brad Smith wrote: > On 2024-06-23 6:03 p.m., Richard Henderson wrote: >> On 6/23/24 10:53, Richard Henderson wrote: >>> On 6/22/24 19:03, Brad Smith wrote: >>>> util: fix building on OpenBSD/powerpc >>>> >>>> Signed-off-by: Brad Smith<brad@comstyle.com> >>>> --- >>>> util/cpuinfo-ppc.c | 20 ++++++++++++-------- >>>> 1 file changed, 12 insertions(+), 8 deletions(-) >>> >>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> >>> >>> r~ >> >> Queued to tcg-next. > > > There was one minor change I wanted to make to this. Do I send a v2? Preferably before Richard post his pull request...
diff --git a/util/cpuinfo-ppc.c b/util/cpuinfo-ppc.c index b2d8893a06..d459c9c87e 100644 --- a/util/cpuinfo-ppc.c +++ b/util/cpuinfo-ppc.c @@ -6,11 +6,13 @@ #include "qemu/osdep.h" #include "host/cpuinfo.h" -#include <asm/cputable.h> -#ifdef CONFIG_GETAUXVAL -# include <sys/auxv.h> -#else -# include "elf.h" +#ifdef CONFIG_LINUX +# ifdef CONFIG_GETAUXVAL +# include <sys/auxv.h> +# else +# include <asm/cputable.h> +# include "elf.h" +# endif #endif unsigned cpuinfo; @@ -19,16 +21,17 @@ unsigned cpuinfo; unsigned __attribute__((constructor)) cpuinfo_init(void) { unsigned info = cpuinfo; - unsigned long hwcap, hwcap2; if (info) { return info; } - hwcap = qemu_getauxval(AT_HWCAP); - hwcap2 = qemu_getauxval(AT_HWCAP2); info = CPUINFO_ALWAYS; +#ifdef CONFIG_LINUX + unsigned long hwcap = qemu_getauxval(AT_HWCAP); + unsigned long hwcap2 = qemu_getauxval(AT_HWCAP2); + /* Version numbers are monotonic, and so imply all lower versions. */ if (hwcap2 & PPC_FEATURE2_ARCH_3_1) { info |= CPUINFO_V3_1 | CPUINFO_V3_0 | CPUINFO_V2_07 | CPUINFO_V2_06; @@ -58,6 +61,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(void) } } } +#endif cpuinfo = info; return info;
util: fix building on OpenBSD/powerpc Signed-off-by: Brad Smith <brad@comstyle.com> --- util/cpuinfo-ppc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)