d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: fix powerpc build broken in c7046f76c2

Browse Source 
The breakage was introduced in OpenZFS commit 48cf170d5.
When a (different) fix solving this issue gets upstreamed
it will replace the current fix in the next merge from OpenZFS.
This commit is contained in:
Martin Matuska 2022-09-22 11:59:31 +02:00
parent 12aeeb9190
commit 1761afc50a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h
View File

@ -53,7 +53,7 @@
#include <sys/cdefs.h>
#include <machine/pcb.h>
#include <powerpc/cpu.h>
#include <machine/cpu.h>
#define kfpu_allowed() 1
#define kfpu_initialize(tsk) do {} while (0)
@ -88,3 +88,4 @@ zfs_isa207_available(void)
{
return ((cpu_features2 & PPC_FEATURE2_ARCH_2_07) != 0);
}
#endif

5
sys/contrib/openzfs/lib/libspl/include/sys/simd.h
View File

@ -453,12 +453,12 @@ zfs_avx512vbmi_available(void)
#elif defined(__powerpc__)
/* including <sys/auxv.h> clashes with AT_UID and others */
extern unsigned long getauxval(unsigned long type);
#if defined(__FreeBSD__)
#define AT_HWCAP 25 /* CPU feature flags. */
#define AT_HWCAP2 26 /* CPU feature flags 2. */
extern int elf_aux_info(int aux, void *buf, int buflen);
static unsigned long getauxval(unsigned long key)
static inline unsigned long
getauxval(unsigned long key)
{
unsigned long val = 0UL;
@ -470,6 +470,7 @@ static unsigned long getauxval(unsigned long key)
#elif defined(__linux__)
#define AT_HWCAP 16 /* CPU feature flags. */
#define AT_HWCAP2 26 /* CPU feature flags 2. */
extern unsigned long getauxval(unsigned long type);
#endif
#define kfpu_allowed() 1