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

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
This commit is contained in:
Dimitri John Ledkov 2016-03-16 21:53:20 +00:00 committed by Brian Behlendorf
parent 99d0a9c39e
commit a1bc34c0a7
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libefi/rdwr_efi.c
View File

@ -154,7 +154,7 @@ struct dk_map2 default_vtoc_map[NDKMAP] = {
#if defined(_SUNOS_VTOC_16) #if defined(_SUNOS_VTOC_16)
#if defined(i386) || defined(__amd64) || defined(__arm) || \ #if defined(i386) || defined(__amd64) || defined(__arm) || \
defined(__powerpc) || defined(__sparc) defined(__powerpc) || defined(__sparc) || defined(__s390__)
{ V_BOOT, V_UNMNT }, /* i - 8 */ { V_BOOT, V_UNMNT }, /* i - 8 */
{ V_ALTSCTR, 0 }, /* j - 9 */ { V_ALTSCTR, 0 }, /* j - 9 */

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

@ -157,7 +157,22 @@ extern "C" {
#endif #endif
#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" #error "Unsupported ISA type"
#endif #endif