diff options
| author | dim <dim@FreeBSD.org> | 2014-02-21 22:54:35 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-02-21 22:54:35 +0000 |
| commit | 8a524adf6453224712ce614762dcb40e736c7b84 (patch) | |
| tree | 6517d2520126e6253bd71835d53bb1f1ce309072 /contrib/llvm | |
| parent | 0683fb66c179adc218a5ab46d022e7b5b9d26121 (diff) | |
| parent | ac414654b33e4621cdb49e5b3020a09ad534e289 (diff) | |
| download | FreeBSD-src-8a524adf6453224712ce614762dcb40e736c7b84.zip FreeBSD-src-8a524adf6453224712ce614762dcb40e736c7b84.tar.gz | |
Merge from head up to r262311.
Diffstat (limited to 'contrib/llvm')
| -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: |
