Add support for s390[x].

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4425

diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 6995463cf757feb877af807bee60caddf83e761a..a914c0df08fd8b2995d63b4e578951d77cee63f6 100644 (file)
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -154,7 +154,7 @@ struct dk_map2  default_vtoc_map[NDKMAP] = {
 #if defined(_SUNOS_VTOC_16)
 
 #if defined(i386) || defined(__amd64) || defined(__arm) || \
-    defined(__powerpc) || defined(__sparc)
+    defined(__powerpc) || defined(__sparc) || defined(__s390__)
        {       V_BOOT,         V_UNMNT },              /* i - 8 */
        {       V_ALTSCTR,      0       },              /* j - 9 */
 

diff --git a/lib/libspl/include/sys/isa_defs.h b/lib/libspl/include/sys/isa_defs.h
index 60c6a3bf96e906246a8c070cf0c3db39bf4e3c36..61f4cd96a93d0476da4f1a336d8de9a62f9ff309 100644 (file)
--- a/lib/libspl/include/sys/isa_defs.h
+++ b/lib/libspl/include/sys/isa_defs.h
@@ -157,7 +157,22 @@ extern "C" {
 #endif
 #endif
 
-#else /* Currently x86_64, i386, arm, powerpc, and sparc are supported */
+/* s390 arch specific defines */
+#elif defined(__s390__)
+#if defined(__s390x__)
+#if !defined(_LP64)
+#define        _LP64
+#endif
+#else
+#if !defined(_ILP32)
+#define        _ILP32
+#endif
+#endif
+
+#define        _BIG_ENDIAN
+#define        _SUNOS_VTOC_16
+
+#else /* Currently x86_64, i386, arm, powerpc, s390, and sparc are supported */
 #error "Unsupported ISA type"
 #endif