[oe-commits] [meta-openembedded] 02/02: hdf5: support 32-bit target
git at git.openembedded.org
git at git.openembedded.org
Wed Mar 6 16:56:54 UTC 2019
This is an automated email from the git hooks/post-receive script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit 712410ee7ffb59805a815f34725e271f22d1a6be
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Wed Mar 6 02:14:25 2019 -0500
hdf5: support 32-bit target
Add pre-generated 32-bit H5Tinit.c to support 32-bit target
Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
---
.../hdf5/files/{H5Tinit.c => H5Tinit-32.c} | 72 +++++++++-------------
.../hdf5/files/{H5Tinit.c => H5Tinit-64.c} | 0
meta-oe/recipes-support/hdf5/hdf5_1.8.19.bb | 7 ++-
3 files changed, 32 insertions(+), 47 deletions(-)
diff --git a/meta-oe/recipes-support/hdf5/files/H5Tinit.c b/meta-oe/recipes-support/hdf5/files/H5Tinit-32.c
old mode 100644
new mode 100755
similarity index 95%
copy from meta-oe/recipes-support/hdf5/files/H5Tinit.c
copy to meta-oe/recipes-support/hdf5/files/H5Tinit-32.c
index 85f79a6..8057a7a
--- a/meta-oe/recipes-support/hdf5/files/H5Tinit.c
+++ b/meta-oe/recipes-support/hdf5/files/H5Tinit-32.c
@@ -15,8 +15,8 @@
* help at hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Created: Jan 29, 2019
- * root <root at qemux86-64>
+ * Created: Mar 5, 2019
+ * root <root at qemuarm>
*
* Purpose: This machine-generated source code contains
* information about the various integer and
@@ -268,8 +268,6 @@ H5TN_init_interface(void)
H5T_NATIVE_UINT_ALIGN_g = 1;
/*
- * 7 6 5 4
- * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* 3 2 1 0
* IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* Alignment: none
@@ -278,21 +276,19 @@ H5TN_init_interface(void)
HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
dt->shared->state = H5T_STATE_IMMUTABLE;
dt->shared->type = H5T_INTEGER;
- dt->shared->size = 8;
+ dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE;
dt->shared->u.atomic.offset = 0;
- dt->shared->u.atomic.prec = 64;
+ dt->shared->u.atomic.prec = 32;
dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
if((H5T_NATIVE_LONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
H5T_NATIVE_LONG_ALIGN_g = 1;
- H5T_NATIVE_LONG_COMP_ALIGN_g = 8;
+ H5T_NATIVE_LONG_COMP_ALIGN_g = 4;
/*
- * 7 6 5 4
- * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* 3 2 1 0
* UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* Alignment: none
@@ -301,10 +297,10 @@ H5TN_init_interface(void)
HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
dt->shared->state = H5T_STATE_IMMUTABLE;
dt->shared->type = H5T_INTEGER;
- dt->shared->size = 8;
+ dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE;
dt->shared->u.atomic.offset = 0;
- dt->shared->u.atomic.prec = 64;
+ dt->shared->u.atomic.prec = 32;
dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
@@ -513,8 +509,6 @@ H5TN_init_interface(void)
H5T_NATIVE_UINT_LEAST16_ALIGN_g = 1;
/*
- * 7 6 5 4
- * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* 3 2 1 0
* IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* Alignment: none
@@ -523,10 +517,10 @@ H5TN_init_interface(void)
HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
dt->shared->state = H5T_STATE_IMMUTABLE;
dt->shared->type = H5T_INTEGER;
- dt->shared->size = 8;
+ dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE;
dt->shared->u.atomic.offset = 0;
- dt->shared->u.atomic.prec = 64;
+ dt->shared->u.atomic.prec = 32;
dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
@@ -535,8 +529,6 @@ H5TN_init_interface(void)
H5T_NATIVE_INT_FAST16_ALIGN_g = 1;
/*
- * 7 6 5 4
- * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* 3 2 1 0
* UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* Alignment: none
@@ -545,10 +537,10 @@ H5TN_init_interface(void)
HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
dt->shared->state = H5T_STATE_IMMUTABLE;
dt->shared->type = H5T_INTEGER;
- dt->shared->size = 8;
+ dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE;
dt->shared->u.atomic.offset = 0;
- dt->shared->u.atomic.prec = 64;
+ dt->shared->u.atomic.prec = 32;
dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
@@ -637,8 +629,6 @@ H5TN_init_interface(void)
H5T_NATIVE_UINT_LEAST32_ALIGN_g = 1;
/*
- * 7 6 5 4
- * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* 3 2 1 0
* IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* Alignment: none
@@ -647,10 +637,10 @@ H5TN_init_interface(void)
HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
dt->shared->state = H5T_STATE_IMMUTABLE;
dt->shared->type = H5T_INTEGER;
- dt->shared->size = 8;
+ dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE;
dt->shared->u.atomic.offset = 0;
- dt->shared->u.atomic.prec = 64;
+ dt->shared->u.atomic.prec = 32;
dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
@@ -659,8 +649,6 @@ H5TN_init_interface(void)
H5T_NATIVE_INT_FAST32_ALIGN_g = 1;
/*
- * 7 6 5 4
- * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* 3 2 1 0
* UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* Alignment: none
@@ -669,10 +657,10 @@ H5TN_init_interface(void)
HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
dt->shared->state = H5T_STATE_IMMUTABLE;
dt->shared->type = H5T_INTEGER;
- dt->shared->size = 8;
+ dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE;
dt->shared->u.atomic.offset = 0;
- dt->shared->u.atomic.prec = 64;
+ dt->shared->u.atomic.prec = 32;
dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
@@ -918,46 +906,42 @@ H5TN_init_interface(void)
H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 8;
/*
- * 15 14 13 12
- * ???????? ???????? ???????? ????????
- * 11 10 9 8
- * ???????? ???????? SEEEEEEE EEEEEEEE
* 7 6 5 4
- * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
+ * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM
* 3 2 1 0
* MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
- * Implicit bit? no
+ * Implicit bit? yes
* Alignment: none
*/
if(NULL == (dt = H5T__alloc()))
HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed")
dt->shared->state = H5T_STATE_IMMUTABLE;
dt->shared->type = H5T_FLOAT;
- dt->shared->size = 16;
+ dt->shared->size = 8;
dt->shared->u.atomic.order = H5T_ORDER_LE;
dt->shared->u.atomic.offset = 0;
- dt->shared->u.atomic.prec = 80;
+ dt->shared->u.atomic.prec = 64;
dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
- dt->shared->u.atomic.u.f.sign = 79;
- dt->shared->u.atomic.u.f.epos = 64;
- dt->shared->u.atomic.u.f.esize = 15;
- dt->shared->u.atomic.u.f.ebias = 0x00003fff;
+ dt->shared->u.atomic.u.f.sign = 63;
+ dt->shared->u.atomic.u.f.epos = 52;
+ dt->shared->u.atomic.u.f.esize = 11;
+ dt->shared->u.atomic.u.f.ebias = 0x000003ff;
dt->shared->u.atomic.u.f.mpos = 0;
- dt->shared->u.atomic.u.f.msize = 64;
- dt->shared->u.atomic.u.f.norm = H5T_NORM_NONE;
+ dt->shared->u.atomic.u.f.msize = 52;
+ dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;
dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;
if((H5T_NATIVE_LDOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype")
H5T_NATIVE_LDOUBLE_ALIGN_g = 1;
- H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 16;
+ H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 8;
/* Set the native order for this machine */
H5T_native_order_g = H5T_ORDER_LE;
/* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
- H5T_POINTER_COMP_ALIGN_g = 8;
- H5T_HVL_COMP_ALIGN_g = 8;
+ H5T_POINTER_COMP_ALIGN_g = 4;
+ H5T_HVL_COMP_ALIGN_g = 4;
H5T_HOBJREF_COMP_ALIGN_g = 8;
H5T_HDSETREGREF_COMP_ALIGN_g = 1;
diff --git a/meta-oe/recipes-support/hdf5/files/H5Tinit.c b/meta-oe/recipes-support/hdf5/files/H5Tinit-64.c
similarity index 100%
rename from meta-oe/recipes-support/hdf5/files/H5Tinit.c
rename to meta-oe/recipes-support/hdf5/files/H5Tinit-64.c
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.8.19.bb b/meta-oe/recipes-support/hdf5/hdf5_1.8.19.bb
index 7ea6f64..ccef36c 100644
--- a/meta-oe/recipes-support/hdf5/hdf5_1.8.19.bb
+++ b/meta-oe/recipes-support/hdf5/hdf5_1.8.19.bb
@@ -6,12 +6,13 @@ SECTION = "libs"
LICENSE = "HDF5"
LIC_FILES_CHKSUM = "file://COPYING;md5=57e5351b17591e659eedae107265c606"
-inherit cmake
+inherit cmake siteinfo
SRC_URI = " \
https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \
file://H5lib_settings.c \
- file://H5Tinit.c \
+ file://H5Tinit-64.c \
+ file://H5Tinit-32.c \
file://0001-cross-compiling-support.patch \
file://0002-Remove-suffix-shared-from-shared-library-name.patch \
"
@@ -42,7 +43,7 @@ EXTRA_OECMAKE = " \
do_unpack[postfuncs] += "gen_hd5file"
gen_hd5file() {
install -m 544 ${WORKDIR}/H5lib_settings.c ${S}
- install -m 544 ${WORKDIR}/H5Tinit.c ${S}
+ install -m 544 ${WORKDIR}/H5Tinit-${SITEINFO_BITS}.c ${S}/H5Tinit.c
}
do_install_append() {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list