aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-04-19 23:34:21 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-04-19 23:34:21 +0000
commita4ff648d4a75c752cbdf884c81f4926670f8e6c7 (patch)
treee92b3d4f4b5039190e9125b838d1e09ffec9361f
parent659d23a4e645c1d7a700da05a1b1aabf9fd4c6f3 (diff)
TWEAK
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@129835 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Basic/Targets.cpp2
-rw-r--r--test/Driver/darwin-xarch.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 84a245a4ef..f331c50a21 100644
--- 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 2307e25152..d16d5318f7 100644
--- 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