From d6aff018d446f22be4e4e0277080ebfa5b157288 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Tue, 23 Jun 2009 14:50:21 +0000 Subject: Import Clang r73954. --- lib/Basic/SourceManager.cpp | 5 ++++- lib/Basic/Targets.cpp | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/Basic') diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index 8dfc5d100e859..23a01c953a46c 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -373,7 +373,10 @@ FileID SourceManager::createFileID(const ContentCache *File, // Set LastFileIDLookup to the newly created file. The next getFileID call is // almost guaranteed to be from that file. - return LastFileIDLookup = FileID::get(SLocEntryTable.size()-1); + FileID FID = FileID::get(SLocEntryTable.size()-1); + if (File->FirstFID.isInvalid()) + File->FirstFID = FID; + return LastFileIDLookup = FID; } /// createInstantiationLoc - Return a new SourceLocation that encodes the fact diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 13758ad183081..1d69e4e96efae 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -169,6 +169,7 @@ static bool getDarwinNumber(const char *Triple, unsigned &Maj, unsigned &Min, un } static void getDarwinDefines(std::vector &Defs, const LangOptions &Opts) { + Define(Defs, "__APPLE_CC__", "5621"); Define(Defs, "__APPLE__"); Define(Defs, "__MACH__"); Define(Defs, "OBJC_NEW_PROPERTIES"); -- cgit v1.2.3