r270169 - Revert incorrect module map changes in r269907 and replace them with the

[Richard Smith via cfe-commits]

Author: rsmith
Date: Thu May 19 20:06:47 2016
New Revision: 270169

URL: http://llvm.org/viewvc/llvm-project?rev=270169&view=rev
Log:
Revert incorrect module map changes in r269907 and replace them with the
appropriate changes.

Modified:
    cfe/trunk/lib/Headers/module.modulemap

Modified: cfe/trunk/lib/Headers/module.modulemap
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/module.modulemap?rev=270169&r1=270168&r2=270169&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/module.modulemap (original)
+++ cfe/trunk/lib/Headers/module.modulemap Thu May 19 20:06:47 2016
@@ -60,6 +60,7 @@ module _Builtin_intrinsics [system] [ext
     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] [ext
       export pclmul
     }
 
-    explicit module mwaitx {
-      header "mwaitxintrin.h"
-    }
-
     explicit module aes {
       header "__wmmintrin_aes.h"
     }