Skip to content

Commit

Permalink
Either _ILP32 or _LP64 must be defined
Browse files Browse the repository at this point in the history
For some arm, powerpc, and sparc platforms it was possible that
neither _ILP32 of _LP64 would be defined.  Update the isa_defs.h
header to explicitly set these macros and generate a compile error
in the case neither are defined.

Signed-off-by: Brian Behlendorf <[email protected]>
Issue openzfs/zfs#4048
  • Loading branch information
behlendorf committed Dec 9, 2015
1 parent c5a8b1e commit 625a421
Showing 1 changed file with 31 additions and 11 deletions.
42 changes: 31 additions & 11 deletions include/sys/isa_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#endif

/* powerpc (ppc64) arch specific defines */
#elif defined(__powerpc) || defined(__powerpc__)
#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__)

#if !defined(__powerpc)
#define __powerpc
Expand All @@ -70,9 +70,15 @@
#define __powerpc__
#endif

#if defined(__powerpc64__)
#if !defined(_LP64)
#define _LP64
#endif
#else
#if !defined(_ILP32)
#define _ILP32
#endif
#endif

/* arm arch specific defines */
#elif defined(__arm) || defined(__arm__) || defined(__aarch64__)
Expand All @@ -85,6 +91,16 @@
#define __arm__
#endif

#if defined(__aarch64__)
#if !defined(_LP64)
#define _LP64
#endif
#else
#if !defined(_ILP32)
#define _ILP32
#endif
#endif

#if defined(__ARMEL__) || defined(__AARCH64EL__)
#define _LITTLE_ENDIAN
#else
Expand All @@ -102,18 +118,18 @@
#define __sparc__
#endif

#define _BIG_ENDIAN
#define _SUNOS_VTOC_16

/* sparc64 arch specific defines */
#elif defined(__sparc64) || defined(__sparc64__)

#if !defined(__sparc64)
#define __sparc64
#if !defined(_ILP32)
#define _ILP32
#endif

#if !defined(__sparc64__)
#define __sparc64__
#if defined(__arch64__)
#if !defined(_LP64)
#define _LP64
#endif
#else
#if !defined(_ILP32)
#define _ILP32
#endif
#endif

#define _BIG_ENDIAN
Expand All @@ -127,6 +143,10 @@
#error "Both _ILP32 and _LP64 are defined"
#endif

#if !defined(_ILP32) && !defined(_LP64)
#error "Neither _ILP32 and _LP64 are defined"
#endif

#include <sys/byteorder.h>

#if defined(__LITTLE_ENDIAN) && !defined(_LITTLE_ENDIAN)
Expand Down

0 comments on commit 625a421

Please sign in to comment.