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 0388a85b1a6dfe8772766c67e9793266452e6c2c (commit) via 9d909feee1bfa4337f1bceabc7d3f42e7e2cd3fb (commit) via ccf7f70c3252d4e38933de00dd2f4bb49a389a61 (commit) via dfad7fdfc307ca74184a133d2921b8bc6d7e5023 (commit) from 01e95cbfc0dde9fac3180addb7981f4d199a235c (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/0388a85b1a6dfe8772766c67e979326645... commit 0388a85b1a6dfe8772766c67e9793266452e6c2c Author: Pavan Balaji <[email protected]> Date: Sat May 18 23:48:33 2013 -0500 Warning squash. No reviewer. diff --git a/src/pm/hydra/pm/pmiserv/pmip_cb.c b/src/pm/hydra/pm/pmiserv/pmip_cb.c index d8681eb..e284028 100644 --- a/src/pm/hydra/pm/pmiserv/pmip_cb.c +++ b/src/pm/hydra/pm/pmiserv/pmip_cb.c @@ -462,7 +462,7 @@ static int local_to_global_id(int local_id) static HYD_status launch_procs(void) { - int i, j, arg, process_id; + int i, j, process_id; int using_pmi_port = 0; char *str, *envstr, *list, *pmi_port; struct HYD_string_stash stash; @@ -685,7 +685,7 @@ static HYD_status launch_procs(void) } HYD_STRING_STASH_INIT(stash); - for (j = 0, arg = 0; exec->exec[j]; j++) + for (j = 0; exec->exec[j]; j++) HYD_STRING_STASH(stash, HYDU_strdup(exec->exec[j]), status); status = HYDU_create_process(stash.strlist, force_env, http://git.mpich.org/mpich.git/commitdiff/9d909feee1bfa4337f1bceabc7d3f42e7e... commit 9d909feee1bfa4337f1bceabc7d3f42e7e2cd3fb Author: Pavan Balaji <[email protected]> Date: Sat May 18 23:27:47 2013 -0500 Remove accidental debug statements. No reviewer. diff --git a/confdb/aclocal_runlog.m4 b/confdb/aclocal_runlog.m4 index a538975..6446af8 100644 --- a/confdb/aclocal_runlog.m4 +++ b/confdb/aclocal_runlog.m4 @@ -183,8 +183,6 @@ dnl Save a copy of ac_link on a stack dnl which is safe through nested invocations of this macro. PAC_VAR_PUSHVAL([ac_link]) dnl Modify ac_link based on the unmodified ac_link. -echo "ac_link: $ac_link" -echo "pac_FirstSavedValueOf_ac_link: $pac_FirstSavedValueOf_ac_link" ac_link="`echo $pac_FirstSavedValueOf_ac_link | sed -e 's|>.*$|> $1 2>\&1|g'`" dnl AC_LINK_IFELSE([$2],[ http://git.mpich.org/mpich.git/commitdiff/ccf7f70c3252d4e38933de00dd2f4bb49a... commit ccf7f70c3252d4e38933de00dd2f4bb49a389a61 Author: Pavan Balaji <[email protected]> Date: Sat May 18 22:38:40 2013 -0500 Warning squash for clang. For the VA_ARGS test, clang was accepting it in C89 mode, but throwing warnings. This causes configure to enable it, but the build to throw many warnings. This patch will disable VA_ARGS support unless the compiler can accept it without warnings. No reviewer. diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4 index 10964e1..47d58da 100644 --- a/confdb/aclocal_cc.m4 +++ b/confdb/aclocal_cc.m4 @@ -1625,19 +1625,29 @@ AC_DEFUN([PAC_STRUCT_ALIGNMENT],[ pac_cv_struct_alignment="eight" fi ]) -dnl + dnl PAC_C_MACRO_VA_ARGS dnl dnl will AC_DEFINE([HAVE_MACRO_VA_ARGS]) if the compiler supports C99 variable dnl length argument lists in macros (#define foo(...) bar(__VA_ARGS__)) AC_DEFUN([PAC_C_MACRO_VA_ARGS],[ AC_MSG_CHECKING([for variable argument list macro functionality]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([ + + # check if the program links correctly + rm -f pac_test.log + PAC_LINK_IFELSE_LOG([pac_test.log],[AC_LANG_PROGRAM([ #include <stdio.h> #define conftest_va_arg_macro(...) printf(__VA_ARGS__) ], [conftest_va_arg_macro("a test %d", 3);])], - [AC_DEFINE([HAVE_MACRO_VA_ARGS],[1],[Define if C99-style variable argument list macro functionality]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) + prog_links=yes,prog_links=no) + + # If the program linked OK, make sure there were no warnings + if test "$prog_links" = "yes" -a "`cat pac_test.log`" = "" ; then + AC_DEFINE([HAVE_MACRO_VA_ARGS],[1],[Define if C99-style variable argument list macro functionality]) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + rm -f pac_test.log ])dnl http://git.mpich.org/mpich.git/commitdiff/dfad7fdfc307ca74184a133d2921b8bc6d... commit dfad7fdfc307ca74184a133d2921b8bc6d7e5023 Author: Pavan Balaji <[email protected]> Date: Sat May 18 22:55:56 2013 -0500 Missed check for inline in mpl. Added a check for inline in the MPL configure. Also made C89 headers available by default. We should not be checking for them. No reviewer. diff --git a/src/mpl/configure.ac b/src/mpl/configure.ac index bc0322c..0ea3ab1 100644 --- a/src/mpl/configure.ac +++ b/src/mpl/configure.ac @@ -47,6 +47,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_C_CONST AC_C_RESTRICT +AC_C_INLINE PAC_C_MACRO_VA_ARGS diff --git a/src/mpl/include/mpl.h b/src/mpl/include/mpl.h index dee4743..3a33f0a 100644 --- a/src/mpl/include/mpl.h +++ b/src/mpl/include/mpl.h @@ -9,6 +9,12 @@ #include "mplconfig.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdint.h> + #if defined _mpl_restrict #define mpl_restrict _mpl_restrict #else @@ -21,21 +27,11 @@ #define mpl_const const #endif /* _mpl_const */ -#if defined MPL_HAVE_STDIO_H -#include <stdio.h> -#endif /* MPL_HAVE_STDIO_H */ - -#if defined MPL_HAVE_STDLIB_H -#include <stdlib.h> -#endif /* MPL_HAVE_STDLIB_H */ - -#if defined MPL_HAVE_STRING_H -#include <string.h> -#endif /* MPL_HAVE_STRING_H */ - -#if defined MPL_HAVE_STDARG_H -#include <stdarg.h> -#endif /* MPL_HAVE_STDARG_H */ +#if defined _mpl_inline +#define mpl_inline _mpl_inline +#else +#define mpl_inline inline +#endif /* _mpl_inline */ #if defined MPL_HAVE_CTYPE_H #include <ctype.h> @@ -45,10 +41,6 @@ #include <inttypes.h> #endif /* MPL_HAVE_INTTYPES_H */ -#if defined(MPL_HAVE_STDINT_H) -#include <stdint.h> -#endif /* MPL_HAVE_STDINT_H */ - #if !defined ATTRIBUTE # if defined MPL_HAVE_GCC_ATTRIBUTE # define ATTRIBUTE(a_) __attribute__(a_) diff --git a/src/mpl/include/mpl_valgrind.h b/src/mpl/include/mpl_valgrind.h index 84fe057..4d36a9e 100644 --- a/src/mpl/include/mpl_valgrind.h +++ b/src/mpl/include/mpl_valgrind.h @@ -158,7 +158,7 @@ # define MPL_VG_PRINTF_BACKTRACE(...) do {} while (0) # else # define MPL_VG_PRINTF_BACKTRACE MPL_VG_printf_do_nothing_func -static inline void MPL_VG_printf_do_nothing_func(char *fmt, ...) +static mpl_inline void MPL_VG_printf_do_nothing_func(char *fmt, ...) { /* do nothing */ } ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_cc.m4 | 20 +++++++++++++++----- confdb/aclocal_runlog.m4 | 2 -- src/mpl/configure.ac | 1 + src/mpl/include/mpl.h | 30 +++++++++++------------------- src/mpl/include/mpl_valgrind.h | 2 +- src/pm/hydra/pm/pmiserv/pmip_cb.c | 4 ++-- 6 files changed, 30 insertions(+), 29 deletions(-) hooks/post-receive -- MPICH primary repository