diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-12-06 19:12:59 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-12-06 19:12:59 +0000 |
| commit | 182fc2d652e46c3966d9545061471434270e2457 (patch) | |
| tree | ee4b87faaf38aa7de69d43227289eff409423607 | |
| parent | cf660bd73e72b6ac36cd4512828cd2ef992f119e (diff) | |
| download | clang-182fc2d652e46c3966d9545061471434270e2457.tar.gz clang-182fc2d652e46c3966d9545061471434270e2457.tar.bz2 clang-182fc2d652e46c3966d9545061471434270e2457.tar.xz | |
Merging r196538:
------------------------------------------------------------------------
r196538 | joerg | 2013-12-05 13:27:58 -0800 (Thu, 05 Dec 2013) | 2 lines
For NetBSD, use arm1176jzf-s as default CPU for ARMv6.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_34@196597 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/ToolChain.cpp | 5 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp index faa06b68e0..efd3945b3d 100644 --- a/lib/Driver/ToolChain.cpp +++ b/lib/Driver/ToolChain.cpp @@ -183,6 +183,11 @@ static const char *getARMTargetCPU(const ArgList &Args, MArch = Triple.getArchName(); } + if (Triple.getOS() == llvm::Triple::NetBSD) { + if (MArch == "armv6") + return "arm1176jzf-s"; + } + const char *result = llvm::StringSwitch<const char *>(MArch) .Cases("armv2", "armv2a","arm2") .Case("armv3", "arm6") diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 09a969d6a9..04baf760a9 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -499,6 +499,11 @@ static std::string getARMTargetCPU(const ArgList &Args, MArch = Triple.getArchName(); } + if (Triple.getOS() == llvm::Triple::NetBSD) { + if (MArch == "armv6") + return "arm1176jzf-s"; + } + // Handle -march=native. std::string NativeMArch; if (MArch == "native") { |