[Openmp-commits] [openmp] r255514 - Fix broken visual studio builds by disabling KMP_USE_TSX.

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Mon Dec 14 11:39:30 2015
New Revision: 255514

URL: http://llvm.org/viewvc/llvm-project?rev=255514&view=rev
Log:
Fix broken visual studio builds by disabling KMP_USE_TSX.

Visual studio can't handle the asm extension in the KMP_USE_TSX code sections.

Modified:
    openmp/trunk/runtime/src/kmp_os.h

Modified: openmp/trunk/runtime/src/kmp_os.h
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_os.h?rev=255514&r1=255513&r2=255514&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_os.h (original)
+++ openmp/trunk/runtime/src/kmp_os.h Mon Dec 14 11:39:30 2015
@@ -695,7 +695,8 @@ typedef void    (*microtask_t)( int *gti
 
 // Enable TSX if dynamic user lock is turned on
 #if KMP_USE_DYNAMIC_LOCK
-# define KMP_USE_TSX             (KMP_ARCH_X86 || KMP_ARCH_X86_64)
+// Visual studio can't handle the asm sections in this code
+# define KMP_USE_TSX             (KMP_ARCH_X86 || KMP_ARCH_X86_64) && !KMP_COMPILER_MSVC
 # ifdef KMP_USE_ADAPTIVE_LOCKS
 #  undef KMP_USE_ADAPTIVE_LOCKS
 # endif