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

Remove the ToolTriple logic in NetBSD, which was completely broken by 

the recent refactoring. All interesting NetBSD release have a GNU as
version on i386 that supports --32, so don't bother with the conditional
setting of it.

llvm-svn: 149087
This commit is contained in:
Joerg Sonnenberger 2012-01-26 22:27:52 +00:00
parent a7a61e2701
commit d64c60e534
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Driver/ToolChains.cpp
View File

@ -1710,10 +1710,10 @@ Tool &NetBSD::SelectTool(const Compilation &C, const JobAction &JA,
if (UseIntegratedAs)
T = new tools::ClangAs(*this);
else
T = new tools::netbsd::Assemble(*this, getTriple());
T = new tools::netbsd::Assemble(*this);
break;
case Action::LinkJobClass:
T = new tools::netbsd::Link(*this, getTriple());
T = new tools::netbsd::Link(*this);
break;
default:
T = &Generic_GCC::SelectTool(C, JA, Inputs);

6
clang/lib/Driver/Tools.cpp
View File

@ -4540,8 +4540,7 @@ void netbsd::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
// When building 32-bit code on NetBSD/amd64, we have to explicitly
// instruct as in the base system to assemble 32-bit code.
if (ToolTriple.getArch() == llvm::Triple::x86_64 &&
getToolChain().getArch() == llvm::Triple::x86)
if (getToolChain().getArch() == llvm::Triple::x86)
CmdArgs.push_back("--32");
@ -4594,8 +4593,7 @@ void netbsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
// When building 32-bit code on NetBSD/amd64, we have to explicitly
// instruct ld in the base system to link 32-bit code.
if (ToolTriple.getArch() == llvm::Triple::x86_64 &&
getToolChain().getArch() == llvm::Triple::x86) {
if (getToolChain().getArch() == llvm::Triple::x86) {
CmdArgs.push_back("-m");
CmdArgs.push_back("elf_i386");
}

12
clang/lib/Driver/Tools.h
View File

@ -396,12 +396,10 @@ namespace freebsd {
/// netbsd -- Directly call GNU Binutils assembler and linker
namespace netbsd {
class LLVM_LIBRARY_VISIBILITY Assemble : public Tool {
private:
const llvm::Triple ToolTriple;
public:
Assemble(const ToolChain &TC, const llvm::Triple &ToolTriple)
: Tool("netbsd::Assemble", "assembler", TC), ToolTriple(ToolTriple) {}
Assemble(const ToolChain &TC)
: Tool("netbsd::Assemble", "assembler", TC) {}
virtual bool hasIntegratedCPP() const { return false; }
@ -412,12 +410,10 @@ namespace netbsd {
const char *LinkingOutput) const;
};
class LLVM_LIBRARY_VISIBILITY Link : public Tool {
private:
const llvm::Triple ToolTriple;
public:
Link(const ToolChain &TC, const llvm::Triple &ToolTriple)
: Tool("netbsd::Link", "linker", TC), ToolTriple(ToolTriple) {}
Link(const ToolChain &TC)
: Tool("netbsd::Link", "linker", TC) {}
virtual bool hasIntegratedCPP() const { return false; }