Update to 2.9rc1

.gitignore

@@ -1,2 +1,2 @@
-/llvm-2.8.tgz
+/llvm-2.9rc1.src.tar.gz
-/clang-2.8.tgz
+/clang-2.9rc1.src.tar.gz

clang-2.8-alignOf.patch

@@ -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;

llvm-2.8-alignOf.patch

@@ -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);
- 

llvm.spec

@@ -10,22 +10,21 @@
   %bcond_without ocaml
 %endif
 
+%global prerel rc1
+%global downloadurl http://llvm.org/%{?prerel:pre-}releases/%{version}
+
 Name:           llvm
-Version:        2.8
+Version:        2.9
-Release:        7%{?dist}
+Release:        0.1.%{prerel}%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
 License:        NCSA
 URL:            http://llvm.org/
-Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tgz
+Source0:        %{downloadurl}/llvm-%{version}%{?prerel}.src.tar.gz
-Source1:        http://llvm.org/releases/%{version}/clang-%{version}.tgz
+Source1:        %{downloadurl}/clang-%{version}%{?prerel}.src.tar.gz
 # Data files should be installed with timestamps preserved
 Patch0:         llvm-2.6-timestamp.patch
-# rename alignof -> alignOf for C++0x support
-# http://llvm.org/bugs/show_bug.cgi?id=8423
-Patch1:         llvm-2.8-alignOf.patch
-Patch2:         clang-2.8-alignOf.patch
 
 BuildRequires:  bison
 BuildRequires:  chrpath
@@ -193,13 +192,11 @@ HTML documentation for LLVM's OCaml binding.
 
 
 %prep
-%setup -q -n llvm-%{version} -a1 %{?_with_gcc:-a2}
+%setup -q -n llvm-%{version}%{?prerel} -a1 %{?_with_gcc:-a2}
-mv clang-%{version} tools/clang
+mv clang-%{version}%{?prerel} tools/clang
 
 %patch0 -p1 -b .timestamp
-%patch1 -p0 -b .alignOf
 pushd tools/clang
-%patch2 -p0 -b .alignOf
 popd
 
 # Encoding fix
@@ -341,7 +338,7 @@ find examples -name 'Makefile' | xargs -0r rm -f
 %defattr(-,root,root,-)
 %doc clang-docs/* clang-testlog.txt
 %{_bindir}/clang*
-%{_bindir}/c-index-test
+#%{_bindir}/c-index-test
 %{_bindir}/tblgen
 %{_prefix}/lib/clang
 %doc %{_mandir}/man1/clang.1.*
@@ -394,6 +391,9 @@ find examples -name 'Makefile' | xargs -0r rm -f
 
 
 %changelog
+* Thu Mar 10 2011 Michel Salim <salimma@fedoraproject.org> - 2.9-0.1.rc1
+- Update to 2.9rc1
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-220d361b4d17051ff4bb21c64abe05ba  llvm-2.8.tgz
+1469571f018d1adbf5da624b465ed1eb  llvm-2.9rc1.src.tar.gz
-10e14c901fc3728eecbd5b829e011b59  clang-2.8.tgz
+37240bd17838bcca627eb3fc48aca305  clang-2.9rc1.src.tar.gz