summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/clang.xcodeproj/project.pbxproj4
-rw-r--r--clang/lib/Basic/Targets.cpp3
-rw-r--r--clang/lib/Lex/Preprocessor.cpp2
3 files changed, 5 insertions, 4 deletions
diff --git a/clang/clang.xcodeproj/project.pbxproj b/clang/clang.xcodeproj/project.pbxproj
index eea26955cbd..ae90e3556bd 100644
--- a/clang/clang.xcodeproj/project.pbxproj
+++ b/clang/clang.xcodeproj/project.pbxproj
@@ -862,13 +862,13 @@
DE3985780CB8ADC800223765 /* ASTConsumers.h */,
DE39857A0CB8ADCB00223765 /* ASTConsumers.cpp */,
DE38CF150D8C9DE000A273B6 /* DiagChecker.cpp */,
+ 72D16C210D9975EA00E6DA4A /* HTMLPrint.cpp */,
DE5932CF0AD60FF400BC794C /* PrintParserCallbacks.cpp */,
DE5932D00AD60FF400BC794C /* PrintPreprocessedOutput.cpp */,
- 352981080CC58344008B5E84 /* SerializationTest.cpp */,
- 72D16C210D9975EA00E6DA4A /* HTMLPrint.cpp */,
9030C1090E807A9300941490 /* RewriteBlocks.cpp */,
DEA0EBD90DD2D3C8007A02A9 /* RewriteMacros.cpp */,
035611E10DB40C8100D2EF2A /* RewriteObjC.cpp */,
+ 352981080CC58344008B5E84 /* SerializationTest.cpp */,
);
name = Driver;
sourceTree = "<group>";
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 9454e348a9c..6139f9d9e09 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -42,7 +42,8 @@ static void getSolarisDefines(std::vector<char> &Defs) {
static void getDarwinDefines(std::vector<char> &Defs) {
Define(Defs, "__APPLE__");
Define(Defs, "__MACH__");
-
+ Define(Defs, "__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1050");
+
if (0) // darwin_pascal_strings
Define(Defs, "__PASCAL_STRINGS__");
}
diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp
index 691f46ac2d1..3f477c296c1 100644
--- a/clang/lib/Lex/Preprocessor.cpp
+++ b/clang/lib/Lex/Preprocessor.cpp
@@ -428,8 +428,8 @@ static void InitializePredefinedMacros(Preprocessor &PP,
DefineBuiltinMacro(Buf, "__clang__=1"); // Clang Frontend
// Compiler set macros.
+ // Claim to be GCC 4.2.1-5621
DefineBuiltinMacro(Buf, "__APPLE_CC__=5621");
- DefineBuiltinMacro(Buf, "__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1050");
DefineBuiltinMacro(Buf, "__GNUC_MINOR__=2");
DefineBuiltinMacro(Buf, "__GNUC_PATCHLEVEL__=1");
DefineBuiltinMacro(Buf, "__GNUC__=4");
OpenPOWER on IntegriCloud