TWEAK

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@129835 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 84a245a4efd09ea0f7e88f817178979047624d04..f331c50a21963587f1f984371fb80f6c89acdb5e 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/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/test/Driver/darwin-xarch.c b/test/Driver/darwin-xarch.c
index 2307e251525402299a7711d2b0b98643b6e65b91..d16d5318f7f8d9ea6e09f46bd03b34b8103c2a47 100644 (file)
--- a/test/Driver/darwin-xarch.c
+++ b/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