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 | 1bd91374498ac78e72545f08f4daa6491f9c9d14 (patch) | |
| tree | a58d996cd42b326645318954793ad3acb9831274 /lib/Driver/Tools.cpp | |
| parent | 8b30a9379f730875ba8fb2d0fe2d43611e0c20ff (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149087 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 367edfcd18..e01b5f2a10 100644 --- a/lib/Driver/Tools.cpp +++ b/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"); } |