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.

llvm-svn: 149434

1 files changed, 8 insertions, 4 deletions

diff --git a/clang/test/Modules/compiler_builtins.m b/clang/test/Modules/compiler_builtins.m
index 283ff0eefe1..d5b58b06fff 100644
--- a/clang/test/Modules/compiler_builtins.m
+++ b/clang/test/Modules/compiler_builtins.m
@@ -1,20 +1,24 @@
 // RUN: rm -rf %t
 // RUN: %clang -fsyntax-only -fmodules -fmodule-cache-path %t %s -Xclang -verify
 
-@import __compiler_builtins.float_constants;
+@import _Builtin_stdlib.float_constants;
 
 float getFltMax() { return FLT_MAX; }
 
-@import __compiler_builtins.limits;
+@import _Builtin_stdlib.limits;
 
 char getCharMax() { return CHAR_MAX; }
 
 size_t size; // expected-error{{unknown type name 'size_t'}}
 
+@import _Builtin_stdlib.stdint;
+
+intmax_t value;
+
 #ifdef __SSE__
-@import __compiler_builtins.intel.sse;
+@import _Builtin_intrinsics.intel.sse;
 #endif
 
 #ifdef __AVX2__
-@import __compiler_builtins.intel.avx2;
+@import _Builtin_intrinsics.intel.avx2;
 #endif