summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-07 10:16:26 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-07 23:09:41 +0100
commit539da1ccd395865a2d06ccbab98bd84464c83c89 (patch)
tree2979886c0e9b02df0ac10667ed2f5c49aab3042a /sys-devel/clang
parentdev-lang/rubinius: Restrict to llvm < 3.6 (diff)
downloadgentoo-539da1ccd395865a2d06ccbab98bd84464c83c89.tar.gz
gentoo-539da1ccd395865a2d06ccbab98bd84464c83c89.tar.bz2
gentoo-539da1ccd395865a2d06ccbab98bd84464c83c89.zip
sys-devel/clang: Remove ancient 2.8 version
Diffstat (limited to 'sys-devel/clang')
-rw-r--r--sys-devel/clang/Manifest2
-rw-r--r--sys-devel/clang/clang-2.8-r3.ebuild203
-rw-r--r--sys-devel/clang/files/clang-2.8-alignof.patch258
-rw-r--r--sys-devel/clang/files/clang-2.8-darwin-prefix.patch127
-rw-r--r--sys-devel/clang/files/clang-2.8-gcc-4.4.4.patch16
5 files changed, 0 insertions, 606 deletions
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index b53c0fe1cc67..29af4f71bae0 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,11 +1,9 @@
-DIST clang-2.8.tgz 5666777 SHA256 ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1 SHA512 938e6b32f8280ffc2b4354b3f5ee7c70ae671e05a5908ee54aa17ac7bef7835d73c318fe8a0ce8b1f657a803feee547c026c4a2239e3bfbf77f3a7c1d52479c3 WHIRLPOOL 132ed96b97989758996fea96f5b9f6cba1ee824df58cf61bd04f28e771fed639216b41c72c94c1fc52c9ccdf835436f06481cb5a27c7c8683e723515d58e80db
DIST clang-2.9.tgz 6243772 SHA256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df SHA512 0046b716eae7c398a61fb733239f209b60bdd1817e6724730b9515e7ae765565a1e42a805cc06e6f1393d8254ebc845335b244aff825f3fcce551b958683d8f5 WHIRLPOOL 4c745b7c6a21035595307ba5e2d95c2262a5ca1d52cca413a822186b9d450fec384d514175cf384e35e7169ce41ac5152222fcc9cbee4af85695c78d7cd5492e
DIST clang-3.0.tar.gz 7240578 SHA256 b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d SHA512 0a31a2600cd4555424259331e0762f7fceeb5d828e7792983b2f8ae92bb75b3dc92cf84474e047deb5d4dab46062b4ac6273e6079159052debb76ae69927e517 WHIRLPOOL 521169cc588520090423cd1a2fa639da84e119281bf8260ea4b7b24fd2d8627806a281ddbbba5c378a736fc31279e25f10c4d3a3c81abd2c202970079a949ba5
DIST clang-3.1.src.tar.gz 8158418 SHA256 ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786 SHA512 14c033eda3e0c0a887a8410f6b6a1335e0f6bfa05950a903d302b06b95fd58b03894320e91e50fb4d330c5323be9e955d9054cee62d035e2753290354ea8f8cd WHIRLPOOL cdb578c287a417896d2d6fb297e96e44e8b951bad6e7d286b97bdd346b40dac6ffbb7015b39d69fa0f9e0994dede26612307b643f71480e3c8917199fe926357
DIST clang-3.2.src.tar.gz 8805311 SHA256 2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658 SHA512 99fc57d19b76c42af9821eaaa762056a926eb68178f6b7dd5e8bf092c9ee201a554b91d760d5a30a57f38102eae340e080ef8c6a39327f6881eda391b20b108d WHIRLPOOL 2cf88d1db0f108d8b8e8b0cf691cca18694ddb00b129dc8c1894fca67b5494a7f53f92ac9401d99ce687c9d8fb30dc267be1e68ee70edc542e998f5486ba8730
DIST compiler-rt-3.1.src.tar.gz 1259340 SHA256 1bd4624e7465b05ea713198f19c1c235bae2d35a411c15a4648300bc74294f5c SHA512 a010ed625ca54383bcc08dba77c4a686aed1c74d70c237a3cd20eafe9c1208f644699a600cbf1d14239db1b05a6d55f026f511f5a1eeec0a68888683c653e6fe WHIRLPOOL 6e21d28b30b52a039d5f16fb5b96238f453b58d5fabffffe0cc181061f619aaec2925bbe9f8af3dfe1ac39002fa52943617f94c44fb21cfe72d7aea460c0de0c
DIST compiler-rt-3.2.src.tar.gz 1463061 SHA256 4ac311df0eead459cbb0f0890c06b55dae529ab45827ac73fef40bec632994aa SHA512 ef4223bd2d6051ec93a0943973aa61e7aa3686ac72f9a688d58a8b71deba1a7e64dcf821e0c53937899bbd7ba49218fee4e3649f19362fe59677daee314c063b WHIRLPOOL 176643360f683ddca28e4c77dc4ceb03513cec5cea98455598c934ec3e23bd6949a74852e50e42207c7171eb8013afe366f3b8c92799af66a04739ccebe4ed4e
-DIST llvm-2.8-r1.tgz 9112527 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b SHA512 8688d5cf415e8aef74cca6a14587af36234a6347e2238ac2c0d66805c42926b9399f36390e1a58a4081e902b0904adb818c1a360d5df572dfa893d6f79f5e35a WHIRLPOOL 0da9250e31242b55586c9138089e742aab5d414d5f3412ebf917ae8b9506f984c6134a932be93ec7e4c01c79f6c21d508cb0b2e0ec283419bd4ae4db745430ae
DIST llvm-2.9.tgz 9574781 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 SHA512 9cb0fa0bb8ac02661fd6f926001a15e0ad4a9660683421dc86b03f1cf5184142c5815f9f9283ee7cdf8d474e01177f83406122253342e0e95ddc878821660070 WHIRLPOOL f7b445b6b5d455f29ca68c342511b8b5e6eedec525af1cc60440c4de544df2332aa241bffca29eda5d2428a3f518e093a626bd45c7f8a9e0656d0f68aef5d9d1
DIST llvm-3.0.tar.gz 10350539 SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 SHA512 602bb5590b70cb9138bc19d8c630c62bbabdcb2132215c921fe4bce4e3f74dfc66440b9dcd458ff55a86047cc9cc0417c6563715c133e0db222e4b88f07c13bb WHIRLPOOL 6f4ece3ec747352cd78b08d25c5b1cda91140eb6957d509161e45395e47c074f8d2102bfcaeabcdef8c1f6672f2cf06d88e290667666122da029391b3528d440
DIST llvm-3.1.src.tar.gz 11077429 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab SHA512 fb941094601043e405ccc57473414ef92437b09c200e71614f93d8e93b2a58cca8d78c385be037e064b0711cd6268802c774ce4a40fc0ea17bf576305304d2aa WHIRLPOOL c5c72e139296e1c186131f991010f52f958063a4fcfcb1f8527b53a2aaa7edcaca70ab6cf86c25d08640dcf6d720a865fda7dc7eb06cf1ce9c23fd37b5d597ef
diff --git a/sys-devel/clang/clang-2.8-r3.ebuild b/sys-devel/clang/clang-2.8-r3.ebuild
deleted file mode 100644
index ac9afdee1640..000000000000
--- a/sys-devel/clang/clang-2.8-r3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils multilib python
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="http://clang.llvm.org/"
-# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840
-# Drop the -> on 2.9
-SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.tgz -> llvm-${PV}-r1.tgz
- http://llvm.org/releases/${PV}/${P}.tgz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug multitarget +static-analyzer system-cxx-headers test"
-
-# Note: for LTO support, clang will depend on binutils with gold plugins, and LLVM built after that - http://llvm.org/docs/GoldPlugin.html
-DEPEND="static-analyzer? ( dev-lang/perl )"
-RDEPEND="~sys-devel/llvm-${PV}[debug=,multitarget=]"
-
-S="${WORKDIR}/llvm-${PV}"
-
-src_prepare() {
- mv "${WORKDIR}"/clang-${PV} "${S}"/tools/clang || die "clang source directory not found"
-
- # Same as llvm doc patches
- epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch
-
- # Upstream backport, r117774 and r117775
- epatch "${FILESDIR}"/${P}-alignof.patch
- # Upstream backport, r119348
- epatch "${FILESDIR}"/${P}-gcc-4.4.4.patch
-
- # Fix toolchain lookup for Darwin/Prefix.
- epatch "${FILESDIR}"/${PN}-2.8-darwin-prefix.patch
- sed -e "s|@GENTOO_PORTAGE_CHOST_ARCH@|${CHOST%%-darwin*}-darwin|g" \
- -e "s|@GENTOO_PORTAGE_CHOST@|${CHOST}|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}|g" \
- -i tools/clang/lib/Driver/ToolChains.cpp \
- || die "fixing toolchain lookup"
-
- # multilib-strict
- sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \
- -i tools/clang/lib/Headers/Makefile \
- || die "clang Makefile failed"
- # fix the static analyzer for in-tree install
- sed -e 's/import ScanView/from clang \0/' \
- -i tools/clang/tools/scan-view/scan-view \
- || die "scan-view sed failed"
- sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
- -i tools/clang/tools/scan-build/scan-build \
- || die "scan-build sed failed"
- # Specify python version
- python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
-
- # From llvm src_prepare
- einfo "Fixing install dirs"
- sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
- -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
- -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
- -i Makefile.config.in || die "Makefile.config sed failed"
-
- einfo "Fixing rpath and CFLAGS"
- sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
- -e '/OmitFramePointer/s/-fomit-frame-pointer//' \
- -i Makefile.rules || die "rpath sed failed"
-}
-
-src_configure() {
- local CONF_FLAGS="--enable-shared"
-
- if use debug; then
- CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
- einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
- # ...and you probably shouldn't use tmpfs, unless it can hold 900MB
- else
- CONF_FLAGS="${CONF_FLAGS} \
- --enable-optimized \
- --with-optimize-option= \
- --disable-assertions \
- --disable-expensive-checks"
- fi
-
- # Setup the search path to include the Prefix includes
- if use prefix ; then
- CONF_FLAGS="${CONF_FLAGS} \
- --with-c-include-dirs=${EPREFIX}/usr/include:/usr/include"
- fi
-
- if use multitarget; then
- CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
- else
- CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
- fi
-
- if use amd64; then
- CONF_FLAGS="${CONF_FLAGS} --enable-pic"
- fi
-
- # Skip llvm-gcc parts even if installed
- CONF_FLAGS="${CONF_FLAGS} --with-llvmgccdir=/dev/null"
-
- if use system-cxx-headers; then
- # Try to get current gcc headers path
- local CXX_PATH=$(gcc-config -L| cut -d: -f1)
- CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include"
- CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/include/g++-v4"
- CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"
- if has_multilib_profile; then
- CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-32bit-dir=32"
- fi
- fi
-
- econf ${CONF_FLAGS} || die "econf failed"
-}
-
-src_compile() {
- emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only || die "emake failed"
-}
-
-src_test() {
- cd "${S}"/test || die "cd failed"
- emake site.exp || die "updating llvm site.exp failed"
-
- cd "${S}"/tools/clang || die "cd clang failed"
-
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- if ! emake -j1 VERBOSE=1 test; then
- has test $FEATURES && die "Make test failed. See above for details."
- has test $FEATURES || eerror "Make test failed. See above for details."
- fi
-}
-
-src_install() {
- cd "${S}"/tools/clang || die "cd clang failed"
- emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
-
- if use static-analyzer ; then
- dobin tools/scan-build/ccc-analyzer
- dosym ccc-analyzer /usr/bin/c++-analyzer
- dobin tools/scan-build/scan-build
-
- insinto /usr/share/${PN}
- doins tools/scan-build/scanview.css
- doins tools/scan-build/sorttable.js
-
- cd tools/scan-view || die "cd scan-view failed"
- dobin scan-view
- install-scan-view() {
- insinto "$(python_get_sitedir)"/clang
- doins Reporter.py Resources ScanView.py startfile.py
- touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py
- }
- python_execute_function install-scan-view
- fi
-
- # Fix install_names on Darwin. The build system is too complicated
- # to just fix this, so we correct it post-install
- if [[ ${CHOST} == *-darwin* ]] ; then
- for lib in libclang.dylib ; do
- ebegin "fixing install_name of $lib"
- install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \
- "${ED}"/usr/lib/llvm/${lib}
- eend $?
- done
- for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do
- ebegin "fixing references in ${f##*/}"
- install_name_tool \
- -change "@rpath/libclang.dylib" \
- "${EPREFIX}"/usr/lib/llvm/libclang.dylib \
- -change "${S}"/Release/lib/libLLVM-${PV}.dylib \
- "${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \
- -change "${S}"/Release/lib/libclang.dylib \
- "${EPREFIX}"/usr/lib/llvm/libclang.dylib \
- "${ED}"/$f
- eend $?
- done
- fi
-}
-
-pkg_postinst() {
- python_mod_optimize clang
- if use system-cxx-headers; then
- elog "C++ headers search path is hardcoded to the active gcc profile one"
- elog "If you change the active gcc profile, or update gcc to a new version,"
- elog "you will have to remerge this package to update the search path"
- else
- elog "If clang++ fails to find C++ headers on your system,"
- elog "you can remerge clang with USE=system-cxx-headers to use C++ headers"
- elog "from the active gcc profile"
- fi
-}
-
-pkg_postrm() {
- python_mod_cleanup clang
-}
diff --git a/sys-devel/clang/files/clang-2.8-alignof.patch b/sys-devel/clang/files/clang-2.8-alignof.patch
deleted file mode 100644
index a15f118caee6..000000000000
--- a/sys-devel/clang/files/clang-2.8-alignof.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Index: include/llvm/ADT/StringMap.h
-===================================================================
---- include/llvm/ADT/StringMap.h (révision 117773)
-+++ include/llvm/ADT/StringMap.h (révision 117774)
-@@ -167,7 +167,7 @@
-
- unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+
- KeyLength+1;
-- unsigned Alignment = alignof<StringMapEntry>();
-+ unsigned Alignment = alignOf<StringMapEntry>();
-
- StringMapEntry *NewItem =
- static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment));
-Index: include/llvm/Support/AlignOf.h
-===================================================================
---- include/llvm/Support/AlignOf.h (révision 117773)
-+++ include/llvm/Support/AlignOf.h (révision 117774)
-@@ -49,12 +49,12 @@
-
- };
-
--/// alignof - A templated function that returns the mininum alignment of
-+/// alignOf - A templated function that returns the mininum alignment of
- /// of a type. This provides no extra functionality beyond the AlignOf
- /// class besides some cosmetic cleanliness. Example usage:
--/// alignof<int>() returns the alignment of an int.
-+/// alignOf<int>() returns the alignment of an int.
- template <typename T>
--static inline unsigned alignof() { return AlignOf<T>::Alignment; }
-+static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
-
- } // end namespace llvm
- #endif
-Index: include/llvm/Support/Allocator.h
-===================================================================
---- include/llvm/Support/Allocator.h (révision 117773)
-+++ include/llvm/Support/Allocator.h (révision 117774)
-@@ -201,7 +201,7 @@
- char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr :
- (char *)Slab + Slab->Size;
- for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
-- Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
-+ Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
- if (Ptr + sizeof(T) <= End)
- reinterpret_cast<T*>(Ptr)->~T();
- }
-Index: include/llvm/CodeGen/SlotIndexes.h
-===================================================================
---- include/llvm/CodeGen/SlotIndexes.h (révision 117773)
-+++ include/llvm/CodeGen/SlotIndexes.h (révision 117774)
-@@ -393,7 +393,7 @@
- IndexListEntry *entry =
- static_cast<IndexListEntry*>(
- ileAllocator.Allocate(sizeof(IndexListEntry),
-- alignof<IndexListEntry>()));
-+ alignOf<IndexListEntry>()));
-
- new (entry) IndexListEntry(mi, index);
-
-Index: tools/clang/lib/Basic/IdentifierTable.cpp
-===================================================================
---- tools/clang/lib/Basic/IdentifierTable.cpp (révision 117774)
-+++ tools/clang/lib/Basic/IdentifierTable.cpp (révision 117775)
-@@ -390,7 +390,7 @@
- unsigned Size = sizeof(MultiKeywordSelector) + nKeys*sizeof(IdentifierInfo *);
- MultiKeywordSelector *SI =
- (MultiKeywordSelector*)SelTabImpl.Allocator.Allocate(Size,
-- llvm::alignof<MultiKeywordSelector>());
-+ llvm::alignOf<MultiKeywordSelector>());
- new (SI) MultiKeywordSelector(nKeys, IIV);
- SelTabImpl.Table.InsertNode(SI, InsertPos);
- return Selector(SI);
-Index: tools/clang/lib/AST/ExprCXX.cpp
-===================================================================
---- tools/clang/lib/AST/ExprCXX.cpp (révision 117774)
-+++ tools/clang/lib/AST/ExprCXX.cpp (révision 117775)
-@@ -233,7 +233,7 @@
- if (NumTemplateArgs != 0)
- size += ExplicitTemplateArgumentList::sizeFor(NumTemplateArgs);
-
-- void *Mem = C.Allocate(size, llvm::alignof<UnresolvedLookupExpr>());
-+ void *Mem = C.Allocate(size, llvm::alignOf<UnresolvedLookupExpr>());
- UnresolvedLookupExpr *E = new (Mem) UnresolvedLookupExpr(EmptyShell());
- E->HasExplicitTemplateArgs = NumTemplateArgs != 0;
- return E;
-@@ -261,7 +261,7 @@
- if (NumResults) {
- Results = static_cast<DeclAccessPair *>(
- C.Allocate(sizeof(DeclAccessPair) * NumResults,
-- llvm::alignof<DeclAccessPair>()));
-+ llvm::alignOf<DeclAccessPair>()));
- memcpy(Results, &*Begin.getIterator(),
- NumResults * sizeof(DeclAccessPair));
- }
-@@ -737,7 +737,7 @@
- if (TemplateArgs)
- size += ExplicitTemplateArgumentList::sizeFor(*TemplateArgs);
-
-- void *Mem = C.Allocate(size, llvm::alignof<CXXDependentScopeMemberExpr>());
-+ void *Mem = C.Allocate(size, llvm::alignOf<CXXDependentScopeMemberExpr>());
- return new (Mem) CXXDependentScopeMemberExpr(C, Base, BaseType,
- IsArrow, OperatorLoc,
- Qualifier, QualifierRange,
-@@ -756,7 +756,7 @@
-
- std::size_t size = sizeof(CXXDependentScopeMemberExpr) +
- ExplicitTemplateArgumentList::sizeFor(NumTemplateArgs);
-- void *Mem = C.Allocate(size, llvm::alignof<CXXDependentScopeMemberExpr>());
-+ void *Mem = C.Allocate(size, llvm::alignOf<CXXDependentScopeMemberExpr>());
- CXXDependentScopeMemberExpr *E
- = new (Mem) CXXDependentScopeMemberExpr(C, 0, QualType(),
- 0, SourceLocation(), 0,
-@@ -812,7 +812,7 @@
- if (TemplateArgs)
- size += ExplicitTemplateArgumentList::sizeFor(*TemplateArgs);
-
-- void *Mem = C.Allocate(size, llvm::alignof<UnresolvedMemberExpr>());
-+ void *Mem = C.Allocate(size, llvm::alignOf<UnresolvedMemberExpr>());
- return new (Mem) UnresolvedMemberExpr(C,
- Dependent ? C.DependentTy : C.OverloadTy,
- Dependent, HasUnresolvedUsing, Base, BaseType,
-@@ -826,7 +826,7 @@
- if (NumTemplateArgs != 0)
- size += ExplicitTemplateArgumentList::sizeFor(NumTemplateArgs);
-
-- void *Mem = C.Allocate(size, llvm::alignof<UnresolvedMemberExpr>());
-+ void *Mem = C.Allocate(size, llvm::alignOf<UnresolvedMemberExpr>());
- UnresolvedMemberExpr *E = new (Mem) UnresolvedMemberExpr(EmptyShell());
- E->HasExplicitTemplateArgs = NumTemplateArgs != 0;
- return E;
-Index: tools/clang/lib/AST/DeclObjC.cpp
-===================================================================
---- tools/clang/lib/AST/DeclObjC.cpp (révision 117774)
-+++ tools/clang/lib/AST/DeclObjC.cpp (révision 117775)
-@@ -711,7 +711,7 @@
- void ObjCClassDecl::setClassList(ASTContext &C, ObjCInterfaceDecl*const*List,
- const SourceLocation *Locs, unsigned Num) {
- ForwardDecls = (ObjCClassRef*) C.Allocate(sizeof(ObjCClassRef)*Num,
-- llvm::alignof<ObjCClassRef>());
-+ llvm::alignOf<ObjCClassRef>());
- for (unsigned i = 0; i < Num; ++i)
- new (&ForwardDecls[i]) ObjCClassRef(List[i], Locs[i]);
-
-Index: tools/clang/lib/AST/Stmt.cpp
-===================================================================
---- tools/clang/lib/AST/Stmt.cpp (révision 117774)
-+++ tools/clang/lib/AST/Stmt.cpp (révision 117775)
-@@ -416,7 +416,7 @@
- Stmt *atFinallyStmt) {
- unsigned Size = sizeof(ObjCAtTryStmt) +
- (1 + NumCatchStmts + (atFinallyStmt != 0)) * sizeof(Stmt *);
-- void *Mem = Context.Allocate(Size, llvm::alignof<ObjCAtTryStmt>());
-+ void *Mem = Context.Allocate(Size, llvm::alignOf<ObjCAtTryStmt>());
- return new (Mem) ObjCAtTryStmt(atTryLoc, atTryStmt, CatchStmts, NumCatchStmts,
- atFinallyStmt);
- }
-@@ -426,7 +426,7 @@
- bool HasFinally) {
- unsigned Size = sizeof(ObjCAtTryStmt) +
- (1 + NumCatchStmts + HasFinally) * sizeof(Stmt *);
-- void *Mem = Context.Allocate(Size, llvm::alignof<ObjCAtTryStmt>());
-+ void *Mem = Context.Allocate(Size, llvm::alignOf<ObjCAtTryStmt>());
- return new (Mem) ObjCAtTryStmt(EmptyShell(), NumCatchStmts, HasFinally);
- }
-
-@@ -448,7 +448,7 @@
- std::size_t Size = sizeof(CXXTryStmt);
- Size += ((numHandlers + 1) * sizeof(Stmt));
-
-- void *Mem = C.Allocate(Size, llvm::alignof<CXXTryStmt>());
-+ void *Mem = C.Allocate(Size, llvm::alignOf<CXXTryStmt>());
- return new (Mem) CXXTryStmt(tryLoc, tryBlock, handlers, numHandlers);
- }
-
-@@ -457,7 +457,7 @@
- std::size_t Size = sizeof(CXXTryStmt);
- Size += ((numHandlers + 1) * sizeof(Stmt));
-
-- void *Mem = C.Allocate(Size, llvm::alignof<CXXTryStmt>());
-+ void *Mem = C.Allocate(Size, llvm::alignOf<CXXTryStmt>());
- return new (Mem) CXXTryStmt(Empty, numHandlers);
- }
-
-Index: tools/clang/lib/AST/Expr.cpp
-===================================================================
---- tools/clang/lib/AST/Expr.cpp (révision 117774)
-+++ tools/clang/lib/AST/Expr.cpp (révision 117775)
-@@ -257,7 +257,7 @@
- if (TemplateArgs)
- Size += ExplicitTemplateArgumentList::sizeFor(*TemplateArgs);
-
-- void *Mem = Context.Allocate(Size, llvm::alignof<DeclRefExpr>());
-+ void *Mem = Context.Allocate(Size, llvm::alignOf<DeclRefExpr>());
- return new (Mem) DeclRefExpr(Qualifier, QualifierRange, D, NameInfo,
- TemplateArgs, T);
- }
-@@ -271,7 +271,7 @@
- if (NumTemplateArgs)
- Size += ExplicitTemplateArgumentList::sizeFor(NumTemplateArgs);
-
-- void *Mem = Context.Allocate(Size, llvm::alignof<DeclRefExpr>());
-+ void *Mem = Context.Allocate(Size, llvm::alignOf<DeclRefExpr>());
- return new (Mem) DeclRefExpr(EmptyShell());
- }
-
-@@ -432,7 +432,7 @@
- // any concatenated string tokens.
- void *Mem = C.Allocate(sizeof(StringLiteral)+
- sizeof(SourceLocation)*(NumStrs-1),
-- llvm::alignof<StringLiteral>());
-+ llvm::alignOf<StringLiteral>());
- StringLiteral *SL = new (Mem) StringLiteral(Ty);
-
- // OPTIMIZE: could allocate this appended to the StringLiteral.
-@@ -452,7 +452,7 @@
- StringLiteral *StringLiteral::CreateEmpty(ASTContext &C, unsigned NumStrs) {
- void *Mem = C.Allocate(sizeof(StringLiteral)+
- sizeof(SourceLocation)*(NumStrs-1),
-- llvm::alignof<StringLiteral>());
-+ llvm::alignOf<StringLiteral>());
- StringLiteral *SL = new (Mem) StringLiteral(QualType());
- SL->StrData = 0;
- SL->ByteLength = 0;
-@@ -714,7 +714,7 @@
- if (targs)
- Size += ExplicitTemplateArgumentList::sizeFor(*targs);
-
-- void *Mem = C.Allocate(Size, llvm::alignof<MemberExpr>());
-+ void *Mem = C.Allocate(Size, llvm::alignOf<MemberExpr>());
- MemberExpr *E = new (Mem) MemberExpr(base, isarrow, memberdecl, nameinfo, ty);
-
- if (hasQualOrFound) {
-Index: tools/clang/lib/AST/DeclCXX.cpp
-===================================================================
---- tools/clang/lib/AST/DeclCXX.cpp (révision 117774)
-+++ tools/clang/lib/AST/DeclCXX.cpp (révision 117775)
-@@ -1057,7 +1057,7 @@
- unsigned NumIndices) {
- void *Mem = Context.Allocate(sizeof(CXXBaseOrMemberInitializer) +
- sizeof(VarDecl *) * NumIndices,
-- llvm::alignof<CXXBaseOrMemberInitializer>());
-+ llvm::alignOf<CXXBaseOrMemberInitializer>());
- return new (Mem) CXXBaseOrMemberInitializer(Context, Member, MemberLoc,
- L, Init, R, Indices, NumIndices);
- }
-Index: tools/clang/lib/Lex/TokenLexer.cpp
-===================================================================
---- tools/clang/lib/Lex/TokenLexer.cpp (révision 117774)
-+++ tools/clang/lib/Lex/TokenLexer.cpp (révision 117775)
-@@ -287,7 +287,7 @@
- llvm::BumpPtrAllocator &Alloc = PP.getPreprocessorAllocator();
- Token *Res =
- static_cast<Token *>(Alloc.Allocate(sizeof(Token)*ResultToks.size(),
-- llvm::alignof<Token>()));
-+ llvm::alignOf<Token>()));
- if (NumTokens)
- memcpy(Res, &ResultToks[0], NumTokens*sizeof(Token));
- Tokens = Res;
diff --git a/sys-devel/clang/files/clang-2.8-darwin-prefix.patch b/sys-devel/clang/files/clang-2.8-darwin-prefix.patch
deleted file mode 100644
index 555b8ee0bcc9..000000000000
--- a/sys-devel/clang/files/clang-2.8-darwin-prefix.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-This code looks as if it is written by Apple, lots of assumptions that
-only hold for them and their scenario.
-
---- tools/clang/lib/Driver/ToolChains.cpp
-+++ tools/clang/lib/Driver/ToolChains.cpp
-@@ -131,7 +131,7 @@
- GCCVersion[2] = 1;
-
- // Set up the tool chain paths to match gcc.
-- ToolChainDir = "i686-apple-darwin";
-+ ToolChainDir = "@GENTOO_PORTAGE_CHOST@";
- ToolChainDir += llvm::utostr(DarwinVersion[0]);
- ToolChainDir += "/";
- ToolChainDir += llvm::utostr(GCCVersion[0]);
-@@ -141,9 +141,9 @@
- ToolChainDir += llvm::utostr(GCCVersion[2]);
-
- // Try the next major version if that tool chain dir is invalid.
-- std::string Tmp = "/usr/lib/gcc/" + ToolChainDir;
-+ std::string Tmp = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir;
- if (!llvm::sys::Path(Tmp).exists()) {
-- std::string Next = "i686-apple-darwin";
-+ std::string Next = "@GENTOO_PORTAGE_CHOST_ARCH@";
- Next += llvm::utostr(DarwinVersion[0] + 1);
- Next += "/";
- Next += llvm::utostr(GCCVersion[0]);
-@@ -155,7 +155,7 @@
- // Use that if it exists, otherwise hope the user isn't linking.
- //
- // FIXME: Drop dependency on gcc's tool chain.
-- Tmp = "/usr/lib/gcc/" + Next;
-+ Tmp = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + Next;
- if (llvm::sys::Path(Tmp).exists())
- ToolChainDir = Next;
- }
-@@ -168,7 +168,7 @@
- Path += "/x86_64";
- getFilePaths().push_back(Path);
-
-- Path = "/usr/lib/gcc/";
-+ Path = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/";
- Path += ToolChainDir;
- Path += "/x86_64";
- getFilePaths().push_back(Path);
-@@ -179,7 +179,7 @@
- Path += ToolChainDir;
- getFilePaths().push_back(Path);
-
-- Path = "/usr/lib/gcc/";
-+ Path = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/";
- Path += ToolChainDir;
- getFilePaths().push_back(Path);
-
-@@ -188,7 +188,7 @@
- Path += ToolChainDir;
- getProgramPaths().push_back(Path);
-
-- Path = "/usr/libexec/gcc/";
-+ Path = "@GENTOO_PORTAGE_EPREFIX@/usr/libexec/gcc/";
- Path += ToolChainDir;
- getProgramPaths().push_back(Path);
-
-@@ -291,14 +291,14 @@
-
- // FIXME: Derive these correctly.
- if (getArchName() == "x86_64") {
-- CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir +
-+ CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir +
- "/x86_64"));
- // Intentionally duplicated for (temporary) gcc bug compatibility.
-- CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir +
-+ CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir +
- "/x86_64"));
- }
-
-- CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/" + ToolChainDir));
-+ CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/" + ToolChainDir));
-
- Tmp = getDriver().Dir + "/../lib/gcc/" + ToolChainDir;
- if (llvm::sys::Path(Tmp).exists())
-@@ -306,18 +306,18 @@
- Tmp = getDriver().Dir + "/../lib/gcc";
- if (llvm::sys::Path(Tmp).exists())
- CmdArgs.push_back(Args.MakeArgString("-L" + Tmp));
-- CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir));
-+ CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir));
- // Intentionally duplicated for (temporary) gcc bug compatibility.
-- CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir));
-+ CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir));
- Tmp = getDriver().Dir + "/../lib/" + ToolChainDir;
- if (llvm::sys::Path(Tmp).exists())
- CmdArgs.push_back(Args.MakeArgString("-L" + Tmp));
- Tmp = getDriver().Dir + "/../lib";
- if (llvm::sys::Path(Tmp).exists())
- CmdArgs.push_back(Args.MakeArgString("-L" + Tmp));
-- CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir +
-+ CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir +
- "/../../../" + ToolChainDir));
-- CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir +
-+ CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir +
- "/../../.."));
- }
-
-@@ -386,22 +386,7 @@
- P.eraseComponent(); // .../usr/bin -> ../usr
- P.appendComponent("lib");
- P.appendComponent("gcc");
-- switch (getTriple().getArch()) {
-- default:
-- assert(0 && "Invalid Darwin arch!");
-- case llvm::Triple::x86:
-- case llvm::Triple::x86_64:
-- P.appendComponent("i686-apple-darwin10");
-- break;
-- case llvm::Triple::arm:
-- case llvm::Triple::thumb:
-- P.appendComponent("arm-apple-darwin10");
-- break;
-- case llvm::Triple::ppc:
-- case llvm::Triple::ppc64:
-- P.appendComponent("powerpc-apple-darwin10");
-- break;
-- }
-+ P.appendComponent("@GENTOO_PORTAGE_CHOST@");
- P.appendComponent("4.2.1");
-
- // Determine the arch specific GCC subdirectory.
diff --git a/sys-devel/clang/files/clang-2.8-gcc-4.4.4.patch b/sys-devel/clang/files/clang-2.8-gcc-4.4.4.patch
deleted file mode 100644
index f60d051e9d49..000000000000
--- a/sys-devel/clang/files/clang-2.8-gcc-4.4.4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: tools/clang/lib/Frontend/InitHeaderSearch.cpp
-===================================================================
---- tools/clang/lib/Frontend/InitHeaderSearch.cpp (révision 119347)
-+++ tools/clang/lib/Frontend/InitHeaderSearch.cpp (révision 119348)
-@@ -745,6 +745,11 @@
- "/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.3/include/g++-v4",
- "x86_64-pc-linux-gnu", "32", "", triple);
-
-+ // Gentoo amd64 gcc 4.4.4
-+ AddGnuCPlusPlusIncludePaths(
-+ "/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.4/include/g++-v4",
-+ "x86_64-pc-linux-gnu", "32", "", triple);
-+
- // Gentoo amd64 llvm-gcc trunk
- AddGnuCPlusPlusIncludePaths(
- "/usr/lib/llvm-gcc-4.2-9999/include/c++/4.2.1",