[v2] util: fix building on OpenBSD/powerpc

[PATCH v2] util: fix building on OpenBSD/powerpc

Brad Smith posted 1 patch 5 months ago

Diff against v1
Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/ZnzM1T6Vo1Q0yAH-@humpty.home.comstyle.com

Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Brad Smith <brad@comstyle.com>

util/cpuinfo-ppc.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)

Expand all Fold all

[PATCH v2] util: fix building on OpenBSD/powerpc

Posted by Brad Smith 5 months ago

util: fix building on OpenBSD/powerpc

Signed-off-by: Brad Smith <brad@comstyle.com>
---
v2: Keep headers in the same order as they originally were.

 util/cpuinfo-ppc.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/util/cpuinfo-ppc.c b/util/cpuinfo-ppc.c
index b2d8893a06..47af55aa0c 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
+# include <asm/cputable.h>
+# ifdef CONFIG_GETAUXVAL
+#  include <sys/auxv.h>
+# else
+#  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;
-- 
2.45.2

Re: [PATCH v2] util: fix building on OpenBSD/powerpc

Posted by Richard Henderson 5 months ago

On 6/26/24 19:22, Brad Smith wrote:
> util: fix building on OpenBSD/powerpc
> 
> Signed-off-by: Brad Smith <brad@comstyle.com>
> ---
> v2: Keep headers in the same order as they originally were.
> 
>   util/cpuinfo-ppc.c | 20 ++++++++++++--------
>   1 file changed, 12 insertions(+), 8 deletions(-)

Queued, replacing v1.

r~