summaryrefslogtreecommitdiff
path: root/community/llvm
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2011-04-17 19:27:42 +0000
committerParabola <dev@list.parabolagnulinux.org>2011-04-17 19:27:42 +0000
commit049af7a95b01eba14d33586ad5852dddaf107e53 (patch)
tree3f89f26ef1ec32f03b8842f97077b7d3459ba6d0 /community/llvm
parent84837d89991e1e82e5aef8e297541c572ebf2efa (diff)
Fixed
Diffstat (limited to 'community/llvm')
-rw-r--r--community/llvm/clang-2.8-alignOf.patch199
-rw-r--r--community/llvm/clang-2.8-cindexer-clang-path.patch13
-rw-r--r--community/llvm/cpp-headers.patch17
-rw-r--r--community/llvm/llvm-2.8-alignOf.patch59
4 files changed, 0 insertions, 288 deletions
diff --git a/community/llvm/clang-2.8-alignOf.patch b/community/llvm/clang-2.8-alignOf.patch
deleted file mode 100644
index 77aa5219a..000000000
--- a/community/llvm/clang-2.8-alignOf.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-Index: lib/Basic/IdentifierTable.cpp
-===================================================================
---- lib/Basic/IdentifierTable.cpp (revision 117774)
-+++ lib/Basic/IdentifierTable.cpp (revision 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: lib/AST/ExprCXX.cpp
-===================================================================
---- lib/AST/ExprCXX.cpp (revision 117774)
-+++ lib/AST/ExprCXX.cpp (revision 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: lib/AST/DeclObjC.cpp
-===================================================================
---- lib/AST/DeclObjC.cpp (revision 117774)
-+++ lib/AST/DeclObjC.cpp (revision 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: lib/AST/Stmt.cpp
-===================================================================
---- lib/AST/Stmt.cpp (revision 117774)
-+++ lib/AST/Stmt.cpp (revision 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: lib/AST/Expr.cpp
-===================================================================
---- lib/AST/Expr.cpp (revision 117774)
-+++ lib/AST/Expr.cpp (revision 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: lib/AST/DeclCXX.cpp
-===================================================================
---- lib/AST/DeclCXX.cpp (revision 117774)
-+++ lib/AST/DeclCXX.cpp (revision 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: lib/Lex/TokenLexer.cpp
-===================================================================
---- lib/Lex/TokenLexer.cpp (revision 117774)
-+++ lib/Lex/TokenLexer.cpp (revision 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/community/llvm/clang-2.8-cindexer-clang-path.patch b/community/llvm/clang-2.8-cindexer-clang-path.patch
deleted file mode 100644
index e283009e9..000000000
--- a/community/llvm/clang-2.8-cindexer-clang-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -upr clang-2.8.orig/tools/libclang/CIndexer.cpp clang-2.8/tools/libclang/CIndexer.cpp
---- clang-2.8.orig/tools/libclang/CIndexer.cpp 2010-05-27 23:16:37.000000000 +0300
-+++ clang-2.8/tools/libclang/CIndexer.cpp 2011-02-11 01:14:20.000000000 +0200
-@@ -68,7 +68,8 @@ const llvm::sys::Path& CIndexer::getClan
-
- // We now have the CIndex directory, locate clang relative to it.
- CIndexPath.eraseComponent();
-- CIndexPath.appendComponent("..");
-+ CIndexPath.eraseComponent();
-+ CIndexPath.eraseComponent();
- CIndexPath.appendComponent("bin");
- CIndexPath.appendComponent("clang");
- #endif
diff --git a/community/llvm/cpp-headers.patch b/community/llvm/cpp-headers.patch
deleted file mode 100644
index 7e32a3f5b..000000000
--- a/community/llvm/cpp-headers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uprb clang-2.7.orig/lib/Frontend/InitHeaderSearch.cpp clang-2.7/lib/Frontend/InitHeaderSearch.cpp
---- clang-2.7.orig/lib/Frontend/InitHeaderSearch.cpp 2010-03-06 21:38:10.000000000 +0200
-+++ clang-2.7/lib/Frontend/InitHeaderSearch.cpp 2010-04-30 19:05:24.000000000 +0300
-@@ -539,10 +539,10 @@ void InitHeaderSearch::AddDefaultCPlusPl
- "i586-suse-linux", "", "", triple);
- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
- "x86_64-suse-linux", "", "", triple);
-- // Arch Linux 2008-06-24
-- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
-+ // Arch Linux 2010-12-17
-+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.5.2",
- "i686-pc-linux-gnu", "", "", triple);
-- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
-+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.5.2",
- "x86_64-unknown-linux-gnu", "", "", triple);
- // Gentoo x86 2009.1 stable
- AddGnuCPlusPlusIncludePaths(
diff --git a/community/llvm/llvm-2.8-alignOf.patch b/community/llvm/llvm-2.8-alignOf.patch
deleted file mode 100644
index d48c10cd9..000000000
--- a/community/llvm/llvm-2.8-alignOf.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: include/llvm/ADT/StringMap.h
-===================================================================
---- include/llvm/ADT/StringMap.h (revision 117773)
-+++ include/llvm/ADT/StringMap.h (revision 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 (revision 117773)
-+++ include/llvm/Support/AlignOf.h (revision 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 (revision 117773)
-+++ include/llvm/Support/Allocator.h (revision 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 (revision 117773)
-+++ include/llvm/CodeGen/SlotIndexes.h (revision 117774)
-@@ -393,7 +393,7 @@
- IndexListEntry *entry =
- static_cast<IndexListEntry*>(
- ileAllocator.Allocate(sizeof(IndexListEntry),
-- alignof<IndexListEntry>()));
-+ alignOf<IndexListEntry>()));
-
- new (entry) IndexListEntry(mi, index);
-