[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/7] util/cpuinfo-ppc: Fix building on OpenBSD
From: |
Richard Henderson |
Subject: |
[PULL 1/7] util/cpuinfo-ppc: Fix building on OpenBSD |
Date: |
Wed, 3 Jul 2024 10:42:20 -0700 |
From: Brad Smith <brad@comstyle.com>
OpenBSD does not support AT_HWCAP.
Signed-off-by: Brad Smith <brad@comstyle.com>
Message-Id: <ZnzM1T6Vo1Q0yAH-@humpty.home.comstyle.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
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.34.1
- [PULL 0/7] tcg patch queue, Richard Henderson, 2024/07/03
- [PULL 2/7] util/cpuinfo-ppc: Add FreeBSD support, Richard Henderson, 2024/07/03
- [PULL 4/7] util/cpuinfo-riscv: Support host/cpuinfo.h for riscv, Richard Henderson, 2024/07/03
- [PULL 5/7] util/cpuinfo-riscv: Support OpenBSD signal frame, Richard Henderson, 2024/07/03
- [PULL 1/7] util/cpuinfo-ppc: Fix building on OpenBSD,
Richard Henderson <=
- [PULL 6/7] util/cpuinfo-riscv: Use linux __riscv_hwprobe syscall, Richard Henderson, 2024/07/03
- [PULL 3/7] util/cpuinfo-aarch64: Add OpenBSD support, Richard Henderson, 2024/07/03
- [PULL 7/7] tcg/optimize: Fix TCG_COND_TST* simplification of setcond2, Richard Henderson, 2024/07/03
- Re: [PULL 0/7] tcg patch queue, Richard Henderson, 2024/07/03