/[packages]/cauldron/HDF/current/SOURCES/hdf-4.2r2-s390.patch
ViewVC logotype

Contents of /cauldron/HDF/current/SOURCES/hdf-4.2r2-s390.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 72538 - (show annotations) (download)
Wed Mar 16 13:11:09 2011 UTC (13 years, 1 month ago) by grenoya
File size: 17594 byte(s) 
imported package HDF
1 --- HDF4.2r2/hdf/src/hdfi.h.orig 2008-02-04 17:27:04.000000000 +0100
2 +++ HDF4.2r2/hdf/src/hdfi.h 2008-02-04 17:29:54.000000000 +0100
3 @@ -78,6 +78,7 @@
4 #define DFMT_POWERPC64 0x1111
5 #define DFMT_LINUXPPC 0x1111
6 #define DFMT_LINUXSPARC 0x1111
7 +#define DFMT_LINUX390 0x1111
8
9 /* I/O library constants */
10 #define UNIXUNBUFIO 1
11 @@ -1505,6 +1506,66 @@
12
13 #endif /* Linux Sparc32/64 */
14
15 +/* Linux s390/s390x */
16 +#if defined __s390__ || defined __s390x__
17 +
18 +#ifdef GOT_MACHINE
19 +If you get an error on this line more than one machine type has been defined.
20 +Please check your Makefile.
21 +#endif
22 +#define GOT_MACHINE
23 +
24 +#include <sys/file.h> /* for unbuffered i/o stuff */
25 +#include <sys/stat.h>
26 +#define DF_MT DFMT_LINUX390
27 +typedef void VOID;
28 +typedef void *VOIDP;
29 +typedef char *_fcd;
30 +typedef char char8;
31 +typedef unsigned char uchar8;
32 +typedef char int8;
33 +typedef unsigned char uint8;
34 +typedef short int int16;
35 +typedef unsigned short int uint16;
36 +#ifdef __s390x__ /* 64-bit environment */
37 +typedef int int32;
38 +typedef unsigned int uint32;
39 +#else /* 32-bit environment */
40 +typedef long int int32;
41 +typedef unsigned long int uint32;
42 +#endif
43 +typedef int intn;
44 +typedef unsigned int uintn;
45 +typedef int intf; /* size of INTEGERs in Fortran compiler */
46 +typedef float float32;
47 +typedef double float64;
48 +#ifdef __s390x__ /* 64-bit environment */
49 +typedef long hdf_pint_t; /* an integer the same size as a pointer */
50 +#else /* 32-bit environment */
51 +typedef int hdf_pint_t; /* an integer the same size as a pointer */
52 +#endif
53 +#define FNAME_POST_UNDERSCORE
54 +#define _fcdtocp(desc) (desc)
55 +#ifdef HAVE_FMPOOL
56 +#define FILELIB PAGEBUFIO /* enable page buffering */
57 +#else
58 +#define FILELIB UNIXBUFIO
59 +#endif
60 +
61 +/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
62 +
63 +/* Determine the memory manager we are going to use. Valid values are: */
64 +/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
65 +/* what each does */
66 +#define JMEMSYS MEM_ANSI
67 +
68 +#ifdef __GNUC__
69 +#define HAVE_STDC
70 +#define INCLUDES_ARE_ANSI
71 +#endif
72 +
73 +#endif /* Linux s390/s390x */
74 +
75 /*#ifndef GOT_MACHINE
76 No machine type has been defined. Your Makefile needs to have someing like
77 -DSUN or -DUNICOS in order for the HDF internal structures to be defined
78 --- HDF4.2r2/mfhdf/libsrc/netcdf.h.in.orig 2008-02-04 18:38:14.000000000 +0100
79 +++ HDF4.2r2/mfhdf/libsrc/netcdf.h.in 2008-02-04 18:39:00.000000000 +0100
80 @@ -295,7 +295,7 @@
81 */
82 #if defined _CRAYMPP
83 typedef short nclong;
84 -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
85 +#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__ || defined __s390x__
86 typedef int nclong;
87 #else
88 typedef long nclong; /* default, compatible type */
89 --- HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h.orig 2008-02-04 18:40:01.000000000 +0100
90 +++ HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h 2008-02-04 18:40:29.000000000 +0100
91 @@ -304,7 +304,7 @@
92 */
93 #if defined _CRAYMPP
94 typedef short nclong;
95 -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
96 +#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
97 typedef int nclong;
98 #else
99 typedef long nclong; /* default, compatible type */
100 --- HDF4.2r2/mfhdf/fortran/config/jackets-linux.c.orig 2008-02-04 18:42:44.000000000 +0100
101 +++ HDF4.2r2/mfhdf/fortran/config/jackets-linux.c 2008-02-04 18:44:19.000000000 +0100
102 @@ -34,7 +34,7 @@
103
104 struct ncfils { /* This will be a common block from Fortran */
105 double dd;
106 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
107 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
108 int ll;
109 #else
110 long ll;
111 @@ -65,7 +65,7 @@
112
113 struct ncfils { /* This will be a common block from Fortran */
114 double dd;
115 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
116 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
117 int ll;
118 #else
119 long ll;
120 @@ -430,7 +430,7 @@
121 }
122 #endif /* FORTRAN_HAS_NO_SHORT */
123
124 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
125 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
126 /*
127 * Convert multi-dimensional array of NCLONGs stored in ints to packed
128 * array of longs, in malloc'ed space. Returns pointer to longs or NULL
129 @@ -916,7 +916,7 @@
130 return;
131 } /* else */
132 #endif /* FORTRAN_HAS_NO_SHORT */
133 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
134 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
135 #ifdef HDF
136 if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
137 long longs = *(int *)value;
138 @@ -1030,7 +1030,7 @@
139 return;
140 } /* else */
141 #endif /* FORTRAN_HAS_NO_SHORT */
142 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
143 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
144 #ifdef HDF
145 if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
146 long *longs = itol (value, ncount, ndims);
147 @@ -1141,7 +1141,7 @@
148 tmpbasis = nctypelen(NC_LONG);
149 else
150 #endif
151 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
152 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
153 if (datatype == NC_LONG)
154 tmpbasis = sizeof(int);
155 else
156 @@ -1198,7 +1198,7 @@
157 return;
158 } /* else */
159 #endif /* FORTRAN_HAS_NO_SHORT */
160 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
161 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
162 #ifdef HDF
163 if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
164 long *longs = itolg (value, ncount, nbasis, ndims);
165 @@ -1334,7 +1334,7 @@
166 return;
167 } /* else */
168 #endif /* FORTRAN_HAS_NO_SHORT */
169 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
170 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
171 #ifdef HDF
172 if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
173 long longs;
174 @@ -1476,7 +1476,7 @@
175 return;
176 } /* else */
177 #endif /* FORTRAN_HAS_NO_SHORT */
178 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
179 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
180 #ifdef HDF
181 if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
182 long iocount = dimprod (ncount, ndims); /* product of dimensions */
183 @@ -1614,7 +1614,7 @@
184 tmpbasis = nctypelen(NC_LONG);
185 else
186 #endif
187 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
188 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
189 if (datatype == NC_LONG)
190 tmpbasis = sizeof(int);
191 else
192 @@ -1685,7 +1685,7 @@
193 return;
194 } /* else */
195 #endif /* FORTRAN_HAS_NO_SHORT */
196 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
197 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
198 #ifdef HDF
199 if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
200 long iocount = dimprod (ncount, ndims); /* product of dimensions */
201 @@ -1851,7 +1851,7 @@
202 return;
203 } /* else */
204 #endif /* FORTRAN_HAS_NO_SHORT */
205 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
206 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
207 #ifdef HDF
208 if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
209 long *longs = itol (value, attlen, 1);
210 @@ -2016,7 +2016,7 @@
211 return;
212 } /* else */
213 #endif /* FORTRAN_HAS_NO_SHORT */
214 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
215 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
216 #ifdef HDF
217 if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
218 /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
219 --- HDF4.2r2/mfhdf/ncgen/ncgen.l.orig 2008-02-04 18:45:37.000000000 +0100
220 +++ HDF4.2r2/mfhdf/ncgen/ncgen.l 2008-02-04 18:45:53.000000000 +0100
221 @@ -134,7 +134,7 @@
222 yyerror(errstr);
223 }
224
225 -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
226 +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
227 if (dd < INT_MIN || dd > INT_MAX)
228 #else
229 #if defined (_CRAYMPP)
230 --- HDF4.2r2/mfhdf/libsrc/putget.c.orig 2008-02-04 18:53:56.000000000 +0100
231 +++ HDF4.2r2/mfhdf/libsrc/putget.c 2008-02-04 18:53:13.000000000 +0100
232 @@ -594,7 +594,7 @@
233 case NC_LONG :
234 #if defined _CRAYMPP
235 return( xdr_short(xdrs, (nclong *)values) ) ;
236 -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
237 +#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
238 return( xdr_int(xdrs, (nclong *)values) ) ;
239 #else
240 return( xdr_long(xdrs, (nclong *)values) ) ;
241 @@ -1896,7 +1896,7 @@
242 case NC_LONG :
243 #if defined _CRAYMPP
244 xdr_NC_fnct = xdr_short;
245 -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
246 +#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
247 xdr_NC_fnct = xdr_int ;
248 #else
249 xdr_NC_fnct = xdr_long ;
250 --- HDF4.2r2/mfhdf/libsrc/array.c.orig 2008-02-04 18:54:30.000000000 +0100
251 +++ HDF4.2r2/mfhdf/libsrc/array.c 2008-02-04 18:54:39.000000000 +0100
252 @@ -622,7 +622,7 @@
253 case NC_LONG :
254 #if defined _CRAYMPP
255 xdr_NC_fnct = xdr_short;
256 -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
257 +#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
258 xdr_NC_fnct = xdr_int ;
259 #else
260 xdr_NC_fnct = xdr_long ;
261 --- HDF4.2r2/mfhdf/libsrc/cdf.c.orig 2008-02-04 18:55:23.000000000 +0100
262 +++ HDF4.2r2/mfhdf/libsrc/cdf.c 2008-02-04 18:55:38.000000000 +0100
263 @@ -3664,7 +3664,7 @@
264 alen /= 4 ;
265 #if defined _CRAYMPP
266 xdr_NC_fnct = xdr_short;
267 -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
268 +#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
269 xdr_NC_fnct = xdr_int ;
270 #else
271 xdr_NC_fnct = xdr_long ;
272 --- HDF4.2r2/mfhdf/libsrc/xdrposix.c.orig 2008-02-04 18:56:24.000000000 +0100
273 +++ HDF4.2r2/mfhdf/libsrc/xdrposix.c 2008-02-04 18:58:43.000000000 +0100
274 @@ -284,7 +284,7 @@
275
276 static bool_t xdrposix_getlong();
277 static bool_t xdrposix_putlong();
278 -#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
279 +#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
280 static bool_t xdrposix_getint();
281 static bool_t xdrposix_putint();
282 #endif
283 @@ -301,7 +301,7 @@
284 #if (defined __sun && defined _LP64)
285 static rpc_inline_t * xdrposix_inline();
286 #else
287 -#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__
288 +#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
289 static int32_t * xdrposix_inline();
290 #else
291 #if (defined __alpha )
292 @@ -332,9 +332,9 @@
293 xdrposix_getpos, /* get offset in the stream */
294 xdrposix_setpos, /* set offset in the stream */
295 xdrposix_inline, /* prime stream for inline macros */
296 -#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
297 +#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
298 xdrposix_destroy, /* destroy stream */
299 -#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
300 +#if !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
301 NULL, /* no xdr_control function defined */
302 #endif
303 /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
304 @@ -469,7 +469,7 @@
305 #endif
306 {
307 unsigned char *up = (unsigned char *)lp ;
308 -#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))
309 +#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
310 *lp = 0 ;
311 up += (sizeof(long) - 4) ;
312 #endif
313 @@ -496,7 +496,7 @@
314 netlong mycopy = htonl(*lp);
315 up = (unsigned char *)&mycopy;
316 #endif
317 -#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))
318 +#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
319 up += (sizeof(long) - 4) ;
320 #endif
321
322 @@ -593,7 +593,7 @@
323 #if (defined __alpha)
324 static int*
325 #else
326 -#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__
327 +#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
328 static int32_t *
329 #else
330 static netlong *
331 @@ -622,7 +622,7 @@
332 return (NULL);
333 }
334
335 -#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
336 +#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
337
338 static bool_t
339 xdrposix_getint(xdrs, lp)
  ViewVC Help
Powered by ViewVC 1.1.30