[cfe-commits] r129835 - in /cfe/trunk: lib/Basic/Targets.cpp test/Driver/darwin-xarch.c

[Daniel Dunbar]

Author: ddunbar
Date: Tue Apr 19 18:34:21 2011
New Revision: 129835

URL: http://llvm.org/viewvc/llvm-project?rev=129835&view=rev
Log:
TWEAK

Modified:
    cfe/trunk/lib/Basic/Targets.cpp
    cfe/trunk/test/Driver/darwin-xarch.c

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=129835&r1=129834&r2=129835&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Tue Apr 19 18:34:21 2011
@@ -129,7 +129,7 @@
       }
     } else {
       Triple.getOSVersion(Maj, Min, Rev);
-      PlatformName = Triple.getOSName();
+      PlatformName = llvm::Triple::getOSTypeName(Triple.getOS());
     }
   }
 

Modified: cfe/trunk/test/Driver/darwin-xarch.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-xarch.c?rev=129835&r1=129834&r2=129835&view=diff
==============================================================================
--- cfe/trunk/test/Driver/darwin-xarch.c (original)
+++ cfe/trunk/test/Driver/darwin-xarch.c Tue Apr 19 18:34:21 2011
@@ -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