diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-08-29 22:12:31 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-08-29 22:12:31 +0000 |
| commit | c6daf73c7241fa3c3803167bf79e68f86b4c2f3f (patch) | |
| tree | 88366f936554736733c4f042dfd7e4877b84a5dd /clang/lib/Driver/ToolChain.cpp | |
| parent | ba2e61b35753a0f53e5a4710ab420a01ba60327b (diff) | |
| download | bcm5719-llvm-c6daf73c7241fa3c3803167bf79e68f86b4c2f3f.tar.gz bcm5719-llvm-c6daf73c7241fa3c3803167bf79e68f86b4c2f3f.zip | |
Restore clang_rt library name on i686-android.
Summary:
Recent changes canonicalized clang_rt library names to refer to
"i386" on all x86 targets. Android historically uses i686.
This change adds a special case to keep i686 in all clang_rt
libraries when targeting Android.
Reviewers: hans, mgorny, beanz
Subscribers: srhines, cfe-commits, llvm-commits
Differential Revision: https://reviews.llvm.org/D37278
llvm-svn: 312048
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 384481b3ea5..93410a7f2a5 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -305,6 +305,10 @@ static StringRef getArchNameForCompilerRTLib(const ToolChain &TC, ? "armhf" : "arm"; + // For historic reasons, Android library is using i686 instead of i386. + if (TC.getArch() == llvm::Triple::x86 && Triple.isAndroid()) + return "i686"; + return llvm::Triple::getArchTypeName(TC.getArch()); } |
