From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Fri, 20 May 2016 01:06:47 +0000 (+0000)
Subject: Revert incorrect module map changes in r269907 and replace them with the
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6ee5c3add789f527ed2d0fe64f2bfc2dcf75c7c;p=clang

Revert incorrect module map changes in r269907 and replace them with the
appropriate changes.


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

diff --git a/lib/Headers/module.modulemap b/lib/Headers/module.modulemap
index 5fec4839e3..04ef9e8829 100644
--- a/lib/Headers/module.modulemap
+++ b/lib/Headers/module.modulemap
@@ -60,6 +60,7 @@ module _Builtin_intrinsics [system] [extern_c] {
     textual header "lzcntintrin.h"
     textual header "xopintrin.h"
     textual header "fma4intrin.h"
+    textual header "mwaitxintrin.h"
 
     explicit module mm_malloc {
       header "mm_malloc.h"
@@ -125,10 +126,6 @@ module _Builtin_intrinsics [system] [extern_c] {
       export pclmul
     }
 
-    explicit module mwaitx {
-      header "mwaitxintrin.h"
-    }
-
     explicit module aes {
       header "__wmmintrin_aes.h"
     }