diff options
author | Yaron Keren <yaron.keren@gmail.com> | 2015-08-09 00:24:07 +0000 |
---|---|---|
committer | Yaron Keren <yaron.keren@gmail.com> | 2015-08-09 00:24:07 +0000 |
commit | aa2813325fba721192c52ef6181e7d1781c7beeb (patch) | |
tree | 31401103dadc734dabbc1c31e16680a4fe2f5cdd /clang/lib/Driver/Tools.cpp | |
parent | 55f097fa8ee1383a37d818f52d93285814d98c63 (diff) | |
download | llvm-aa2813325fba721192c52ef6181e7d1781c7beeb.zip llvm-aa2813325fba721192c52ef6181e7d1781c7beeb.tar.gz llvm-aa2813325fba721192c52ef6181e7d1781c7beeb.tar.bz2 |
Teach mingw toolchain driver to properly emit static or dynamic linking of ligcc.
Implemented in MinGW::Linker::AddLibGCC since AddLibgcc is a logic puzzle even
before adding one more boolean. A first step towards simplification of AddLibgcc
would be to factor out the Android AddLibgcc code into its own routine.
llvm-svn: 244407
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r-- | clang/lib/Driver/Tools.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index f23765b..b82b5f0 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -9083,8 +9083,24 @@ void MinGW::Linker::AddLibGCC(const ArgList &Args, CmdArgs.push_back("-lmingwthrd"); CmdArgs.push_back("-lmingw32"); - // Add libgcc or compiler-rt. - AddRunTimeLibs(getToolChain(), getToolChain().getDriver(), CmdArgs, Args); + // Make use of compiler-rt if --rtlib option is used + ToolChain::RuntimeLibType RLT = getToolChain().GetRuntimeLibType(Args); + if (RLT == ToolChain::RLT_Libgcc) { + bool Static = Args.hasArg(options::OPT_static_libgcc) || + Args.hasArg(options::OPT_static); + bool Shared = Args.hasArg(options::OPT_shared); + bool CXX = getToolChain().getDriver().CCCIsCXX(); + + if (Static || (!CXX && !Shared)) { + CmdArgs.push_back("-lgcc"); + CmdArgs.push_back("-lgcc_eh"); + } else { + CmdArgs.push_back("-lgcc_s"); + CmdArgs.push_back("-lgcc"); + } + } else { + AddRunTimeLibs(getToolChain(), getToolChain().getDriver(), CmdArgs, Args); + } CmdArgs.push_back("-lmoldname"); CmdArgs.push_back("-lmingwex"); |