summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Basic/Targets.cpp5
-rw-r--r--clang/lib/Lex/Preprocessor.cpp5
2 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 4cf7e7bb8aa..ac48e23f759 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -48,6 +48,11 @@ public:
Define(Defs, "__APPLE__");
Define(Defs, "__MACH__");
#endif
+
+/* FIXME. we may also need to distinguish between darwin and linux targets */
+#ifdef linux
+ Define(Defs, "linux");
+#endif
if (1) {// -fobjc-gc controls this.
Define(Defs, "__weak", "");
diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp
index 577e64a5cfe..32ee8f0c817 100644
--- a/clang/lib/Lex/Preprocessor.cpp
+++ b/clang/lib/Lex/Preprocessor.cpp
@@ -433,11 +433,6 @@ static void InitializePredefinedMacros(Preprocessor &PP,
DefineBuiltinMacro(Buf, "__FINITE_MATH_ONLY__=0");
DefineBuiltinMacro(Buf, "__NO_INLINE__=1");
DefineBuiltinMacro(Buf, "__PIC__=1");
-
-/* FIXME: this check should be moved to the configure process */
-#ifdef linux
- DefineBuiltinMacro(Buf, "linux=1");
-#endif
if (PP.getLangOptions().CPlusPlus) {
OpenPOWER on IntegriCloud