diff options
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 3f50061..f8b03b6 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -929,9 +929,12 @@ ToolChain::UnwindLibType ToolChain::GetUnwindLibType( unwindLibType = ToolChain::UNW_None; else if (LibName == "platform" || LibName == "") { ToolChain::RuntimeLibType RtLibType = GetRuntimeLibType(Args); - if (RtLibType == ToolChain::RLT_CompilerRT) - unwindLibType = ToolChain::UNW_None; - else if (RtLibType == ToolChain::RLT_Libgcc) + if (RtLibType == ToolChain::RLT_CompilerRT) { + if (getTriple().isAndroid()) + unwindLibType = ToolChain::UNW_CompilerRT; + else + unwindLibType = ToolChain::UNW_None; + } else if (RtLibType == ToolChain::RLT_Libgcc) unwindLibType = ToolChain::UNW_Libgcc; } else if (LibName == "libunwind") { if (GetRuntimeLibType(Args) == RLT_Libgcc) |