From 52be84ca03f8709721ded3e39ac57a4f7d627277 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Fri, 21 Feb 2014 20:55:34 +0000 Subject: [PATCH] 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 --- contrib/llvm/tools/clang/lib/Driver/ToolChains.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/llvm/tools/clang/lib/Driver/ToolChains.h b/contrib/llvm/tools/clang/lib/Driver/ToolChains.h index 683815c356d1..ba794a7c207b 100644 --- a/contrib/llvm/tools/clang/lib/Driver/ToolChains.h +++ b/contrib/llvm/tools/clang/lib/Driver/ToolChains.h @@ -512,7 +512,12 @@ class LLVM_LIBRARY_VISIBILITY FreeBSD : public Generic_ELF { 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: