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 5fec4839e3220b6d37133c8cb40d8ba2b7100d9b..04ef9e88297b761f88149c28c2a5ca4f5b1bdf62 100644 (file)
--- 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"
     }