diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-12-14 17:39:30 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-12-14 17:39:30 +0000 |
| commit | 67390c6cd335f2df292dd4784061432346d15aa3 (patch) | |
| tree | f897a8c668e5d86a0178cf369c6a6ac1a558740a /openmp/runtime/src | |
| parent | 161eae2daa21537742c53c46bae3119e3c463136 (diff) | |
| download | bcm5719-llvm-67390c6cd335f2df292dd4784061432346d15aa3.tar.gz bcm5719-llvm-67390c6cd335f2df292dd4784061432346d15aa3.zip | |
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.
llvm-svn: 255514
Diffstat (limited to 'openmp/runtime/src')
| -rw-r--r-- | openmp/runtime/src/kmp_os.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openmp/runtime/src/kmp_os.h b/openmp/runtime/src/kmp_os.h index b12d198568a..2c330fc0d4d 100644 --- a/openmp/runtime/src/kmp_os.h +++ b/openmp/runtime/src/kmp_os.h @@ -695,7 +695,8 @@ typedef void (*microtask_t)( int *gtid, int *npr, ... ); // 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 |
