Christian Goll
f5645d586f
- Update to version 1.10.5: * https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5-RELEASE.txt - Bump fortran library soname, sonum_F from 100 to 102. - Adjust library installation path, use %hpc_prefix/lib64 in x86_64 and %hpc_libdir in all other cases - Patches refreshed: * hdf5-LD_LIBRARY_PATH.patch * hdf5-1.8.11-abort_unknown_host_config.patch * PPC64LE-Fix-long-double-handling.patch * hdf5-Remove-timestamps-from-binaries.patch * Disable-phdf5-tests.patch - Patch disabled, upstream have changed the file that was being patched, while it could be ported, it's unknown if this patch is still needed. * hdf5-mpi.patch - Patch removed, merged upstream * 0001-Fix-return-value-in-test_libver_bounds_open.patch OBS-URL: https://build.opensuse.org/request/show/726430 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=111
92 lines
4.0 KiB
Diff
92 lines
4.0 KiB
Diff
From: Egbert Eich <eich@suse.com>
|
|
Date: Tue Nov 7 14:16:53 2017 +0100
|
|
Subject: [PATCH]PPC64LE: Fix long double handling
|
|
Git-commit: ad6559a71b7ba3cacb4b56d4747db63f28a12f55
|
|
References:
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
|
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
|
---
|
|
hdf5-1.10.1/config/cmake/ConversionTests.c | 16 ++++++++++++++++
|
|
hdf5-1.10.1/test/dt_arith.c | 26 ++++++++++++++++++++++++--
|
|
2 files changed, 40 insertions(+), 2 deletions(-)
|
|
|
|
Index: hdf5-1.10.5/config/cmake/ConversionTests.c
|
|
===================================================================
|
|
--- hdf5-1.10.5.orig/config/cmake/ConversionTests.c
|
|
+++ hdf5-1.10.5/config/cmake/ConversionTests.c
|
|
@@ -34,6 +34,14 @@ int HDF_NO_UBSAN main(void)
|
|
unsigned char s2[8];
|
|
int ret = 1;
|
|
|
|
+#if defined __powerpc64__ && defined _LITTLE_ENDIAN
|
|
+ /* Don't bother checking on ppc64le, we know it'll work, and
|
|
+ that what hdf5 calls 'special algorithm' simply is
|
|
+ IBM ldouble 128 (i.e. two seperately scaled doubles).
|
|
+ The check below assumes big endian. */
|
|
+ ret = 0;
|
|
+#endif
|
|
+
|
|
if(sizeof(long double) == 16 && sizeof(long) == 8) {
|
|
/*make sure the long double type has 16 bytes in size and
|
|
* 11 bits of exponent. If it is,
|
|
@@ -157,6 +165,14 @@ int HDF_NO_UBSAN main(void)
|
|
unsigned char s[16];
|
|
int ret = 0;
|
|
|
|
+#if defined __powerpc64__ && defined _LITTLE_ENDIAN
|
|
+ /* Don't bother checking on ppc64le, we know it'll work, and
|
|
+ that what hdf5 calls 'special algorithm' simply is
|
|
+ IBM ldouble 128 (i.e. two seperately scaled doubles).
|
|
+ The check below assumes big endian. */
|
|
+ ret = 0;
|
|
+#endif
|
|
+
|
|
if(sizeof(long double) == 16) {
|
|
/*make sure the long double type is the same as the failing type
|
|
*which has 16 bytes in size and 11 bits of exponent. If it is,
|
|
Index: hdf5-1.10.5/test/dt_arith.c
|
|
===================================================================
|
|
--- hdf5-1.10.5.orig/test/dt_arith.c
|
|
+++ hdf5-1.10.5/test/dt_arith.c
|
|
@@ -3051,7 +3051,18 @@ test_conv_flt_1 (const char *name, int r
|
|
buf, saved, nelmts);
|
|
#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
|
|
} else if(src_type == FLT_LDOUBLE) {
|
|
- INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size,
|
|
+ size_t mant_dig = LDBL_MANT_DIG;
|
|
+ if (mant_dig >= src_nbits) {
|
|
+ /* This happens for IBM long double in little endian.
|
|
+ The macro LDBL_MANT_DIG says 106 mantissa bits, but the
|
|
+ HDF5 detection code actually represents it as a normal 64bit
|
|
+ double (52 bit mantissa) with the upper double being
|
|
+ unspec bits (which is sort of okay as the testsuite
|
|
+ wouldn't deal with that format correctly anyway). So
|
|
+ override the mantissa size. */
|
|
+ mant_dig = 52;
|
|
+ }
|
|
+ INIT_FP_SPECIAL(src_size, src_nbits, sendian, mant_dig, dst_size,
|
|
buf, saved, nelmts);
|
|
#endif
|
|
} else
|
|
@@ -3711,7 +3722,18 @@ test_conv_int_fp(const char *name, int r
|
|
INIT_FP_DENORM(long double, LDBL_MANT_DIG, src_size, src_nbits, sendian, dst_size,
|
|
buf, saved, nelmts);
|
|
} else {
|
|
- INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size, buf, saved, nelmts);
|
|
+ size_t mant_dig = LDBL_MANT_DIG;
|
|
+ if (mant_dig >= src_nbits) {
|
|
+ /* This happens for IBM long double in little endian.
|
|
+ The macro LDBL_MANT_DIG says 106 mantissa bits, but the
|
|
+ HDF5 detection code actually represents it as a normal 64bit
|
|
+ double (52 bit mantissa) with the upper double being
|
|
+ unspec bits (which is sort of okay as the testsuite
|
|
+ wouldn't deal with that format correctly anyway). So
|
|
+ override the mantissa size. */
|
|
+ mant_dig = 52;
|
|
+ }
|
|
+ INIT_FP_SPECIAL(src_size, src_nbits, sendian, mant_dig, dst_size, buf, saved, nelmts);
|
|
}
|
|
#endif
|
|
} else
|