[Openmp-commits] [openmp] r264166 - Fix Visual Studio builds
Jonathan Peyton via Openmp-commits
openmp-commits at lists.llvm.org
Wed Mar 23 09:27:25 PDT 2016
Author: jlpeyton
Date: Wed Mar 23 11:27:25 2016
New Revision: 264166
URL: http://llvm.org/viewvc/llvm-project?rev=264166&view=rev
Log:
Fix Visual Studio builds
Have Visual Studio use MemoryBarrier() instead of _mm_mfence() and remove
__declspec align attribute from function parameters in kmp_atomic.h
Modified:
openmp/trunk/runtime/src/kmp_atomic.h
openmp/trunk/runtime/src/kmp_csupport.c
Modified: openmp/trunk/runtime/src/kmp_atomic.h
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_atomic.h?rev=264166&r1=264165&r2=264166&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_atomic.h (original)
+++ openmp/trunk/runtime/src/kmp_atomic.h Wed Mar 23 11:27:25 2016
@@ -35,6 +35,13 @@
#if defined( __cplusplus ) && ( KMP_OS_WINDOWS )
// create shortcuts for c99 complex types
+ // Visual Studio cannot have function parameters that have the
+ // align __declspec attribute, so we must remove it. (Compiler Error C2719)
+ #if KMP_COMPILER_MSVC
+ # undef KMP_DO_ALIGN
+ # define KMP_DO_ALIGN(alignment) /* Nothing */
+ #endif
+
#if (_MSC_VER < 1600) && defined(_DEBUG)
// Workaround for the problem of _DebugHeapTag unresolved external.
// This problem prevented to use our static debug library for C tests
Modified: openmp/trunk/runtime/src/kmp_csupport.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_csupport.c?rev=264166&r1=264165&r2=264166&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_csupport.c (original)
+++ openmp/trunk/runtime/src/kmp_csupport.c Wed Mar 23 11:27:25 2016
@@ -654,8 +654,10 @@ __kmpc_flush(ident_t *loc)
if ( ! __kmp_cpuinfo.sse2 ) {
// CPU cannot execute SSE2 instructions.
} else {
- #if KMP_COMPILER_ICC || KMP_COMPILER_MSVC
+ #if KMP_COMPILER_ICC
_mm_mfence();
+ #elif KMP_COMPILER_MSVC
+ MemoryBarrier();
#else
__sync_synchronize();
#endif // KMP_COMPILER_ICC
More information about the Openmp-commits
mailing list