Temporary disabled OpenMP support completely if the PGI compiler is used to work around some uncleared compile errors

This commit was SVN r23719.

ompi/contrib/vt/vt/extlib/otf/ChangeLog

@@ -3,8 +3,8 @@
 	  version of the OTF library
 	  (so it's possible to add these objects to 3rd-party shared libraries)
 	- fixed and enhanced calculation of trace file size in otfinfo
-	- disable OpenMP support in otfprofile if the PGI compiler
+	- temporary disabled OpenMP support completely if the PGI compiler is
-	  is used to work around some compiler errors
+	  used to work around some uncleared compile errors
 	- patched libtool:
 	  - to avoid a bug in detection of the PGI 10 C++ compiler
 	  - to detect IBM cross compilers on BlueGene/P

ompi/contrib/vt/vt/extlib/otf/config/m4/acinclude.omp.m4

@@ -1,11 +1,27 @@
 AC_DEFUN([CHECK_OMP],
 [
+    check_omp="yes"
     have_omp="no"
 
     AC_ARG_VAR(OPENMP_CXXFLAGS, [C++ compiler flags to enable support for OpenMP])
 
-    AC_LANG_SAVE
+dnl Disable OpenMP if the PGI compiler is used to work around the following errors:
-    AC_LANG_CPLUSPLUS
+dnl compiler version  compiler error
-    AX_OPENMP([have_omp="yes"])
+dnl < 9.0-3           PGCC-S-0000-Internal compiler error. calc_dw_tag:no tag
-    AC_LANG_RESTORE
+dnl (see Technical Problem Report 4337 at http://www.pgroup.com/support/release_tprs_90.htm)
+dnl 10.1 - 10.6       this kind of pragma may not be used here
+dnl                   #pargma omp barrier
+    case `$CC -V 2>&1` in
+        *pgcc*)
+            check_omp="no"
+            ;;
+    esac
+
+    AS_IF([test "$check_omp" = "yes"],
+    [
+        AC_LANG_SAVE
+        AC_LANG_CPLUSPLUS
+        AX_OPENMP([have_omp="yes"])
+        AC_LANG_RESTORE
+    ])
 ])

ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/otfprofile.cpp

@@ -7,20 +7,6 @@
 #include "config.h"
 #endif
 
-/* Disable OpenMP if the PGI compiler is used to work around the following errors:
-
-compiler version  compiler error
-< 9.0-3           PGCC-S-0000-Internal compiler error. calc_dw_tag:no tag
-(see Technical Problem Report 4337 at http://www.pgroup.com/support/release_tprs_90.htm)
-
-10.1 - 10.6       this kind of pragma may not be used here
-                  #pargma omp barrier
-*/
-#if defined(_OPENMP) && defined(__PGI)
-#	undef _OPENMP
-#endif
-
-
 #ifdef _OPENMP
 #	include <omp.h>
 #else
@@ -28,7 +14,6 @@ compiler version  compiler error
 #	define omp_get_num_threads() 1
 #endif
 
-
 #if defined(HAVE_SYS_TIME_H) && HAVE_SYS_TIME_H
 #	include <sys/time.h>
 #endif