Deleted Added
sdiff udiff text old ( 218893 ) new ( 219011 )
full compact
Tools.cpp (218893) Tools.cpp (219011)
1//===--- Tools.cpp - Tools Implementations --------------------------------===//
2//
3// The LLVM Compiler Infrastructure
4//
5// This file is distributed under the University of Illinois Open Source
6// License. See LICENSE.TXT for details.
7//
8//===----------------------------------------------------------------------===//

--- 3192 unchanged lines hidden (view full) ---

3201 CmdArgs.push_back(Args.MakeArgString(
3202 getToolChain().GetFilePath("crti.o")));
3203 CmdArgs.push_back(Args.MakeArgString(
3204 getToolChain().GetFilePath("crtbeginS.o")));
3205 }
3206 }
3207
3208 Args.AddAllArgs(CmdArgs, options::OPT_L);
1//===--- Tools.cpp - Tools Implementations --------------------------------===//
2//
3// The LLVM Compiler Infrastructure
4//
5// This file is distributed under the University of Illinois Open Source
6// License. See LICENSE.TXT for details.
7//
8//===----------------------------------------------------------------------===//

--- 3192 unchanged lines hidden (view full) ---

3201 CmdArgs.push_back(Args.MakeArgString(
3202 getToolChain().GetFilePath("crti.o")));
3203 CmdArgs.push_back(Args.MakeArgString(
3204 getToolChain().GetFilePath("crtbeginS.o")));
3205 }
3206 }
3207
3208 Args.AddAllArgs(CmdArgs, options::OPT_L);
3209 CmdArgs.push_back("-L/usr/lib");
3209
3210 const ToolChain::path_list Paths = getToolChain().getFilePaths();
3211 for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end();
3212 i != e; ++i)
3213 CmdArgs.push_back(Args.MakeArgString(llvm::StringRef("-L") + *i));
3214
3210 Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
3211 Args.AddAllArgs(CmdArgs, options::OPT_e);
3212 Args.AddAllArgs(CmdArgs, options::OPT_s);
3213 Args.AddAllArgs(CmdArgs, options::OPT_t);
3214 Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);
3215 Args.AddAllArgs(CmdArgs, options::OPT_r);
3216
3217 AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);

--- 345 unchanged lines hidden (view full) ---

3563 else
3564 crtbegin = "crtbegin.o";
3565 CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
3566 }
3567
3568 Args.AddAllArgs(CmdArgs, options::OPT_L);
3569
3570 const ToolChain::path_list Paths = ToolChain.getFilePaths();
3215 Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
3216 Args.AddAllArgs(CmdArgs, options::OPT_e);
3217 Args.AddAllArgs(CmdArgs, options::OPT_s);
3218 Args.AddAllArgs(CmdArgs, options::OPT_t);
3219 Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);
3220 Args.AddAllArgs(CmdArgs, options::OPT_r);
3221
3222 AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);

--- 345 unchanged lines hidden (view full) ---

3568 else
3569 crtbegin = "crtbegin.o";
3570 CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
3571 }
3572
3573 Args.AddAllArgs(CmdArgs, options::OPT_L);
3574
3575 const ToolChain::path_list Paths = ToolChain.getFilePaths();
3576 for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end();
3577 i != e; ++i)
3578 CmdArgs.push_back(Args.MakeArgString(llvm::StringRef("-L") + *i));
3571
3579
3572 for (ToolChain::path_list::const_iterator i = Paths.begin(),
3573 e = Paths.end();
3574 i != e; ++i) {
3575 const std::string &s = *i;
3576 CmdArgs.push_back(Args.MakeArgString(std::string("-L") + s));
3577 }
3578
3579 AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs);
3580
3581 if (D.CCCIsCXX && !Args.hasArg(options::OPT_nostdlib)) {
3582 ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
3583 CmdArgs.push_back("-lm");
3584 }
3585
3586 if (Args.hasArg(options::OPT_static))

--- 323 unchanged lines hidden --- 		3580 AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs);
3581
3582 if (D.CCCIsCXX && !Args.hasArg(options::OPT_nostdlib)) {
3583 ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
3584 CmdArgs.push_back("-lm");
3585 }
3586
3587 if (Args.hasArg(options::OPT_static))

--- 323 unchanged lines hidden ---