[Openmp-commits] [openmp] r244217 - Fix link error on Windows when LIBOMP_USE_DEBUGGER is off

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Thu Aug  6 10:16:54 2015
New Revision: 244217

URL: http://llvm.org/viewvc/llvm-project?rev=244217&view=rev
Log:
Fix link error on Windows when LIBOMP_USE_DEBUGGER is off

Two symbols for the external debugger support were incorrectly exported when LIBOMP_USE_DEBUGGER=off.

Differential Revision: http://reviews.llvm.org/D11763

Modified:
    openmp/trunk/runtime/cmake/LibompHandleFlags.cmake
    openmp/trunk/runtime/src/dllexports

Modified: openmp/trunk/runtime/cmake/LibompHandleFlags.cmake
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/LibompHandleFlags.cmake?rev=244217&r1=244216&r2=244217&view=diff
==============================================================================
--- openmp/trunk/runtime/cmake/LibompHandleFlags.cmake (original)
+++ openmp/trunk/runtime/cmake/LibompHandleFlags.cmake Thu Aug  6 10:16:54 2015
@@ -212,6 +212,7 @@ function(libomp_get_gdflags gdflags)
   libomp_append(gdflags_local "-D prof" PROFILE_LIBRARY)
   libomp_append(gdflags_local "-D stub" STUBS_LIBRARY)
   libomp_append(gdflags_local "-D HAVE_QUAD" LIBOMP_USE_QUAD_PRECISION)
+  libomp_append(gdflags_local "-D USE_DEBUGGER" LIBOMP_USE_DEBUGGER)
   if(${LIBOMP_OMP_VERSION} GREATER 41 OR ${LIBOMP_OMP_VERSION} EQUAL 41)
     libomp_append(gdflags_local "-D OMP_41")
   endif()

Modified: openmp/trunk/runtime/src/dllexports
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/dllexports?rev=244217&r1=244216&r2=244217&view=diff
==============================================================================
--- openmp/trunk/runtime/src/dllexports (original)
+++ openmp/trunk/runtime/src/dllexports Thu Aug  6 10:16:54 2015
@@ -182,10 +182,10 @@
     %endif
 
 
-#if USE_DEBUGGER
+    %ifdef USE_DEBUGGER
         __kmp_debugging                         DATA
         __kmp_omp_debug_struct_info             DATA
-#endif /* USE_DEBUGGER */
+    %endif 
 
         # Symbols for MS mutual detection:
         _You_must_link_with_exactly_one_OpenMP_library    DATA