sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

emulators/qemu-devel: fix build on powerpc64* with a patch from emulators/qemu

Browse source
This commit is contained in:
Piotr Kubaj 2024-04-18 10:58:22 +02:00
parent e1926322c7
commit abf68fe4a2
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c
View file

@ -1,21 +1,34 @@
--- util/cpuinfo-ppc.c.orig 2024-01-26 18:16:35 UTC --- util/cpuinfo-ppc.c.orig 2024-01-29 19:13:22 UTC
+++ util/cpuinfo-ppc.c +++ util/cpuinfo-ppc.c
@@ -6,11 +6,17 @@ @@ -6,13 +6,21 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "host/cpuinfo.h" #include "host/cpuinfo.h"
-#include <asm/cputable.h> -#include <asm/cputable.h>
#ifdef CONFIG_GETAUXVAL #ifdef CONFIG_GETAUXVAL
# include <sys/auxv.h> # include <sys/auxv.h>
#else
+# ifdef __linux__ +# ifdef __linux__
+# include <asm/cputable.h> +# include <asm/cputable.h>
+# elif defined(__FreeBSD__)
+# include <machine/cpu.h>
+# endif +# endif
#else
# include "elf.h" # include "elf.h"
+#endif
+
+#ifndef PPC_FEATURE2_ARCH_3_1
+# define PPC_FEATURE2_ARCH_3_1 0x00040000
#endif #endif
+#ifndef PPC_FEATURE2_ARCH_3_1
+# define PPC_FEATURE2_ARCH_3_1 0x00040000
+#endif
+
unsigned cpuinfo; unsigned cpuinfo;
/* Called both as constructor and (possibly) via other constructors. */
@@ -53,7 +61,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(voi
* always have both anyway, since VSX came with Power7
* and crypto came with Power8.
*/
- if (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) {
+ if (hwcap2 & PPC_FEATURE2_HAS_VEC_CRYPTO) {
info |= CPUINFO_CRYPTO;
}
}