Use a compilation test to set the MPIR unwind flags instead of setting

them based on compiler name. Also correct CPP_FLAGS -> C_FLAGS.

Signed-off-by: James Clark <[email protected]>

Author: James-A-Clark

config/orte_setup_debugger_flags.m4

@@ -24,6 +24,21 @@ dnl
 dnl $HEADER$
 dnl
 
+dnl Check to see if specific CFLAGS work
+dnl $1: compiler flags to check
+dnl $2: Action if the flags work
+AC_DEFUN([_ORTE_SETUP_DEBUGGER_FLAGS_TRY_CFLAGS],[
+    OPAL_VAR_SCOPE_PUSH([ORTE_SETUP_DEBUGGER_FLAGS_CFLAGS_save])
+    ORTE_SETUP_DEBUGGER_FLAGS_CFLAGS_save=$CFLAGS
+    AC_MSG_CHECKING([if $1 compiler flag works])
+    CFLAGS="$CFLAGS $1"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[int i = 3;])],
+        [$2; AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])])
+    CFLAGS=$ORTE_SETUP_DEBUGGER_FLAGS_CFLAGS_save
+    OPAL_VAR_SCOPE_POP
+])
+
 AC_DEFUN([ORTE_SETUP_DEBUGGER_FLAGS],[
     #
     # Do a final process of the CFLAGS to make a WITHOUT_OPTFLAGS
@@ -60,19 +75,24 @@ AC_DEFUN([ORTE_SETUP_DEBUGGER_FLAGS],[
     # producing a stack when explicit unwind information is unavailable.
     # This is implied by -g, but we want to save space and don't need
     # full debug symbols.
-    if test "x$opal_cv_c_compiler_vendor" = "xibm"; then
-        MPIR_UNWIND_CFLAGS="-g"
-    elif test "x$opal_cv_c_compiler_vendor" = "xgnu"; then
-        MPIR_UNWIND_CFLAGS="-fasynchronous-unwind-tables"
-    elif test "x$opal_cv_c_compiler_vendor" = "xintel"; then
-        MPIR_UNWIND_CFLAGS="-fasynchronous-unwind-tables"
-    elif test "x$opal_cv_c_compiler_vendor" = "xportland group"; then
-        MPIR_UNWIND_CFLAGS="-Meh_frame -Mframe"
-    else
-        MPIR_UNWIND_CFLAGS=
+    foundFlags=no
+    MPIR_UNWIND_CFLAGS=
+
+    # Test for GNU and Intel compiler flags
+    _ORTE_SETUP_DEBUGGER_FLAGS_TRY_CFLAGS([-fasynchronous-unwind-tables],
+       [MPIR_UNWIND_CFLAGS=-fasynchronous-unwind-tables foundFlags=yes])
+
+    # Test for PGI compiler flags
+    if test $foundFlags = no; then
+        _ORTE_SETUP_DEBUGGER_FLAGS_TRY_CFLAGS([-Meh_frame -Mframe],
+            [MPIR_UNWIND_CFLAGS="-Meh_frame -Mframe" foundFlags=yes])
+    fi
+
+    # Finally fall back to -g if neither of the above were available
+    if test $foundFlags = no; then
+        _ORTE_SETUP_DEBUGGER_FLAGS_TRY_CFLAGS([-g],
+            [MPIR_UNWIND_CFLAGS=-g foundFlags=yes])
     fi
 
-    AC_MSG_CHECKING([for MPIR unwind info flags])
-    AC_MSG_RESULT([$MPIR_UNWIND_CFLAGS])
     AC_SUBST(MPIR_UNWIND_CFLAGS)
 ])

orte/mca/ess/Makefile.am

@@ -17,9 +17,11 @@
 # $HEADER$
 #
 
-# Add unwind flags because all of the files in this tree are
+AM_CPPFLAGS = $(LTDLINCL)
+
+# Add unwind flags because files in this tree are
 # involved in startup.
-AM_CPPFLAGS = $(LTDLINCL) $(MPIR_UNWIND_CFLAGS)
+AM_CFLAGS = $(MPIR_UNWIND_CFLAGS)
 
 # main library setup
 noinst_LTLIBRARIES = libmca_ess.la

orte/mca/ess/pmi/Makefile.am

@@ -11,7 +11,13 @@
 # $HEADER$
 #
 
-AM_CPPFLAGS = $(ess_pmi_CPPFLAGS) $(MPIR_UNWIND_CFLAGS)
+# Add MPIR unwind flags because files in this tree are
+# involved in startup. This is not needed in the other
+# subdirs in orte/mca/ess because the other components are
+# solely used by daemons and thus are not accessible by the debugger.
+AM_CFLAGS = $(MPIR_UNWIND_CFLAGS)
+
+AM_CPPFLAGS = $(ess_pmi_CPPFLAGS)
 
 sources = \
         ess_pmi.h \