From aa7333c860ac651c75da495217e0d6a9c10c0bb0 Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@apple.com>
Date: Sat, 2 Jul 2011 00:20:22 +0000
Subject: [PATCH] Update for llvm commit r134291.

Fixes rdar://9714064


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134292 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Basic/Targets.cpp                                 | 3 ++-
 lib/CodeGen/CGObjC.cpp                                | 4 ++--
 lib/Driver/Tools.cpp                                  | 2 +-
 lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 06bd1c031c..382dcab971 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -189,7 +189,8 @@ protected:
 public:
   DarwinTargetInfo(const std::string& triple) :
     OSTargetInfo<Target>(triple) {
-      this->TLSSupported = llvm::Triple(triple).getDarwinMajorNumber() > 10;
+      llvm::Triple T = llvm::Triple(triple);
+      this->TLSSupported = T.isMacOSX() && !T.isMacOSXVersionLT(10,7);
       this->MCountName = "\01mcount";
     }
 
diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp
index 4c59e6ae29..db9873b817 100644
--- a/lib/CodeGen/CGObjC.cpp
+++ b/lib/CodeGen/CGObjC.cpp
@@ -2461,9 +2461,9 @@ void CodeGenFunction::EmitObjCAutoreleasePoolStmt(
   if (CGM.getLangOptions().ObjCAutoRefCount ||
       (CGM.isTargetDarwin() && 
        ((Triple.getArch() == llvm::Triple::x86_64 && 
-         Triple.getDarwinMajorNumber() >= 11)
+         !Triple.isMacOSXVersionLT(10,7,0))
         || (Triple.getEnvironmentName() == "iphoneos" && 
-            Triple.getDarwinMajorNumber() >= 5)))) {
+            !Triple.isOSVersionLT(5,0))))) {
     llvm::Value *token = EmitObjCAutoreleasePoolPush();
     EHStack.pushCleanup<CallObjCAutoreleasePoolObject>(NormalCleanup, token);
   } else {
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 41be873b35..78d8677a8a 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -870,7 +870,7 @@ shouldUseExceptionTablesForObjCExceptions(unsigned objcABIVersion,
   if (Triple.getOS() != llvm::Triple::Darwin)
     return false;
 
-  return (Triple.getDarwinMajorNumber() >= 9 &&
+  return (!Triple.isMacOSXVersionLT(10,5) &&
           (Triple.getArch() == llvm::Triple::x86_64 ||
            Triple.getArch() == llvm::Triple::arm));  
 }
diff --git a/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp b/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
index dfe0a0e6f5..6c3dfacec3 100644
--- a/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
@@ -282,7 +282,7 @@ void CallAndMessageChecker::emitNilReceiverBug(CheckerContext &C,
 
 static bool supportsNilWithFloatRet(const llvm::Triple &triple) {
   return triple.getVendor() == llvm::Triple::Apple &&
-         (triple.getDarwinMajorNumber() >= 9 || 
+         (!triple.isMacOSXVersionLT(10,5) ||
           triple.getArch() == llvm::Triple::arm || 
           triple.getArch() == llvm::Triple::thumb);
 }
-- 
2.40.0