Split compiler builtin module into "stdlib" builtins and "intrinsic"

builds, and bring mm_alloc.h into the fold. Start playing some tricks
with these builtin modules to mirror the include_next tricks that the
headers already perform.


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

1 files changed, 17 insertions, 12 deletions

diff --git a/lib/Headers/module.map b/lib/Headers/module.map
index cd18e5efb4..e321ca3ca5 100644
--- a/lib/Headers/module.map
+++ b/lib/Headers/module.map
@@ -1,9 +1,4 @@
-module __compiler_builtins [system] {
-  explicit module altivec {
-    requires altivec
-    header "altivec.h"
-  }
-
+module _Builtin_stdlib [system] {
   explicit module float_constants {
     header "float.h"
   }
@@ -36,6 +31,18 @@ module __compiler_builtins [system] {
     header "stdint.h"
   }
 
+  explicit module varargs {
+    requires unavailable
+    header "varargs.h"
+  }
+}
+
+module _Builtin_intrinsics [system] {
+  explicit module altivec {
+    requires altivec
+    header "altivec.h"
+  }
+
   explicit module intel {
     requires x86
 
@@ -129,14 +136,12 @@ module __compiler_builtins [system] {
       requires mm3dnow
       header "mm3dnow.h"
     }
+
+    explicit module mm_malloc {
+      header "mm_malloc.h"
+    }
   }
 
-  // FIXME: mm_malloc.h
   // FIXME: tgmath.h
   // FIXME: unwind.h
-
-  explicit module varargs {
-    requires unavailable
-    header "varargs.h"
-  }
 }