|
 |
4fe0dd4 |
diff -up hdf-4.2.15/hdf/src/hdfi.h.s390 hdf-4.2.15/hdf/src/hdfi.h
|
|
|
4fe0dd4 |
--- hdf-4.2.15/hdf/src/hdfi.h.s390 2020-04-30 21:07:16.946922845 -0600
|
|
|
4fe0dd4 |
+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:07:16.950922901 -0600
|
|
|
d0def9a |
@@ -77,6 +77,7 @@
|
|
|
e8897ea |
#define DFMT_POWERPC64 0x1111
|
|
|
e8897ea |
#define DFMT_LINUXPPC 0x1111
|
|
|
e8897ea |
#define DFMT_LINUXSPARC 0x1111
|
|
|
e8897ea |
+#define DFMT_LINUX390 0x1111
|
|
|
e8897ea |
|
|
|
e8897ea |
/* I/O library constants */
|
|
|
e8897ea |
#define UNIXUNBUFIO 1
|
|
|
4fe0dd4 |
@@ -1130,6 +1131,66 @@ typedef int hdf_pint_t;
|
|
|
e8897ea |
|
|
|
e8897ea |
#endif /* Linux Sparc32/64 */
|
|
|
e8897ea |
|
|
|
e8897ea |
+/* Linux s390/s390x */
|
|
|
e8897ea |
+#if defined __s390__ || defined __s390x__
|
|
|
e8897ea |
+
|
|
|
e8897ea |
+#ifdef GOT_MACHINE
|
|
|
e8897ea |
+If you get an error on this line more than one machine type has been defined.
|
|
|
e8897ea |
+Please check your Makefile.
|
|
|
e8897ea |
+#endif
|
|
|
e8897ea |
+#define GOT_MACHINE
|
|
|
e8897ea |
+
|
|
|
e8897ea |
+#include <sys/file.h> /* for unbuffered i/o stuff */
|
|
|
e8897ea |
+#include <sys/stat.h>
|
|
|
e8897ea |
+#define DF_MT DFMT_LINUX390
|
|
|
e8897ea |
+typedef void VOID;
|
|
|
e8897ea |
+typedef void *VOIDP;
|
|
|
e8897ea |
+typedef char *_fcd;
|
|
|
e8897ea |
+typedef char char8;
|
|
|
e8897ea |
+typedef unsigned char uchar8;
|
|
|
e8897ea |
+typedef char int8;
|
|
|
e8897ea |
+typedef unsigned char uint8;
|
|
|
e8897ea |
+typedef short int int16;
|
|
|
e8897ea |
+typedef unsigned short int uint16;
|
|
|
e8897ea |
+#ifdef __s390x__ /* 64-bit environment */
|
|
|
e8897ea |
+typedef int int32;
|
|
|
e8897ea |
+typedef unsigned int uint32;
|
|
|
e8897ea |
+#else /* 32-bit environment */
|
|
|
e8897ea |
+typedef long int int32;
|
|
|
e8897ea |
+typedef unsigned long int uint32;
|
|
|
e8897ea |
+#endif
|
|
|
e8897ea |
+typedef int intn;
|
|
|
e8897ea |
+typedef unsigned int uintn;
|
|
|
e8897ea |
+typedef int intf; /* size of INTEGERs in Fortran compiler */
|
|
|
e8897ea |
+typedef float float32;
|
|
|
e8897ea |
+typedef double float64;
|
|
|
e8897ea |
+#ifdef __s390x__ /* 64-bit environment */
|
|
|
e8897ea |
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
|
|
|
e8897ea |
+#else /* 32-bit environment */
|
|
|
e8897ea |
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
|
|
|
e8897ea |
+#endif
|
|
|
e8897ea |
+#define FNAME_POST_UNDERSCORE
|
|
|
e8897ea |
+#define _fcdtocp(desc) (desc)
|
|
|
e8897ea |
+#ifdef HAVE_FMPOOL
|
|
|
e8897ea |
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
|
|
e8897ea |
+#else
|
|
|
e8897ea |
+#define FILELIB UNIXBUFIO
|
|
|
e8897ea |
+#endif
|
|
|
e8897ea |
+
|
|
|
e8897ea |
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
|
|
e8897ea |
+
|
|
|
e8897ea |
+/* Determine the memory manager we are going to use. Valid values are: */
|
|
|
e8897ea |
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
|
|
e8897ea |
+/* what each does */
|
|
|
e8897ea |
+#define JMEMSYS MEM_ANSI
|
|
|
e8897ea |
+
|
|
|
e8897ea |
+#ifdef __GNUC__
|
|
|
e8897ea |
+#define HAVE_STDC
|
|
|
e8897ea |
+#define INCLUDES_ARE_ANSI
|
|
|
e8897ea |
+#endif
|
|
|
e8897ea |
+
|
|
|
e8897ea |
+#endif /* Linux s390/s390x */
|
|
|
e8897ea |
+
|
|
|
7692aeb |
/*-----------------------------------------------------*/
|
|
|
7692aeb |
/* 64-bit Free BSD */
|
|
|
7692aeb |
|
|
|
4fe0dd4 |
diff -up hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 hdf-4.2.15/mfhdf/fortran/jackets.c.in
|
|
|
4fe0dd4 |
--- hdf-4.2.15/mfhdf/fortran/jackets.c.in.s390 2020-04-30 21:07:16.942922790 -0600
|
|
|
4fe0dd4 |
+++ hdf-4.2.15/mfhdf/fortran/jackets.c.in 2020-04-30 21:10:30.030640644 -0600
|
|
|
e8897ea |
@@ -34,7 +34,7 @@
|
|
|
e8897ea |
|
|
|
4fe0dd4 |
struct ncfils { /* This will be a common block from Fortran */
|
|
|
e8897ea |
double dd;
|
|
|
e8897ea |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
e8897ea |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
int ll;
|
|
|
e8897ea |
#else
|
|
|
e8897ea |
long ll;
|
|
|
4fe0dd4 |
@@ -65,7 +65,7 @@ struct ncfils { /* This will
|
|
|
e8897ea |
|
|
|
4fe0dd4 |
struct ncfils { /* This will be a common block from Fortran */
|
|
|
e8897ea |
double dd;
|
|
|
e8897ea |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
e8897ea |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
int ll;
|
|
|
e8897ea |
#else
|
|
|
e8897ea |
long ll;
|
|
|
d0def9a |
@@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims)
|
|
|
e8897ea |
}
|
|
|
e8897ea |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
e8897ea |
|
|
|
e8897ea |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
e8897ea |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
/*
|
|
|
e8897ea |
* Convert multi-dimensional array of NCLONGs stored in ints to packed
|
|
|
e8897ea |
* array of longs, in malloc'ed space. Returns pointer to longs or NULL
|
|
|
d0def9a |
@@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc
|
|
|
4fe0dd4 |
return;
|
|
|
4fe0dd4 |
} /* else */
|
|
|
4fe0dd4 |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
4fe0dd4 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
#ifdef HDF
|
|
|
e8897ea |
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
|
|
4fe0dd4 |
long longs = *(int *)value;
|
|
|
d0def9a |
@@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value
|
|
|
4fe0dd4 |
return;
|
|
|
4fe0dd4 |
} /* else */
|
|
|
4fe0dd4 |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
4fe0dd4 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
#ifdef HDF
|
|
|
e8897ea |
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
|
|
4fe0dd4 |
long *longs = itol (value, ncount, ndims);
|
|
|
d0def9a |
@@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri
|
|
|
4fe0dd4 |
tmpbasis = nctypelen(NC_LONG);
|
|
|
e8897ea |
else
|
|
|
e8897ea |
#endif
|
|
|
4fe0dd4 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
if (datatype == NC_LONG)
|
|
|
4fe0dd4 |
tmpbasis = sizeof(int);
|
|
|
e8897ea |
else
|
|
|
d0def9a |
@@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri
|
|
|
4fe0dd4 |
return;
|
|
|
4fe0dd4 |
} /* else */
|
|
|
4fe0dd4 |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
4fe0dd4 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
#ifdef HDF
|
|
|
e8897ea |
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
|
|
4fe0dd4 |
long *longs = itolg (value, ncount, nbasis, ndims);
|
|
|
d0def9a |
@@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc
|
|
|
4fe0dd4 |
return;
|
|
|
4fe0dd4 |
} /* else */
|
|
|
4fe0dd4 |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
e8897ea |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
e8897ea |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
#ifdef HDF
|
|
|
e8897ea |
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
|
|
4fe0dd4 |
long longs;
|
|
|
d0def9a |
@@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value
|
|
|
4fe0dd4 |
return;
|
|
|
4fe0dd4 |
} /* else */
|
|
|
4fe0dd4 |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
e8897ea |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
e8897ea |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
#ifdef HDF
|
|
|
e8897ea |
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
|
|
4fe0dd4 |
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
|
|
d0def9a |
@@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
|
|
4fe0dd4 |
tmpbasis = nctypelen(NC_LONG);
|
|
|
e8897ea |
else
|
|
|
e8897ea |
#endif
|
|
|
4fe0dd4 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
if (datatype == NC_LONG)
|
|
|
4fe0dd4 |
tmpbasis = sizeof(int);
|
|
|
e8897ea |
else
|
|
|
d0def9a |
@@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri
|
|
|
4fe0dd4 |
return;
|
|
|
4fe0dd4 |
} /* else */
|
|
|
4fe0dd4 |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
4fe0dd4 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
#ifdef HDF
|
|
|
e8897ea |
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
|
|
4fe0dd4 |
long iocount = dimprod (ncount, ndims); /* product of dimensions */
|
|
|
d0def9a |
@@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype,
|
|
|
4fe0dd4 |
return;
|
|
|
4fe0dd4 |
} /* else */
|
|
|
4fe0dd4 |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
4fe0dd4 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
#ifdef HDF
|
|
|
e8897ea |
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
|
|
4fe0dd4 |
long *longs = itol (value, attlen, 1);
|
|
|
d0def9a |
@@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco
|
|
|
4fe0dd4 |
return;
|
|
|
4fe0dd4 |
} /* else */
|
|
|
4fe0dd4 |
#endif /* FORTRAN_HAS_NO_SHORT */
|
|
|
4fe0dd4 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
#ifdef HDF
|
|
|
e8897ea |
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
|
|
|
e8897ea |
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
|
|
|
4fe0dd4 |
diff -up hdf-4.2.15/mfhdf/libsrc/array.c.s390 hdf-4.2.15/mfhdf/libsrc/array.c
|
|
|
4fe0dd4 |
diff -up hdf-4.2.15/mfhdf/libsrc/cdf.c.s390 hdf-4.2.15/mfhdf/libsrc/cdf.c
|
|
|
4fe0dd4 |
diff -up hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.15/mfhdf/libsrc/netcdf.h.in
|
|
|
4fe0dd4 |
--- hdf-4.2.15/mfhdf/libsrc/netcdf.h.in.s390 2020-04-30 21:07:16.957922998 -0600
|
|
|
4fe0dd4 |
+++ hdf-4.2.15/mfhdf/libsrc/netcdf.h.in 2020-04-30 21:15:23.731467288 -0600
|
|
|
d0def9a |
@@ -293,7 +293,7 @@ typedef double ncdouble;
|
|
|
4fe0dd4 |
/*
|
|
|
d0def9a |
* Variables/attributes of type NC_LONG should use the C type 'nclong'
|
|
|
7692aeb |
*/
|
|
|
d0def9a |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
d0def9a |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
d0def9a |
/*
|
|
|
d0def9a |
* LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types.
|
|
|
d0def9a |
* http://www.unix.org/version2/whatsnew/lp64_wp.html
|
|
|
4fe0dd4 |
diff -up hdf-4.2.15/mfhdf/libsrc/putget.c.s390 hdf-4.2.15/mfhdf/libsrc/putget.c
|
|
|
4fe0dd4 |
--- hdf-4.2.15/mfhdf/libsrc/putget.c.s390 2020-04-30 21:07:16.959923025 -0600
|
|
|
4fe0dd4 |
+++ hdf-4.2.15/mfhdf/libsrc/putget.c 2020-04-30 21:12:13.612268179 -0600
|
|
|
4fe0dd4 |
@@ -665,7 +665,7 @@ Void *values ;
|
|
|
4fe0dd4 |
case NC_SHORT :
|
|
|
4fe0dd4 |
return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ;
|
|
|
4fe0dd4 |
case NC_LONG :
|
|
|
4fe0dd4 |
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
4fe0dd4 |
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
4fe0dd4 |
return( xdr_int(xdrs, (nclong *)values) ) ;
|
|
|
e8897ea |
#else
|
|
|
4fe0dd4 |
return( xdr_long(xdrs, (nclong *)values) ) ;
|
|
|
4fe0dd4 |
diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.15/mfhdf/libsrc/xdrposix.c
|
|
|
4fe0dd4 |
--- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.s390 2020-03-03 10:40:50.000000000 -0700
|
|
|
4fe0dd4 |
+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:14:47.574557550 -0600
|
|
|
4fe0dd4 |
@@ -262,7 +262,7 @@ int nbytes;
|
|
|
e8897ea |
|
|
|
e8897ea |
static bool_t xdrposix_getlong();
|
|
|
e8897ea |
static bool_t xdrposix_putlong();
|
|
|
e8897ea |
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
e8897ea |
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
static bool_t xdrposix_getint();
|
|
|
e8897ea |
static bool_t xdrposix_putint();
|
|
|
e8897ea |
#endif
|
|
|
4fe0dd4 |
@@ -276,7 +276,7 @@ static long * xdrposix_inline();
|
|
|
e8897ea |
#if (defined __sun && defined _LP64)
|
|
|
e8897ea |
static rpc_inline_t * xdrposix_inline();
|
|
|
e8897ea |
#else
|
|
|
e8897ea |
-#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__
|
|
|
e8897ea |
+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
static int32_t * xdrposix_inline();
|
|
|
e8897ea |
#else
|
|
|
4fe0dd4 |
static netlong * xdrposix_inline();
|
|
|
4fe0dd4 |
@@ -302,9 +302,9 @@ static struct xdr_ops xdrposix_ops = {
|
|
|
e8897ea |
xdrposix_getpos, /* get offset in the stream */
|
|
|
e8897ea |
xdrposix_setpos, /* set offset in the stream */
|
|
|
e8897ea |
xdrposix_inline, /* prime stream for inline macros */
|
|
|
e8897ea |
-#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
|
|
|
e8897ea |
+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
xdrposix_destroy, /* destroy stream */
|
|
|
e8897ea |
-#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
|
|
4fe0dd4 |
+#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __s390x__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
|
|
|
e8897ea |
NULL, /* no xdr_control function defined */
|
|
|
e8897ea |
#endif
|
|
|
4fe0dd4 |
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
|
|
|
4fe0dd4 |
@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp)
|
|
|
4fe0dd4 |
long *lp;
|
|
|
e8897ea |
{
|
|
|
e8897ea |
unsigned char *up = (unsigned char *)lp ;
|
|
|
4fe0dd4 |
-#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))
|
|
|
4fe0dd4 |
+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
|
|
e8897ea |
*lp = 0 ;
|
|
|
e8897ea |
up += (sizeof(long) - 4) ;
|
|
|
e8897ea |
#endif
|
|
|
4fe0dd4 |
@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp)
|
|
|
e8897ea |
netlong mycopy = htonl(*lp);
|
|
|
e8897ea |
up = (unsigned char *)&mycopy;
|
|
|
e8897ea |
#endif
|
|
|
d0def9a |
-#if (defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))
|
|
|
d0def9a |
+#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
|
|
e8897ea |
up += (sizeof(long) - 4) ;
|
|
|
e8897ea |
#endif
|
|
|
e8897ea |
|
|
|
4fe0dd4 |
@@ -560,7 +560,7 @@ static long *
|
|
|
4fe0dd4 |
#if (defined __sun && defined _LP64)
|
|
|
4fe0dd4 |
static rpc_inline_t *
|
|
|
e8897ea |
#else
|
|
|
e8897ea |
-#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__
|
|
|
e8897ea |
+#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
|
|
|
4fe0dd4 |
static int32_t *
|
|
|
e8897ea |
#else
|
|
|
4fe0dd4 |
static netlong *
|
|
|
4fe0dd4 |
@@ -581,7 +581,7 @@ xdrposix_inline(xdrs, len)
|
|
|
e8897ea |
return (NULL);
|
|
|
e8897ea |
}
|
|
|
e8897ea |
|
|
|
e8897ea |
-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
|
|
|
e8897ea |
+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
|
|
|
e8897ea |
|
|
|
e8897ea |
static bool_t
|
|
|
e8897ea |
xdrposix_getint(xdrs, lp)
|
|
|
4fe0dd4 |
diff -up hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.15/mfhdf/ncgen/ncgen.l
|
|
|
4fe0dd4 |
--- hdf-4.2.15/mfhdf/ncgen/ncgen.l.s390 2020-04-30 21:07:16.961923053 -0600
|
|
|
4fe0dd4 |
+++ hdf-4.2.15/mfhdf/ncgen/ncgen.l 2020-04-30 21:08:10.175628593 -0600
|
|
|
4fe0dd4 |
@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float m
|
|
|
4fe0dd4 |
yyerror(errstr);
|
|
|
4fe0dd4 |
}
|
|
|
7692aeb |
|
|
|
d0def9a |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
|
|
|
d0def9a |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__
|
|
|
4fe0dd4 |
if (dd < INT_MIN || dd > INT_MAX)
|
|
|
7692aeb |
#else
|
|
|
4fe0dd4 |
if (dd < LONG_MIN || dd > LONG_MAX)
|
|
|
4fe0dd4 |
diff -up hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 hdf-4.2.15/mfhdf/ncgen/ncgenyy.c
|
|
|
4fe0dd4 |
--- hdf-4.2.15/mfhdf/ncgen/ncgenyy.c.s390 2020-04-30 21:07:16.963923081 -0600
|
|
|
4fe0dd4 |
+++ hdf-4.2.15/mfhdf/ncgen/ncgenyy.c 2020-04-30 21:08:53.818030313 -0600
|
|
|
4fe0dd4 |
@@ -991,7 +991,7 @@ YY_RULE_SETUP
|
|
|
4fe0dd4 |
yyerror(errstr);
|
|
|
4fe0dd4 |
}
|
|
 |
18459c8 |
|
|
|
18459c8 |
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
|
|
|
18459c8 |
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__
|
|
|
4fe0dd4 |
if (dd < INT_MIN || dd > INT_MAX)
|
|
|
18459c8 |
#else
|
|
|
4fe0dd4 |
if (dd < LONG_MIN || dd > LONG_MAX)
|