This revision was automatically updated to reflect the committed changes. Closed by commit rL253467: [Myriad]: insert -L paths into linker cmd only when they exist. (authored by dougk).
Changed prior to commit: http://reviews.llvm.org/D14754?vs=40442&id=40516#toc Repository: rL LLVM http://reviews.llvm.org/D14754 Files: cfe/trunk/lib/Driver/ToolChains.cpp cfe/trunk/lib/Driver/ToolChains.h cfe/trunk/lib/Driver/Tools.cpp cfe/trunk/test/Driver/Inputs/basic_myriad_tree/lib/gcc/sparc-myriad-elf/4.8.2/crtend.o cfe/trunk/test/Driver/Inputs/basic_myriad_tree/lib/gcc/sparc-myriad-elf/4.8.2/crti.o cfe/trunk/test/Driver/Inputs/basic_myriad_tree/lib/gcc/sparc-myriad-elf/4.8.2/crtn.o cfe/trunk/test/Driver/Inputs/basic_myriad_tree/sparc-myriad-elf/lib/crt0.o
Index: cfe/trunk/lib/Driver/ToolChains.h =================================================================== --- cfe/trunk/lib/Driver/ToolChains.h +++ cfe/trunk/lib/Driver/ToolChains.h @@ -1068,8 +1068,6 @@ const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; Tool *SelectTool(const JobAction &JA) const override; - void getCompilerSupportDir(std::string &Dir) const; - void getBuiltinLibDir(std::string &Dir) const; unsigned GetDefaultDwarfVersion() const override { return 2; } protected: Index: cfe/trunk/lib/Driver/ToolChains.cpp =================================================================== --- cfe/trunk/lib/Driver/ToolChains.cpp +++ cfe/trunk/lib/Driver/ToolChains.cpp @@ -4367,6 +4367,26 @@ case llvm::Triple::shave: GCCInstallation.init(Triple, Args, {"sparc-myriad-elf"}); } + + if (GCCInstallation.isValid()) { + // The contents of LibDir are independent of the version of gcc. + // This contains libc, libg (a superset of libc), libm, libstdc++, libssp. + SmallString<128> LibDir(GCCInstallation.getParentLibPath()); + if (Triple.getArch() == llvm::Triple::sparcel) + llvm::sys::path::append(LibDir, "../sparc-myriad-elf/lib/le"); + else + llvm::sys::path::append(LibDir, "../sparc-myriad-elf/lib"); + addPathIfExists(D, LibDir, getFilePaths()); + + // This directory contains crt{i,n,begin,end}.o as well as libgcc. + // These files are tied to a particular version of gcc. + SmallString<128> CompilerSupportDir(GCCInstallation.getInstallPath()); + // There are actually 4 choices: {le,be} x {fpu,nofpu} + // but as this toolchain is for LEON sparc, it can assume FPU. + if (Triple.getArch() == llvm::Triple::sparcel) + llvm::sys::path::append(CompilerSupportDir, "le"); + addPathIfExists(D, CompilerSupportDir, getFilePaths()); + } } MyriadToolChain::~MyriadToolChain() {} @@ -4413,27 +4433,6 @@ } } -void MyriadToolChain::getCompilerSupportDir(std::string &Dir) const { - // This directory contains crt{i,n,begin,end}.o as well as libgcc. - // These files are tied to a particular version of gcc. - SmallString<128> Result(GCCInstallation.getInstallPath()); - // There are actually 4 choices: {le,be} x {fpu,nofpu} - // but as this toolchain is for LEON sparc, it can assume FPU. - if (this->getTriple().getArch() == llvm::Triple::sparcel) - llvm::sys::path::append(Result, "le"); - Dir.assign(Result.str()); -} -void MyriadToolChain::getBuiltinLibDir(std::string &Dir) const { - // The contents of LibDir are independent of the version of gcc. - // This contains libc, libg (a superset of libc), libm, libstdc++, libssp. - SmallString<128> Result(GCCInstallation.getParentLibPath()); - if (this->getTriple().getArch() == llvm::Triple::sparcel) - llvm::sys::path::append(Result, "../sparc-myriad-elf/lib/le"); - else - llvm::sys::path::append(Result, "../sparc-myriad-elf/lib"); - Dir.assign(Result.str()); -} - Tool *MyriadToolChain::buildLinker() const { return new tools::Myriad::Linker(*this); } Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -9945,10 +9945,6 @@ bool UseDefaultLibs = !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs); - std::string StartFilesDir, BuiltinLibDir; - TC.getCompilerSupportDir(StartFilesDir); - TC.getBuiltinLibDir(BuiltinLibDir); - if (T.getArch() == llvm::Triple::sparc) CmdArgs.push_back("-EB"); else // SHAVE assumes little-endian, and sparcel is expressly so. @@ -9972,19 +9968,15 @@ if (UseStartfiles) { // If you want startfiles, it means you want the builtin crti and crtbegin, // but not crt0. Myriad link commands provide their own crt0.o as needed. - CmdArgs.push_back(Args.MakeArgString(StartFilesDir + "/crti.o")); - CmdArgs.push_back(Args.MakeArgString(StartFilesDir + "/crtbegin.o")); + CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath("crti.o"))); + CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath("crtbegin.o"))); } Args.AddAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group, options::OPT_e, options::OPT_s, options::OPT_t, options::OPT_Z_Flag, options::OPT_r}); - // The linker doesn't use these builtin paths unless directed to, - // because it was not compiled for support with sysroots, nor does - // it have a default of little-endian with FPU. - CmdArgs.push_back(Args.MakeArgString("-L" + BuiltinLibDir)); - CmdArgs.push_back(Args.MakeArgString("-L" + StartFilesDir)); + TC.AddFilePathLibArgs(Args, CmdArgs); AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs); @@ -10004,8 +9996,8 @@ CmdArgs.push_back("-lgcc"); } if (UseStartfiles) { - CmdArgs.push_back(Args.MakeArgString(StartFilesDir + "/crtend.o")); - CmdArgs.push_back(Args.MakeArgString(StartFilesDir + "/crtn.o")); + CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath("crtend.o"))); + CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath("crtn.o"))); } std::string Exec =
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits