This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via a14464d3db67a1e6dad877571cc49b99b18c7c7e (commit) via 5f3f49b17a94c336b6e0175c296f917912c94e6c (commit) from 1a993e8757d7ccde89c4144dcd1abdf17b50f6d9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/a14464d3db67a1e6dad877571cc49b99b1... commit a14464d3db67a1e6dad877571cc49b99b18c7c7e Author: Michael Blocksome <[email protected]> Date: Tue Jan 21 11:40:31 2014 -0600 bgq fix for mpivars link error Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/env/Makefile.mk b/src/env/Makefile.mk index b23a6c0..8c5b459 100644 --- a/src/env/Makefile.mk +++ b/src/env/Makefile.mk @@ -22,6 +22,7 @@ src_env_mpichversion_LDFLAGS = $(mpich_libtool_static_flag) src_env_mpivars_SOURCES = src/env/mpivars.c src_env_mpivars_LDADD = lib/lib@[email protected] +src_env_mpivars_LDFLAGS = $(mpich_libtool_static_flag) if BUILD_PROFILING_LIB src_env_mpivars_LDADD += lib/lib@[email protected] endif BUILD_PROFILING_LIB diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index d96cd2f..5411c11 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -195,7 +195,7 @@ if test "${pamid_platform}" = "BGQ" ; then # of libstdc++.so unless this '-all-static' option is used. This seems to # be a problem specific to libstdc++. # - # Only the 'cpi' and 'mpichversion' executables have this problem. + # Only the 'cpi', 'mpivars', and 'mpichversion' executables have this problem. MPID_LIBTOOL_STATIC_FLAG="-all-static" fi http://git.mpich.org/mpich.git/commitdiff/5f3f49b17a94c336b6e0175c296f917912... commit 5f3f49b17a94c336b6e0175c296f917912c94e6c Author: Pavan Balaji <[email protected]> Date: Fri Jan 17 21:02:18 2014 +0000 Use MPIU_Malloc/Free instead of malloc/free. Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c index 4b37f26..4a194b2 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c @@ -61,12 +61,12 @@ MPID_Win_create_dynamic( MPID_Info * info, void *base = NULL; size_t length = 0; Kernel_MemoryRegion_t memregion; - void *tmpbuf = malloc(sizeof(int)); + void *tmpbuf = MPIU_Malloc(sizeof(int)); Kernel_CreateMemoryRegion(&memregion, tmpbuf, sizeof(int)); //Reset base to base VA of local heap base = memregion.BaseVa; length = memregion.Bytes; - free(tmpbuf); + MPIU_Free(tmpbuf); if (length != 0) { ----------------------------------------------------------------------- Summary of changes: src/env/Makefile.mk | 1 + .../pamid/src/onesided/mpid_win_create_dynamic.c | 4 ++-- src/mpid/pamid/subconfigure.m4 | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository