diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2012-01-26 22:27:52 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2012-01-26 22:27:52 +0000 |
| commit | d64c60e534d571a127806303dfeeec3d433c2ee5 (patch) | |
| tree | 35b42f609346f182938255bd04f002160a6b7de8 /clang/lib/Driver/Tools.cpp | |
| parent | a7a61e270183eb36f8353d049a1892a59f459deb (diff) | |
| download | bcm5719-llvm-d64c60e534d571a127806303dfeeec3d433c2ee5.tar.gz bcm5719-llvm-d64c60e534d571a127806303dfeeec3d433c2ee5.zip | |
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
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 367edfcd18a..e01b5f2a109 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -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"); } |
