Imported Upstream version 0.6.5.4

[mirror_spl-debian.git] / include / sys / isa_defs.h

diff --git a/include/sys/isa_defs.h b/include/sys/isa_defs.h
index aa5ae43c2683224e2bd912cbd5a449038e42a07f..7e15b93211444e99a4fcee54592cbb17394716ef 100644 (file)
--- a/include/sys/isa_defs.h
+++ b/include/sys/isa_defs.h
@@ -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
@@ -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__)
@@ -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
@@ -102,18 +118,14 @@
 #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(__arch64__)
+#if !defined(_LP64)
+#define _LP64
+#endif
+#else
+#if !defined(_ILP32)
+#define _ILP32
 #endif
-
-#if !defined(__sparc64__)
-#define __sparc64__
 #endif
 
 #define _BIG_ENDIAN
@@ -127,6 +139,10 @@
 #error "Both _ILP32 and _LP64 are defined"
 #endif
 
+#if !defined(_ILP32) && !defined(_LP64)
+#error "Neither _ILP32 or _LP64 are defined"
+#endif
+
 #include <sys/byteorder.h>
 
 #if defined(__LITTLE_ENDIAN) && !defined(_LITTLE_ENDIAN)