a1f8ad145e
applied to our copy of llvm/clang. These can be applied in alphabetical order to a pristine llvm/clang 3.4 release source tree, to result in the same version used in FreeBSD. This is intended to clearly document all the changes until now, which mostly consist of cherry pickings from the respective upstream trunks, plus a number of hand-written FreeBSD-specific ones. Hopefully those can eventually be cleaned up and sent upstream too. MFC after: 1 week X-MFC-With: r263313
26 lines
965 B
Diff
26 lines
965 B
Diff
Pull in r197521 from upstream clang trunk (by Roman Divacky):
|
|
|
|
Use the integrated assembler by default on FreeBSD/ppc and ppc64.
|
|
|
|
Introduced here: http://svn.freebsd.org/changeset/base/262303
|
|
|
|
Index: tools/clang/lib/Driver/ToolChains.h
|
|
===================================================================
|
|
--- tools/clang/lib/Driver/ToolChains.h
|
|
+++ tools/clang/lib/Driver/ToolChains.h
|
|
@@ -512,8 +512,13 @@ class LLVM_LIBRARY_VISIBILITY FreeBSD : public Gen
|
|
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:
|
|
virtual Tool *buildAssembler() const;
|