c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prefix zfs internal endian checks with _ZFS

Browse Source 
FreeBSD defines _BIG_ENDIAN BIG_ENDIAN _LITTLE_ENDIAN
LITTLE_ENDIAN on every architecture. Trying to do
cross builds whilst hiding this from ZFS has proven
extremely cumbersome.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #10621
This commit is contained in:
Matthew Macy
2020-07-28 13:02:49 -07:00
committed by GitHub
parent 3eabed74c0
commit 5678d3f593
23 changed files with 99 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/os/linux/spl/sys/byteorder.h
+10 -1
View File
@@ -26,6 +26,15 @@
#define _SPL_BYTEORDER_H
#include <asm/byteorder.h>
#if defined(__BIG_ENDIAN) && !defined(_ZFS_BIG_ENDIAN)
#define _ZFS_BIG_ENDIAN
#endif
#if defined(__LITTLE_ENDIAN) && !defined(_ZFS_LITTLE_ENDIAN)
#define _ZFS_LITTLE_ENDIAN
#endif
#include <sys/isa_defs.h>
#define BSWAP_8(x) ((x) & 0xff)
@@ -49,7 +58,7 @@
#define BE_IN32(xa) \
(((uint32_t)BE_IN16(xa) << 16) | BE_IN16((uint8_t *)(xa)+2))
#ifdef _BIG_ENDIAN
#ifdef _ZFS_BIG_ENDIAN
static __inline__ uint64_t
htonll(uint64_t n)
{
include/os/linux/spl/sys/isa_defs.h
+11 -19
View File
@@ -117,9 +117,9 @@
#endif
#if defined(__ARMEL__) || defined(__AARCH64EL__)
#define _LITTLE_ENDIAN
#define _ZFS_LITTLE_ENDIAN
#else
#define _BIG_ENDIAN
#define _ZFS_BIG_ENDIAN
#endif
/*
@@ -149,7 +149,7 @@
#endif
#endif
#define _BIG_ENDIAN
#define _ZFS_BIG_ENDIAN
#define _SUNOS_VTOC_16
#define _ALIGNMENT_REQUIRED 1
@@ -165,7 +165,7 @@
#endif
#endif
#define _BIG_ENDIAN
#define _ZFS_BIG_ENDIAN
/*
* Illumos doesn't define _ALIGNMENT_REQUIRED for s390, so default to 1
@@ -177,9 +177,9 @@
#elif defined(__mips__)
#if defined(__MIPSEB__)
#define _BIG_ENDIAN
#define _ZFS_BIG_ENDIAN
#elif defined(__MIPSEL__)
#define _LITTLE_ENDIAN
#define _ZFS_LITTLE_ENDIAN
#else
#error MIPS no endian specified
#endif
@@ -211,7 +211,7 @@
#define __rv64g__
#endif
#define _LITTLE_ENDIAN
#define _ZFS_LITTLE_ENDIAN
#define _SUNOS_VTOC_16
@@ -243,20 +243,12 @@
#define HAVE_EFFICIENT_UNALIGNED_ACCESS
#endif
#if defined(__LITTLE_ENDIAN) && !defined(_LITTLE_ENDIAN)
#define _LITTLE_ENDIAN __LITTLE_ENDIAN
#if defined(_ZFS_LITTLE_ENDIAN) && defined(_ZFS_BIG_ENDIAN)
#error "Both _ZFS_LITTLE_ENDIAN and _ZFS_BIG_ENDIAN are defined"
#endif
#if defined(__BIG_ENDIAN) && !defined(_BIG_ENDIAN)
#define _BIG_ENDIAN __BIG_ENDIAN
#endif
#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
#error "Both _LITTLE_ENDIAN and _BIG_ENDIAN are defined"
#endif
#if !defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
#error "Neither _LITTLE_ENDIAN or _BIG_ENDIAN are defined"
#if !defined(_ZFS_LITTLE_ENDIAN) && !defined(_ZFS_BIG_ENDIAN)
#error "Neither _ZFS_LITTLE_ENDIAN or _ZFS_BIG_ENDIAN are defined"
#endif
#endif /* _SPL_ISA_DEFS_H */