maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r341107. That change breaks lto-android in a way is untested. 

llvm-svn: 341114
This commit is contained in:
Sterling Augustine 2018-08-30 20:42:49 +00:00
parent c044509851
commit 3572b0bd5d
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
clang/lib/Driver/ToolChains/CommonArgs.cpp
View File

@ -1126,41 +1126,23 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
bool IsIAMCU = Triple.isOSIAMCU();
bool StaticLibgcc = Args.hasArg(options::OPT_static_libgcc) ||
Args.hasArg(options::OPT_static);
// The driver ignores -shared-libgcc and therefore treats such cases as
// unspecified. Breaking out the two variables as below makes the current
// behavior explicit.
bool UnspecifiedLibgcc = !StaticLibgcc;
bool SharedLibgcc = !StaticLibgcc;
// Gcc adds libgcc arguments in various ways:
//
// gcc <none>: -lgcc --as-needed -lgcc_s --no-as-needed
// g++ <none>: -lgcc_s -lgcc
// gcc shared: -lgcc_s -lgcc
// g++ shared: -lgcc_s -lgcc
// gcc static: -lgcc -lgcc_eh
// g++ static: -lgcc -lgcc_eh
//
// Also, certain targets need additional adjustments.
bool LibGccFirst = (D.CCCIsCC() && UnspecifiedLibgcc) || StaticLibgcc;
if (LibGccFirst)
if (!D.CCCIsCXX())
CmdArgs.push_back("-lgcc");
bool AsNeeded = D.CCCIsCC() && !StaticLibgcc && !isCygMing;
if (AsNeeded)
CmdArgs.push_back("--as-needed");
if (UnspecifiedLibgcc || SharedLibgcc)
if (StaticLibgcc || isAndroid) {
if (D.CCCIsCXX())
CmdArgs.push_back("-lgcc");
} else {
if (!D.CCCIsCXX() && !isCygMing)
CmdArgs.push_back("--as-needed");
CmdArgs.push_back("-lgcc_s");
if (!D.CCCIsCXX() && !isCygMing)
CmdArgs.push_back("--no-as-needed");
}
else if (StaticLibgcc && !isAndroid && !IsIAMCU)
if (StaticLibgcc && !isAndroid && !IsIAMCU)
CmdArgs.push_back("-lgcc_eh");
if (AsNeeded)
CmdArgs.push_back("--no-as-needed");
if (!LibGccFirst)
else if (!Args.hasArg(options::OPT_shared) && D.CCCIsCXX())
CmdArgs.push_back("-lgcc");
// According to Android ABI, we have to link with libdl if we are