diff options
| author | Dimitri John Ledkov <[email protected]> | 2016-03-16 21:53:20 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-03-17 09:58:01 -0700 |
| commit | a1bc34c0a7929130577e4c9dd418845674dd35c3 (patch) | |
| tree | 90124d2e46e88322eb7e7c4c2e843bc99352caad | |
| parent | 99d0a9c39ea655fe4545bee31235cd91f2908763 (diff) | |
Add support for s390[x].
Signed-off-by: Dimitri John Ledkov <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4425
| -rw-r--r-- | lib/libefi/rdwr_efi.c | 2 | ||||
| -rw-r--r-- | lib/libspl/include/sys/isa_defs.h | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c index 6995463cf..a914c0df0 100644 --- 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 60c6a3bf9..61f4cd96a 100644 --- 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 |