diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-08-15 12:29:55 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-08-15 12:29:55 +0000 |
| commit | 1106035d5bec5d667e553508a88e1012a89b67d3 (patch) | |
| tree | 9111ba3acb6d67396d17e7995632bf1ae310734e /contrib/llvm-project/compiler-rt | |
| parent | 57b714784b6a62fc1e298c9a22961b8179a70d0e (diff) | |
| parent | 10c469f2ae76868106ec8bc8fbac13e0f26552f7 (diff) | |
| download | src-1106035d5bec5d667e553508a88e1012a89b67d3.tar.gz src-1106035d5bec5d667e553508a88e1012a89b67d3.zip | |
Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
release/11.x llvmorg-11.0.0-rc1-47-gff47911ddfc.
Notes
Notes:
svn path=/projects/clang1100-import/; revision=364253
Diffstat (limited to 'contrib/llvm-project/compiler-rt')
| -rw-r--r-- | contrib/llvm-project/compiler-rt/lib/profile/InstrProfilingPort.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/llvm-project/compiler-rt/lib/profile/InstrProfilingPort.h b/contrib/llvm-project/compiler-rt/lib/profile/InstrProfilingPort.h index 20cf5d660c6a..4493dd512ff0 100644 --- a/contrib/llvm-project/compiler-rt/lib/profile/InstrProfilingPort.h +++ b/contrib/llvm-project/compiler-rt/lib/profile/InstrProfilingPort.h @@ -53,9 +53,9 @@ #endif #if COMPILER_RT_HAS_ATOMICS == 1 -#ifdef _MSC_VER +#ifdef _WIN32 #include <windows.h> -#if _MSC_VER < 1900 +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #endif #if defined(_WIN64) @@ -73,7 +73,7 @@ (DomType *)InterlockedExchangeAdd((LONG volatile *)&PtrVar, \ (LONG)sizeof(DomType) * PtrIncr) #endif -#else /* !defined(_MSC_VER) */ +#else /* !defined(_WIN32) */ #define COMPILER_RT_BOOL_CMPXCHG(Ptr, OldV, NewV) \ __sync_bool_compare_and_swap(Ptr, OldV, NewV) #define COMPILER_RT_PTR_FETCH_ADD(DomType, PtrVar, PtrIncr) \ |