diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 236668f32bba..84a245a4efd0 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -127,13 +127,9 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts,
         Min = Maj - 4;
         Maj = 10;
       }
-    } else if (Triple.getOS() == llvm::Triple::OSX) {
-      Triple.getOSVersion(Maj, Min, Rev);
-      PlatformName = "macosx";
     } else {
-      assert(Triple.getOS() == llvm::Triple::IOS && "unexpected triple!");
       Triple.getOSVersion(Maj, Min, Rev);
-      PlatformName = "ios";
+      PlatformName = Triple.getOSName();
     }
   }
 
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index d7959bde9783..02105ac1847c 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -151,7 +151,7 @@ std::string Darwin::ComputeEffectiveClangTriple(const ArgList &Args) const {
   
   llvm::SmallString<16> Str;
   llvm::raw_svector_ostream(Str)
-    << (isTargetIPhoneOS() ? "ios" : "osx")
+    << (isTargetIPhoneOS() ? "ios" : "macosx")
     << Version[0] << "." << Version[1] << "." << Version[2];
   Triple.setOSName(Str.str());