diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-03-20 00:50:21 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-03-20 00:50:21 +0000 |
| commit | 47d25b18dbf5bf8fa11ae8b4ddd7ddddfa88c253 (patch) | |
| tree | 878d3e12a4d288cb1fabcde4cfbd9e5b0c551d40 /clang/lib | |
| parent | 3dc10b530e968f0df464833ae1f1ec9401a87724 (diff) | |
| download | llvm-47d25b18dbf5bf8fa11ae8b4ddd7ddddfa88c253.zip llvm-47d25b18dbf5bf8fa11ae8b4ddd7ddddfa88c253.tar.gz llvm-47d25b18dbf5bf8fa11ae8b4ddd7ddddfa88c253.tar.bz2 | |
Driver: Fix possible crash when targetting an unknown (unsupported) Darwin
platform, e.g. ppc.
llvm-svn: 99016
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/ToolChains.h | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChains.h b/clang/lib/Driver/ToolChains.h index 6dd64de..0d5b2a3 100644 --- a/clang/lib/Driver/ToolChains.h +++ b/clang/lib/Driver/ToolChains.h @@ -96,6 +96,8 @@ public: return TargetIsIPhoneOS; } + bool isTargetInitialized() const { return TargetInitialized; } + void getTargetVersion(unsigned (&Res)[3]) const { assert(TargetInitialized && "Target not initialized!"); Res[0] = TargetVersion[0]; diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 86b4685..58a4cdb 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -655,6 +655,12 @@ static std::string getEffectiveClangTriple(const Driver &D, } else { const toolchains::Darwin &DarwinTC( reinterpret_cast<const toolchains::Darwin&>(TC)); + + // If the target isn't initialized (e.g., an unknown Darwin platform, return + // the default triple). + if (!DarwinTC.isTargetInitialized()) + return Triple.getTriple(); + unsigned Version[3]; DarwinTC.getTargetVersion(Version); |