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]>
Signed-off-by: Chunwei Chen <[email protected]>
Closes #4048
  • Loading branch information
behlendorf committed Dec 10, 2015
1 parent 24ef51f commit a22502c
Showing 1 changed file with 27 additions and 15 deletions.
42 changes: 27 additions & 15 deletions lib/libspl/include/sys/isa_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ extern "C" {
#define _SUNOS_VTOC_16

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

#if !defined(__powerpc)
#define __powerpc
Expand All @@ -88,11 +88,13 @@ extern "C" {
#define __powerpc__
#endif

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

Expand All @@ -113,6 +115,16 @@ extern "C" {
#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 @@ -122,7 +134,7 @@ extern "C" {
#define _SUNOS_VTOC_16

/* sparc arch specific defines */
#elif defined(__sparc) || defined(__sparc__)
#elif defined(__sparc) || defined(__sparc__) || defined(__sparc64__)

#if !defined(__sparc)
#define __sparc
Expand All @@ -135,19 +147,15 @@ extern "C" {
#define _BIG_ENDIAN
#define _SUNOS_VTOC_16

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

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

#if !defined(__sparc64__)
#define __sparc64__
#endif

#define _BIG_ENDIAN
#define _SUNOS_VTOC_16

#else /* Currently x86_64, i386, arm, powerpc, and sparc are supported */
#error "Unsupported ISA type"
Expand All @@ -157,6 +165,10 @@ extern "C" {
#error "Both _ILP32 and _LP64 are defined"
#endif

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

#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
#error "Both _LITTLE_ENDIAN and _BIG_ENDIAN are defined"
#endif
Expand Down

0 comments on commit a22502c

Please sign in to comment.