From owner-svn-src-all@FreeBSD.ORG  Fri Feb 21 20:55:34 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 AD2792E3;
 Fri, 21 Feb 2014 20:55:34 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 96BBF1B3E;
 Fri, 21 Feb 2014 20:55:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1LKtYGZ055448;
 Fri, 21 Feb 2014 20:55:34 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1LKtYlE055447;
 Fri, 21 Feb 2014 20:55:34 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201402212055.s1LKtYlE055447@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 21 Feb 2014 20:55:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262303 - head/contrib/llvm/tools/clang/lib/Driver
X-SVN-Group: head
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.17
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: Fri, 21 Feb 2014 20:55:34 -0000

Author: dim
Date: Fri Feb 21 20:55:34 2014
New Revision: 262303
URL: http://svnweb.freebsd.org/changeset/base/262303

Log:
  Pull in r197521 from upstream clang trunk (by rdivacky):
  
    Use the integrated assembler by default on FreeBSD/ppc and ppc64.
  
  Requested by:	jhibbits
  MFC after:	1 month
  X-MFC-With:	r261991

Modified:
  head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h

Modified: head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h	Fri Feb 21 19:58:45 2014	(r262302)
+++ head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h	Fri Feb 21 20:55:34 2014	(r262303)
@@ -512,7 +512,12 @@ public:
   virtual void
   AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                                llvm::opt::ArgStringList &CC1Args) const;
-
+  virtual bool IsIntegratedAssemblerDefault() const {
+    if (getTriple().getArch() == llvm::Triple::ppc ||
+        getTriple().getArch() == llvm::Triple::ppc64)
+      return true;
+    return Generic_ELF::IsIntegratedAssemblerDefault();
+  }
 
   virtual bool UseSjLjExceptions() const;
 protected: