Alternate fix to the modules failures that doesn't require us to tweak tgmath.h

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

diff --git a/lib/Headers/tgmath.h b/lib/Headers/tgmath.h
index 0617ae2ddb3a23dfd7f28243b145d9ffd11c6937..1b0b9d24c1d52d90d025c8b199a97b32c7ec42dc 100644 (file)
--- a/lib/Headers/tgmath.h
+++ b/lib/Headers/tgmath.h
@@ -26,7 +26,6 @@
 #define __TGMATH_H
 
 /* C99 7.22 Type-generic math <tgmath.h>. */
-#if __has_include(<math.h>)
 #include <math.h>
 
 /* C++ handles type genericity with overloading in math.h. */
@@ -1355,5 +1354,4 @@ static long double
 #undef _TG_ATTRS
 
 #endif /* __cplusplus */
-#endif /* __has_include(<math.h>) */
 #endif /* __TGMATH_H */

diff --git a/test/Modules/compiler_builtins.m b/test/Modules/compiler_builtins.m
index 3cf24142d33a9e1c1c35ce1c1ce1f08f950c7549..52db15c24a0830521506ae91ca3046e7ed80a4ed 100644 (file)
--- a/test/Modules/compiler_builtins.m
+++ b/test/Modules/compiler_builtins.m
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules -fmodule-cache-path %t -verify %s
+// RUN: %clang -fsyntax-only -fmodules -fmodule-cache-path %t -Xclang -verify %s
 
 @import __compiler_builtins.float_constants;