diff options
author | ian <ian@FreeBSD.org> | 2014-08-17 01:15:34 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2014-08-17 01:15:34 +0000 |
commit | 799b3dd5bf5db05a79bfdd83ba81e4fe8b6dfc02 (patch) | |
tree | b048d2570e25203f6db83809ca44421e9380d2bd | |
parent | 7a365d2c053ebcca4ab5c48af1d3e404e5db0159 (diff) | |
download | FreeBSD-src-799b3dd5bf5db05a79bfdd83ba81e4fe8b6dfc02.zip FreeBSD-src-799b3dd5bf5db05a79bfdd83ba81e4fe8b6dfc02.tar.gz |
MFC r269387: Update the ARMv6 core clang targets to be an arm1176jzf-s.
-rw-r--r-- | contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp | 3 | ||||
-rw-r--r-- | contrib/llvm/tools/clang/lib/Driver/Tools.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp b/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp index 36aae33..69b642e 100644 --- a/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp +++ b/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp @@ -183,7 +183,8 @@ static const char *getARMTargetCPU(const ArgList &Args, MArch = Triple.getArchName(); } - if (Triple.getOS() == llvm::Triple::NetBSD) { + if (Triple.getOS() == llvm::Triple::NetBSD || + Triple.getOS() == llvm::Triple::FreeBSD) { if (MArch == "armv6") return "arm1176jzf-s"; } diff --git a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp index fb3f50d..dc72085 100644 --- a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp +++ b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp @@ -499,7 +499,8 @@ static std::string getARMTargetCPU(const ArgList &Args, MArch = Triple.getArchName(); } - if (Triple.getOS() == llvm::Triple::NetBSD) { + if (Triple.getOS() == llvm::Triple::NetBSD || + Triple.getOS() == llvm::Triple::FreeBSD) { if (MArch == "armv6") return "arm1176jzf-s"; } |