aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2012-01-29 22:35:57 +0000
committerDouglas Gregor <dgregor@apple.com>2012-01-29 22:35:57 +0000
commit5ad2649083d75f2d3cfac7b56e0dc391d6e29541 (patch)
tree9a3ca7be2b978f62287a6eab62b9832a2a2feb2a
parentfe225e4aa34e37f26ea45270a18c986bd23a1b7f (diff)
If there's no math.h, then tgmath.h should just be empty
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149209 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Headers/tgmath.h2
-rw-r--r--test/Modules/compiler_builtins.m5
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Headers/tgmath.h b/lib/Headers/tgmath.h
index 1b0b9d24c1..0617ae2ddb 100644
--- a/lib/Headers/tgmath.h
+++ b/lib/Headers/tgmath.h
@@ -26,6 +26,7 @@
#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. */
@@ -1354,4 +1355,5 @@ 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 254494a242..3cf24142d3 100644
--- 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 %s
+// RUN: %clang_cc1 -fmodules -fmodule-cache-path %t -verify %s
@import __compiler_builtins.float_constants;
@@ -9,5 +9,4 @@ float getFltMax() { return FLT_MAX; }
char getCharMax() { return CHAR_MAX; }
-// FIXME: Re-enable this test.
-//size_t size; // expected-error{{unknown type name 'size_t'}}
+size_t size; // expected-error{{unknown type name 'size_t'}}