From fcd2389b7a3d06f45d9ce5269deff07ae6944932 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Tue, 19 Apr 2011 23:34:21 +0000
Subject: [PATCH] TWEAK

llvm-svn: 129835
---
 clang/lib/Basic/Targets.cpp      | 2 +-
 clang/test/Driver/darwin-xarch.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 84a245a4efd0..f331c50a2196 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -129,7 +129,7 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts,
       }
     } else {
       Triple.getOSVersion(Maj, Min, Rev);
-      PlatformName = Triple.getOSName();
+      PlatformName = llvm::Triple::getOSTypeName(Triple.getOS());
     }
   }
 
diff --git a/clang/test/Driver/darwin-xarch.c b/clang/test/Driver/darwin-xarch.c
index 2307e2515254..d16d5318f7f8 100644
--- a/clang/test/Driver/darwin-xarch.c
+++ b/clang/test/Driver/darwin-xarch.c
@@ -4,8 +4,8 @@
 // RUN:   -c %s 2> %t
 // RUN: FileCheck --check-prefix=CHECK-COMPILE < %t %s
 //
-// CHECK-COMPILE: clang{{.*}}" "-cc1" "-triple" "i386-apple-osx10.4.0" 
-// CHECK-COMPILE: clang{{.*}}" "-cc1" "-triple" "x86_64-apple-osx10.5.0"
+// CHECK-COMPILE: clang{{.*}}" "-cc1" "-triple" "i386-apple-macosx10.4.0" 
+// CHECK-COMPILE: clang{{.*}}" "-cc1" "-triple" "x86_64-apple-macosx10.5.0"
 
 // RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### \
 // RUN:   -arch i386 -Xarch_i386 -Wl,-some-linker-arg -filelist X 2> %t