diff --git a/ompi/contrib/vt/vt/ChangeLog b/ompi/contrib/vt/vt/ChangeLog index 42f12b68a7..0704e9c7a1 100644 --- a/ompi/contrib/vt/vt/ChangeLog +++ b/ompi/contrib/vt/vt/ChangeLog @@ -1,3 +1,7 @@ +5.8.3openmpi + - fixed compile error on Red Hat 5.x which occurred if using GNU + compiler with -D_FORTIFY_SOURCE=2 + 5.8.2openmpi - fixed buffer overflow which occurred if marker or event comment records generated diff --git a/ompi/contrib/vt/vt/VERSION b/ompi/contrib/vt/vt/VERSION index bf41f933fd..2c38235b5f 100644 --- a/ompi/contrib/vt/vt/VERSION +++ b/ompi/contrib/vt/vt/VERSION @@ -1 +1 @@ -5.8.2openmpi +5.8.3openmpi diff --git a/ompi/contrib/vt/vt/config/m4/acinclude.iowrap.m4 b/ompi/contrib/vt/vt/config/m4/acinclude.iowrap.m4 index 1f63af340f..86f4c3c0e3 100644 --- a/ompi/contrib/vt/vt/config/m4/acinclude.iowrap.m4 +++ b/ompi/contrib/vt/vt/config/m4/acinclude.iowrap.m4 @@ -11,6 +11,7 @@ AC_DEFUN([ACVT_IOWRAP], sav_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" AC_CHECK_FUNCS([ \ + __fprintf_chk \ creat64 \ fopen64 \ fseeko \ diff --git a/ompi/contrib/vt/vt/doc/UserManual.html b/ompi/contrib/vt/vt/doc/UserManual.html index af707ab677..f384d7db80 100644 --- a/ompi/contrib/vt/vt/doc/UserManual.html +++ b/ompi/contrib/vt/vt/doc/UserManual.html @@ -23,35 +23,35 @@ original version by: Nikos Drakos, CBLU, University of Leeds .BOLDMATH { font-family: "Century Schoolbook", serif; font-weight: bold } /* implement both fixed-size and relative sizes */ -SMALL.XTINY { font-size : xx-small } -SMALL.TINY { font-size : x-small } -SMALL.SCRIPTSIZE { font-size : smaller } -SMALL.FOOTNOTESIZE { font-size : small } -SMALL.SMALL { } -BIG.LARGE { } -BIG.XLARGE { font-size : large } -BIG.XXLARGE { font-size : x-large } -BIG.HUGE { font-size : larger } -BIG.XHUGE { font-size : xx-large } +SMALL.XTINY { font-size : xx-small } +SMALL.TINY { font-size : x-small } +SMALL.SCRIPTSIZE { font-size : smaller } +SMALL.FOOTNOTESIZE { font-size : small } +SMALL.SMALL { } +BIG.LARGE { } +BIG.XLARGE { font-size : large } +BIG.XXLARGE { font-size : x-large } +BIG.HUGE { font-size : larger } +BIG.XHUGE { font-size : xx-large } /* heading styles */ -H1 { } -H2 { } -H3 { } -H4 { } -H5 { } +H1 { } +H2 { } +H3 { } +H4 { } +H5 { } /* mathematics styles */ -DIV.displaymath { } /* math displays */ -TD.eqno { } /* equation-number cells */ +DIV.displaymath { } /* math displays */ +TD.eqno { } /* equation-number cells */ /* document-specific styles come next */ -PRE.preform { } -DIV.navigation { } -SPAN.textbf { font-weight: bold } -SPAN.arabic { } -SPAN.textit { font-style: italic } +PRE.preform { } +DIV.navigation { } +SPAN.textbf { font-weight: bold } +SPAN.arabic { } +SPAN.textit { font-style: italic } body {font-family: sans-serif;} @@ -62,7 +62,7 @@ body {font-family: sans-serif;}

-VampirTrace 5.8.2 User Manual +VampirTrace 5.8.3 User Manual


diff --git a/ompi/contrib/vt/vt/doc/UserManual.pdf b/ompi/contrib/vt/vt/doc/UserManual.pdf index ed6434619b..e883d0f2e2 100644 Binary files a/ompi/contrib/vt/vt/doc/UserManual.pdf and b/ompi/contrib/vt/vt/doc/UserManual.pdf differ diff --git a/ompi/contrib/vt/vt/vtlib/vt_iowrap.c b/ompi/contrib/vt/vt/vtlib/vt_iowrap.c index af5e2fb464..38badc992b 100644 --- a/ompi/contrib/vt/vt/vtlib/vt_iowrap.c +++ b/ompi/contrib/vt/vt/vtlib/vt_iowrap.c @@ -1392,7 +1392,11 @@ int fscanf(FILE *stream, const char *format, ...) } +#if defined(HAVE___FPRINTF_CHK) && HAVE___FPRINTF_CHK +int __fprintf_chk(FILE *stream, int flag, const char *format, ...) +#else /* HAVE___FPRINTF_CHK */ int fprintf(FILE *stream, const char *format, ...) +#endif /* HAVE___FPRINTF_CHK */ { #define VT_IOWRAP_THISFUNCNAME fprintf int ret; @@ -1410,7 +1414,11 @@ int fprintf(FILE *stream, const char *format, ...) vt_debug_msg(DBG_IO, "vfprintf"); va_start (arg, format); - ret = vfprintf(stream, format, arg); +#if defined(HAVE___FPRINTF_CHK) && HAVE___FPRINTF_CHK + ret = __vfprintf_chk(stream, flag, format, arg); +#else /* HAVE___FPRINTF_CHK */ + ret = fprintf(stream, format, arg); +#endif /* HAVE___FPRINTF_CHK */ va_end (arg); num_bytes = (ssize_t)ret; @@ -1421,7 +1429,11 @@ int fprintf(FILE *stream, const char *format, ...) } else { va_start (arg, format); +#if defined(HAVE___FPRINTF_CHK) && HAVE___FPRINTF_CHK + ret = __vfprintf_chk(stream, flag, format, arg); +#else /* HAVE___FPRINTF_CHK */ ret = vfprintf(stream, format, arg); +#endif /* HAVE___FPRINTF_CHK */ va_end (arg); return ret; }