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/files
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/files')
-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
3 files changed, 0 insertions, 401 deletions
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",