[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-170-g14f0484

[Service Account]

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  14f0484f8f1d5db44c81d26c9e366f6008aab40e (commit)
      from  ff06d55a59a379dd9cda9b152dacc80566eab785 (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/14f0484f8f1d5db44c81d26c9e366f6008aab40e

commit 14f0484f8f1d5db44c81d26c9e366f6008aab40e
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Thu Jan 14 12:56:14 2016 -0600

    use libunwind only when both header and lib available
    
    libunwind has runtime libraries and compile-time heaers.  Some systems
    might provide libunwind without the corresponding -dev package.  Be more
    careful about when to choose libunwind.
    
    No Reviewer (but there was a lengty discussion on mpich-discuss)

diff --git a/src/mpl/src/bt/mpl_bt.c b/src/mpl/src/bt/mpl_bt.c
index 5abd999..ef10a59 100644
--- a/src/mpl/src/bt/mpl_bt.c
+++ b/src/mpl/src/bt/mpl_bt.c
@@ -44,7 +44,11 @@ static inline void backtrace_libback(FILE *output)
     btstate = backtrace_create_state(NULL, 1, NULL, NULL);
     backtrace_print(btstate, 0, output);
 }
-#elif defined MPL_HAVE_LIBUNWIND
+/* we need not only the symbols but the header file too (for the cursor and
+ * context), so tighten up when we take the libunwind path.  Thanks
+ * Siegmar.Gross at informatik.hs-fulda.de for the bug report about systems with
+ * libunwind libraries but no libunwind development headers */
+#elif defined MPL_HAVE_LIBUNWIND && defined(MPL_HAVE_LIBUNWIND_H)
 static inline void backtrace_libunwind(FILE *output)
 {
     unw_cursor_t cursor;
@@ -118,7 +122,7 @@ void MPL_backtrace_show(FILE *output)
 {
 #ifdef MPL_HAVE_LIBBACKTRACE
     backtrace_libback(output);
-#elif defined MPL_HAVE_LIBUNWIND
+#elif defined MPL_HAVE_LIBUNWIND && defined(MPL_HAVE_LIBUNWIND_H)
     /* libunwind is not able to get line numbers without forking off to
      * addr2line (?)*/
     backtrace_libunwind(output);

-----------------------------------------------------------------------

Summary of changes:
 src/mpl/src/bt/mpl_bt.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository