diff options
| author | Craig Topper <craig.topper@intel.com> | 2019-01-18 17:51:51 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@intel.com> | 2019-01-18 17:51:51 +0000 |
| commit | d08d90ce51d23ed00fe2442d8850953798859a56 (patch) | |
| tree | 2f970537a0ece460a8cdc07f507d0b0237839257 | |
| parent | be7cbe3f70e7e15f2e72abbe5e185775d31363a1 (diff) | |
| download | bcm5719-llvm-d08d90ce51d23ed00fe2442d8850953798859a56.tar.gz bcm5719-llvm-d08d90ce51d23ed00fe2442d8850953798859a56.zip | |
[X86] Only define _XCR_XFEATURE_ENABLED_MASK in xsaveintrin.h when _MSC_VER is defined. Remove from intrin.h.
I think this was my intention when I added it xsaveintrin.h
llvm-svn: 351568
| -rw-r--r-- | clang/lib/Headers/intrin.h | 1 | ||||
| -rw-r--r-- | clang/lib/Headers/xsaveintrin.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Headers/intrin.h b/clang/lib/Headers/intrin.h index acc08abaf03..aa27707ef53 100644 --- a/clang/lib/Headers/intrin.h +++ b/clang/lib/Headers/intrin.h @@ -200,7 +200,6 @@ __attribute__((__deprecated__("use other intrinsics or C++11 atomics instead"))) _WriteBarrier(void); unsigned __int32 xbegin(void); void _xend(void); -#define _XCR_XFEATURE_ENABLED_MASK 0 /* These additional intrinsics are turned on in x64/amd64/x86_64 mode. */ #ifdef __x86_64__ diff --git a/clang/lib/Headers/xsaveintrin.h b/clang/lib/Headers/xsaveintrin.h index 788f9e000b5..55a1eb9f59a 100644 --- a/clang/lib/Headers/xsaveintrin.h +++ b/clang/lib/Headers/xsaveintrin.h @@ -28,7 +28,7 @@ #ifndef __XSAVEINTRIN_H #define __XSAVEINTRIN_H -#ifndef _MSC_VER +#ifdef _MSC_VER #define _XCR_XFEATURE_ENABLED_MASK 0 #endif |
