diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/simd.h b/sys/contrib/openzfs/lib/libspl/include/sys/simd.h index a106967d0725..41f9df506468 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/simd.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/simd.h @@ -551,7 +551,7 @@ zfs_sha512_available(void) #elif defined(__powerpc__) -#define kfpu_allowed() 1 +#define kfpu_allowed() 0 #define kfpu_initialize(tsk) do {} while (0) #define kfpu_begin() do {} while (0) #define kfpu_end() do {} while (0) diff --git a/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-p8.S b/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-p8.S index 6bbfe23b6e15..d169d15cab63 100644 --- a/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-p8.S +++ b/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-p8.S @@ -19,7 +19,7 @@ * - modified assembly to fit into OpenZFS */ -#if (defined(__PPC64__) && defined(__BIG_ENDIAN__)) +#if (defined(__PPC64__) && (!defined(_CALL_ELF) || _CALL_ELF == 1)) .text @@ -759,7 +759,7 @@ zfs_sha256_power8: .long 0x00010203,0x04050607,0x10111213,0x10111213 .long 0x00010203,0x04050607,0x08090a0b,0x10111213 -#elif (defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) +#elif (defined(__PPC64__)) .abiversion 2 .text diff --git a/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S b/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S index 2219e313c9c6..0453e9c690b5 100644 --- a/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S +++ b/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S @@ -19,7 +19,7 @@ * - modified assembly to fit into OpenZFS */ -#if (defined(__PPC64__) && defined(__BIG_ENDIAN__)) +#if (defined(__PPC64__) && (!defined(_CALL_ELF) || _CALL_ELF == 1)) .text @@ -1342,7 +1342,7 @@ zfs_sha256_ppc: .long 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208 .long 0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2 -#elif (defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) +#elif (defined(__PPC64__)) .abiversion 2 .text diff --git a/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-p8.S b/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-p8.S index 39a90ede3dc5..a92b6f6f2343 100644 --- a/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-p8.S +++ b/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-p8.S @@ -19,7 +19,7 @@ * - modified assembly to fit into OpenZFS */ -#if (defined(__PPC64__) && defined(__BIG_ENDIAN__)) +#if (defined(__PPC64__) && (!defined(_CALL_ELF) || _CALL_ELF == 1)) .text @@ -857,7 +857,7 @@ zfs_sha512_power8: .long 0x00010203,0x04050607 .long 0x10111213,0x14151617 -#elif (defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) +#elif (defined(__PPC64__)) .abiversion 2 .text diff --git a/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S b/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S index 37070115c3ff..1f83d156db82 100644 --- a/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S +++ b/sys/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S @@ -19,7 +19,7 @@ * - modified assembly to fit into OpenZFS */ -#if (defined(__PPC64__) && defined(__BIG_ENDIAN__)) +#if (defined(__PPC64__) && (!defined(_CALL_ELF) || _CALL_ELF == 1)) .text @@ -1444,7 +1444,7 @@ zfs_sha512_ppc: .long 0x5fcb6fab,0x3ad6faec .long 0x6c44198c,0x4a475817 -#elif (defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) +#elif (defined(__PPC64__)) .abiversion 2 .text