From 42ee8782138b34b79e6ca7e5a33970edd1d27b44 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Fri, 1 Aug 2014 16:53:04 +0000 Subject: [PATCH] Update the ARMv6 core clang targets to be an arm1176jzf-s. This brings us in line with gcc in base as this makes llvm generate code for the armv6k variant of the instruction set. --- contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp | 3 ++- 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 36aae33ec838..69b642edb6e8 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 8b68869bdd9f..525a9f0300aa 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"; }