diff options
author | Bob Wilson <bob.wilson@apple.com> | 2011-10-14 05:03:44 +0000 |
---|---|---|
committer | Bob Wilson <bob.wilson@apple.com> | 2011-10-14 05:03:44 +0000 |
commit | 6524dd33beea0b72ec39d1e090f9c3f64f50257f (patch) | |
tree | d45518b0f5b02f97b1a3df83b73a816cc551533d /clang/lib/Driver/ToolChain.cpp | |
parent | 0368ae071a669bf3d71f5e7c1a11a276d1d0006b (diff) | |
download | bcm5719-llvm-6524dd33beea0b72ec39d1e090f9c3f64f50257f.tar.gz bcm5719-llvm-6524dd33beea0b72ec39d1e090f9c3f64f50257f.zip |
Use Triple.isOSDarwin() instead of comparing against Triple::Darwin.
There are now separate Triple::MacOSX and Triple::IOS values for the OS
so comparing against Triple::Darwin will fail to match those. Note that
I changed the expected output for the Driver/rewrite-objc.m test, which had
previously not been passing Darwin-specific options with the macosx triple.
llvm-svn: 141944
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
-rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 074f1a34813..d09ab16814a 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -185,8 +185,7 @@ std::string ToolChain::ComputeLLVMTriple(const ArgList &Args, // FIXME: Thumb should just be another -target-feaure, not in the triple. StringRef Suffix = getLLVMArchSuffixForARM(getARMTargetCPU(Args, Triple)); - bool ThumbDefault = - (Suffix == "v7" && getTriple().getOS() == llvm::Triple::Darwin); + bool ThumbDefault = (Suffix == "v7" && getTriple().isOSDarwin()); std::string ArchName = "arm"; // Assembly files should start in ARM mode. |