diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Driver/ToolChain.cpp | 4 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 2 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.h | 4 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp index e9a612c4cd..98109fdd46 100644 --- a/lib/Driver/ToolChain.cpp +++ b/lib/Driver/ToolChain.cpp @@ -208,8 +208,8 @@ void ToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &Args, } } -void ToolChain::AddClangCXXStdlibLibArgs(const ArgList &Args, - ArgStringList &CmdArgs) const { +void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args, + ArgStringList &CmdArgs) const { CXXStdlibType Type = GetCXXStdlibType(Args); switch (Type) { diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 865f290422..c1b44e45eb 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -578,7 +578,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const { setTarget(iPhoneVersion, Major, Minor, Micro); } -void DarwinClang::AddClangCXXStdlibLibArgs(const ArgList &Args, +void DarwinClang::AddCXXStdlibLibArgs(const ArgList &Args, ArgStringList &CmdArgs) const { CXXStdlibType Type = GetCXXStdlibType(Args); diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index f806e9f215..6062855265 100644 --- a/lib/Driver/ToolChains.h +++ b/lib/Driver/ToolChains.h @@ -223,8 +223,8 @@ public: virtual void AddLinkRuntimeLibArgs(const ArgList &Args, ArgStringList &CmdArgs) const; - virtual void AddClangCXXStdlibLibArgs(const ArgList &Args, - ArgStringList &CmdArgs) const; + virtual void AddCXXStdlibLibArgs(const ArgList &Args, + ArgStringList &CmdArgs) const; /// } }; diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 6d66af50c5..1e1af35478 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -115,7 +115,7 @@ static void AddLinkerInputs(const ToolChain &TC, // Handle reserved library options. if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx)) { - TC.AddClangCXXStdlibLibArgs(Args, CmdArgs); + TC.AddCXXStdlibLibArgs(Args, CmdArgs); } else A.renderAsInput(Args, CmdArgs); } @@ -2540,7 +2540,7 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nodefaultlibs)) { if (getToolChain().getDriver().CCCIsCXX) - getToolChain().AddClangCXXStdlibLibArgs(Args, CmdArgs); + getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs); // link_ssp spec is empty. @@ -2802,7 +2802,7 @@ void openbsd::Link::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nodefaultlibs)) { if (D.CCCIsCXX) { - getToolChain().AddClangCXXStdlibLibArgs(Args, CmdArgs); + getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs); CmdArgs.push_back("-lm"); } @@ -2932,7 +2932,7 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nodefaultlibs)) { if (D.CCCIsCXX) { - getToolChain().AddClangCXXStdlibLibArgs(Args, CmdArgs); + getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs); CmdArgs.push_back("-lm"); } // FIXME: For some reason GCC passes -lgcc and -lgcc_s before adding @@ -3067,7 +3067,7 @@ void minix::Link::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nodefaultlibs)) { if (D.CCCIsCXX) { - getToolChain().AddClangCXXStdlibLibArgs(Args, CmdArgs); + getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs); CmdArgs.push_back("-lm"); } @@ -3202,7 +3202,7 @@ void dragonfly::Link::ConstructJob(Compilation &C, const JobAction &JA, } if (D.CCCIsCXX) { - getToolChain().AddClangCXXStdlibLibArgs(Args, CmdArgs); + getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs); CmdArgs.push_back("-lm"); } |