From owner-svn-src-all@FreeBSD.ORG  Sun Aug 17 01:15:35 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 881EB7AC;
 Sun, 17 Aug 2014 01:15:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7360D2216;
 Sun, 17 Aug 2014 01:15:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7H1FZxA076514;
 Sun, 17 Aug 2014 01:15:35 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7H1FZmg076512;
 Sun, 17 Aug 2014 01:15:35 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201408170115.s7H1FZmg076512@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Sun, 17 Aug 2014 01:15:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270072 - stable/10/contrib/llvm/tools/clang/lib/Driver
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Aug 2014 01:15:35 -0000

Author: ian
Date: Sun Aug 17 01:15:34 2014
New Revision: 270072
URL: http://svnweb.freebsd.org/changeset/base/270072

Log:
  MFC r269387: Update the ARMv6 core clang targets to be an arm1176jzf-s.

Modified:
  stable/10/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
  stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
==============================================================================
--- stable/10/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp	Sun Aug 17 01:00:42 2014	(r270071)
+++ stable/10/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp	Sun Aug 17 01:15:34 2014	(r270072)
@@ -183,7 +183,8 @@ static const char *getARMTargetCPU(const
     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";
   }

Modified: stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sun Aug 17 01:00:42 2014	(r270071)
+++ stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sun Aug 17 01:15:34 2014	(r270072)
@@ -499,7 +499,8 @@ static std::string getARMTargetCPU(const
     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";
   }