diff options
| author | dim <dim@FreeBSD.org> | 2014-02-21 20:55:34 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-02-21 20:55:34 +0000 |
| commit | a9165c12f793c44001770561b852f1c067f7929c (patch) | |
| tree | fca1f8115790e1ab5e3685eeca2a4144f7e0cd7e | |
| parent | 623a3a0df4e55049c211fecaae18e148f138068f (diff) | |
| download | FreeBSD-src-a9165c12f793c44001770561b852f1c067f7929c.zip FreeBSD-src-a9165c12f793c44001770561b852f1c067f7929c.tar.gz | |
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
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Driver/ToolChains.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/Driver/ToolChains.h b/contrib/llvm/tools/clang/lib/Driver/ToolChains.h index 683815c..ba794a7 100644 --- a/contrib/llvm/tools/clang/lib/Driver/ToolChains.h +++ b/contrib/llvm/tools/clang/lib/Driver/ToolChains.h @@ -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: |
