Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Either _ILP32 or _LP64 must be defined 

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 <behlendorf1@llnl.gov>
Signed-off-by: Chunwei Chen <tuxoko@gmail.com>
Closes #4048
This commit is contained in:
Brian Behlendorf 2015-12-09 14:58:29 -08:00 committed by Ned Bass
parent cb98d1ef27
commit a0b4635fb0
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/libspl/include/sys/isa_defs.h
View File

@ -78,7 +78,7 @@ extern "C" {
#define _SUNOS_VTOC_16 #define _SUNOS_VTOC_16
/* powerpc arch specific defines */ /* powerpc arch specific defines */
#elif defined(__powerpc) || defined(__powerpc__) #elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__)
#if !defined(__powerpc) #if !defined(__powerpc)
#define __powerpc #define __powerpc
@ -88,11 +88,13 @@ extern "C" {
#define __powerpc__ #define __powerpc__
#endif #endif
#if defined(__powerpc64__)
#if !defined(_LP64) #if !defined(_LP64)
#ifdef __powerpc64__
#define _LP64 #define _LP64
#endif
#else #else
#define _LP32 #if !defined(_ILP32)
#define _ILP32
#endif #endif
#endif #endif
@ -113,6 +115,16 @@ extern "C" {
#define __arm__ #define __arm__
#endif #endif
#if defined(__aarch64__)
#if !defined(_LP64)
#define _LP64
#endif
#else
#if !defined(_ILP32)
#define _ILP32
#endif
#endif
#if defined(__ARMEL__) || defined(__AARCH64EL__) #if defined(__ARMEL__) || defined(__AARCH64EL__)
#define _LITTLE_ENDIAN #define _LITTLE_ENDIAN
#else #else
@ -122,7 +134,7 @@ extern "C" {
#define _SUNOS_VTOC_16 #define _SUNOS_VTOC_16
/* sparc arch specific defines */ /* sparc arch specific defines */
#elif defined(__sparc) || defined(__sparc__) #elif defined(__sparc) || defined(__sparc__) || defined(__sparc64__)
#if !defined(__sparc) #if !defined(__sparc)
#define __sparc #define __sparc
@ -135,19 +147,15 @@ extern "C" {
#define _BIG_ENDIAN #define _BIG_ENDIAN
#define _SUNOS_VTOC_16 #define _SUNOS_VTOC_16
/* sparc64 arch specific defines */ #if defined(__sparc64__)
#elif defined(__sparc64) || defined(__sparc64__) #if !defined(_LP64)
#define _LP64
#if !defined(__sparc64) #endif
#define __sparc64 #else
#if !defined(_ILP32)
#define _ILP32
#endif #endif
#if !defined(__sparc64__)
#define __sparc64__
#endif #endif
#define _BIG_ENDIAN
#define _SUNOS_VTOC_16
#else /* Currently x86_64, i386, arm, powerpc, and sparc are supported */ #else /* Currently x86_64, i386, arm, powerpc, and sparc are supported */
#error "Unsupported ISA type" #error "Unsupported ISA type"
@ -157,6 +165,10 @@ extern "C" {
#error "Both _ILP32 and _LP64 are defined" #error "Both _ILP32 and _LP64 are defined"
#endif #endif
#if !defined(_ILP32) && !defined(_LP64)
#error "Neither _ILP32 or _LP64 are defined"
#endif
#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) #if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
#error "Both _LITTLE_ENDIAN and _BIG_ENDIAN are defined" #error "Both _LITTLE_ENDIAN and _BIG_ENDIAN are defined"
#endif #endif