From: Craig Topper <craig.topper@intel.com>
Date: Fri, 18 Jan 2019 17:51:51 +0000 (+0000)
Subject: [X86] Only define _XCR_XFEATURE_ENABLED_MASK in xsaveintrin.h when _MSC_VER is define... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eead5b6bee8b6f1b3974b9b512065a52172d0781;p=clang

[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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@351568 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Headers/intrin.h b/lib/Headers/intrin.h
index acc08abaf0..aa27707ef5 100644
--- a/lib/Headers/intrin.h
+++ b/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/lib/Headers/xsaveintrin.h b/lib/Headers/xsaveintrin.h
index 788f9e000b..55a1eb9f59 100644
--- a/lib/Headers/xsaveintrin.h
+++ b/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