svn commit: r262303 - head/contrib/llvm/tools/clang/lib/Driver

[Dimitry Andric]

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: