diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2013-08-02 16:17:36 +0300 | 
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2013-08-02 16:17:36 +0300 | 
| commit | 8e1ce3179cf45ad3c7552ce08b3e9d4f0fd45330 (patch) | |
| tree | 2e29dfe83728653447648e018c20659fe3f74675 | |
| parent | f1bff082bde8e4703f85950fd0d001d64033543b (diff) | |
cleanup
17 files changed, 0 insertions, 769 deletions
| diff --git a/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch b/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch deleted file mode 100644 index 9d99c9c..0000000 --- a/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e25389b66b5ced3a2b5461077dcc9a505d334e3d Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Tue, 13 Mar 2012 14:12:21 -0400 -Subject: [PATCH 1/2] r600: Add some intrinsic definitions - ---- - include/llvm/Intrinsics.td     |    1 + - include/llvm/IntrinsicsR600.td |   35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 36 insertions(+), 0 deletions(-) - create mode 100644 include/llvm/IntrinsicsR600.td - -diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td -index 069f907..e90dd85 100644 ---- a/include/llvm/Intrinsics.td -+++ b/include/llvm/Intrinsics.td -@@ -441,3 +441,4 @@ include "llvm/IntrinsicsCellSPU.td" - include "llvm/IntrinsicsXCore.td" - include "llvm/IntrinsicsPTX.td" - include "llvm/IntrinsicsHexagon.td" -+include "llvm/IntrinsicsR600.td" -diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td -new file mode 100644 -index 0000000..789fecb ---- /dev/null -+++ b/include/llvm/IntrinsicsR600.td -@@ -0,0 +1,35 @@ -+//===- IntrinsicsR600.td - Defines R600 intrinsics ---------*- tablegen -*-===// -+// -+//                     The LLVM Compiler Infrastructure -+// -+// This file is distributed under the University of Illinois Open Source -+// License. See LICENSE.TXT for details. -+// -+//===----------------------------------------------------------------------===// -+// -+// This file defines all of the R600-specific intrinsics. -+// -+//===----------------------------------------------------------------------===// -+// -+// Authors: Tom Stellard <thomas.stellard@amd.com> -+// -+ -+let TargetPrefix = "r600" in { -+ -+class R600ReadPreloadRegisterIntrinsic<string name> -+  : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>, -+    GCCBuiltin<name>; -+ -+multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> { -+  def _x : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_x")>; -+  def _y : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_y")>; -+  def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>; -+} -+ -+defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < -+                                       "__builtin_r600_read_ngroups">; -+defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < -+                                       "__builtin_r600_read_tgid">; -+defm int_r600_read_tidig : R600ReadPreloadRegisterIntrinsic_xyz < -+                                       "__builtin_r600_read_tidig">; -+} // End TargetPrefix = "r600" ---  -1.7.7.6 - diff --git a/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch b/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch deleted file mode 100644 index db176dd..0000000 --- a/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 17667fa3450470f7c89fc2ba4631d908cf510749 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 14 Mar 2012 11:19:35 -0400 -Subject: [PATCH 2/2] r600: Add get_global_size and get_local_size intrinsics - ---- - include/llvm/IntrinsicsR600.td |    4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td -index 789fecb..0473acb 100644 ---- a/include/llvm/IntrinsicsR600.td -+++ b/include/llvm/IntrinsicsR600.td -@@ -26,6 +26,10 @@ multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> { -   def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>; - } -  -+defm int_r600_read_global_size : R600ReadPreloadRegisterIntrinsic_xyz < -+                                       "__builtin_r600_read_global_size">; -+defm int_r600_read_local_size : R600ReadPreloadRegisterIntrinsic_xyz < -+                                       "__builtin_r600_read_local_size">; - defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < -                                        "__builtin_r600_read_ngroups">; - defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < ---  -1.7.7.6 - diff --git a/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch b/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch deleted file mode 100644 index 583fdf9..0000000 --- a/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- docs/CommandGuide/Makefile.orig	2009-10-26 16:54:33.000000000 +0100 -+++ docs/CommandGuide/Makefile	2009-10-26 17:32:03.000000000 +0100 -@@ -19,7 +19,7 @@ - DST_PS_DIR=ps/ -  - # If we are in BUILD_FOR_WEBSITE mode, default to the all target. --all:: html man ps -+all:: html man -  - clean: - 	rm -f pod2htm*.*~~ $(HTML) $(MAN) $(PS) -@@ -81,7 +81,7 @@ - MAN_DIR  := $(PROJ_mandir)/man1 - PS_DIR   := $(PROJ_docsdir)/ps -  --install-local:: $(HTML) $(INSTALL_MANS) $(PS) -+install-local:: $(HTML) $(INSTALL_MANS) - 	$(Echo) Installing HTML CommandGuide Documentation - 	$(Verb) $(MKDIR) $(HTML_DIR) - 	$(Verb) $(DataInstall) $(HTML) $(HTML_DIR) -@@ -90,9 +90,6 @@ - 	$(Echo) Installing MAN CommandGuide Documentation - 	$(Verb) $(MKDIR) $(MAN_DIR) - 	$(Verb) $(DataInstall) $(INSTALL_MANS) $(MAN_DIR) --	$(Echo) Installing PS CommandGuide Documentation --	$(Verb) $(MKDIR) $(PS_DIR) --	$(Verb) $(DataInstall) $(PS) $(PS_DIR) -  - uninstall-local:: - 	$(Echo) Uninstalling CommandGuide Documentation diff --git a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch deleted file mode 100644 index cce09eb..0000000 --- a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- docs/Makefile.orig	2010-04-26 15:00:58.000000000 +0200 -+++ docs/Makefile	2010-04-26 15:03:12.000000000 +0200 -@@ -46,13 +46,12 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: doxygen ocamldoc -  --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - 	$(Echo) Installing HTML documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img - 	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html - 	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) -  - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - 	$(Echo) Packaging HTML documentation -@@ -64,12 +63,11 @@ - install-doxygen: doxygen - 	$(Echo) Installing doxygen documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - 	  $(FIND) . -type f -exec \ - 	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; -  --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc -  - regendoc: - 	$(Echo) Building doxygen documentation -@@ -95,7 +93,6 @@ - install-ocamldoc: ocamldoc - 	$(Echo) Installing ocamldoc documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) - 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ - 	  $(FIND) . -type f -exec \ - 	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; -@@ -105,7 +102,6 @@ - 	$(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* - 	$(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc - 	$(Verb) $(GZIP) $(PROJ_OBJ_DIR)/ocamldoc.tar --	$(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ -  - regen-ocamldoc: - 	$(Echo) Building ocamldoc documentation diff --git a/sys-devel/llvm/files/llvm-2.8-alignof.patch b/sys-devel/llvm/files/llvm-2.8-alignof.patch deleted file mode 100644 index ae7f314..0000000 --- a/sys-devel/llvm/files/llvm-2.8-alignof.patch +++ /dev/null @@ -1,59 +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); -  diff --git a/sys-devel/llvm/files/llvm-2.8-darwin8.patch b/sys-devel/llvm/files/llvm-2.8-darwin8.patch deleted file mode 100644 index 284ab47..0000000 --- a/sys-devel/llvm/files/llvm-2.8-darwin8.patch +++ /dev/null @@ -1,15 +0,0 @@ -Avoid like in Makefile.rules -ld: -rpath can only be used when targeting Mac OS X 10.5 or later - ---- unittests/Makefile.unittest -+++ unittests/Makefile.unittest -@@ -37,7 +37,9 @@ - ifeq ($(ENABLE_SHARED), 1) -   # Add the absolute path to the dynamic library.  This is ok because -   # we'll never install unittests. -+ifneq ($(DARWIN_MAJVERS),4) -   LD.Flags += $(RPATH) -Wl,$(SharedLibDir) -+endif -   # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most -   # of the time. -   Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" diff --git a/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch b/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch deleted file mode 100644 index b95d7d7..0000000 --- a/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- llvm/trunk/include/llvm/Operator.h	2011/02/07 16:40:21	125006 -+++ llvm/trunk/include/llvm/Operator.h	2011/05/08 01:59:22	131062 -@@ -186,28 +186,46 @@ - }; -  - class AddOperator --  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {}; -+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> { -+  ~AddOperator(); // DO NOT IMPLEMENT -+}; - class SubOperator --  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {}; -+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> { -+  ~SubOperator(); // DO NOT IMPLEMENT -+}; - class MulOperator --  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {}; -+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> { -+  ~MulOperator(); // DO NOT IMPLEMENT -+}; - class ShlOperator --  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {}; -+  : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> { -+  ~ShlOperator(); // DO NOT IMPLEMENT -+}; -  -    - class SDivOperator --  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {}; -+  : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> { -+  ~SDivOperator(); // DO NOT IMPLEMENT -+}; - class UDivOperator --  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {}; -+  : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> { -+  ~UDivOperator(); // DO NOT IMPLEMENT -+}; - class AShrOperator --  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {}; -+  : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> { -+  ~AShrOperator(); // DO NOT IMPLEMENT -+}; - class LShrOperator --  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {}; -+  : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> { -+  ~LShrOperator(); // DO NOT IMPLEMENT -+}; -    -    -    - class GEPOperator -   : public ConcreteOperator<Operator, Instruction::GetElementPtr> { -+  ~GEPOperator(); // DO NOT IMPLEMENT -+ -   enum { -     IsInBounds = (1 << 0) -   }; diff --git a/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch deleted file mode 100644 index 9507817..0000000 --- a/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- docs/Makefile.orig	2011-02-28 21:30:46.000000000 +0100 -+++ docs/Makefile	2011-02-28 21:35:22.000000000 +0100 -@@ -53,13 +53,12 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: $(generated_targets) -  --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - 	$(Echo) Installing HTML documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img - 	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html - 	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) -  - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - 	$(Echo) Packaging HTML documentation -@@ -71,12 +70,11 @@ - install-doxygen: doxygen - 	$(Echo) Installing doxygen documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - 	  $(FIND) . -type f -exec \ - 	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; -  --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc -  - regendoc: - 	$(Echo) Building doxygen documentation -@@ -102,7 +100,6 @@ - install-ocamldoc: ocamldoc - 	$(Echo) Installing ocamldoc documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) - 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ - 	  $(FIND) . -type f -exec \ - 	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; diff --git a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch b/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch deleted file mode 100644 index 04e4024..0000000 --- a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=403519 -http://llvm.org/viewvc/llvm-project?view=rev&revision=153938 - ---- llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp	2011/06/15 15:29:47	133059 -+++ llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp	2012/04/03 06:59:28	153938 -@@ -291,9 +291,10 @@ - } - #endif -  --extern "C" void *PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, --                                         unsigned *OrigCallAddrPlus4, --                                         bool is64Bit) { -+extern "C" { -+static void* LLVM_ATTRIBUTE_USED PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, -+                                                         unsigned *OrigCallAddrPlus4, -+                                                         bool is64Bit) { -   // Adjust the pointer to the address of the call instruction in the stub -   // emitted by emitFunctionStub, rather than the instruction after it. -   unsigned *StubCallAddr = StubCallAddrPlus4 - 1; -@@ -337,6 +338,7 @@ -   // stack after we restore all regs. -   return Target; - } -+} -  -  -  diff --git a/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch b/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch deleted file mode 100644 index c485e9b..0000000 --- a/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h	2011-07-25 23:24:55.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h	2011-12-02 13:06:48.000000000 +0000 -@@ -34,6 +34,10 @@ -    - } // End llvm namespace -  -+// Generated files will use "namespace PPC". To avoid symbol clash, -+// undefine PPC here. PPC may be predefined on some hosts. -+#undef PPC -+ - // Defines symbolic names for PowerPC registers.  This defines a mapping from - // register name to register number. - // -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h	2011-07-26 00:24:13.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h	2011-12-02 13:06:48.000000000 +0000 -@@ -14,6 +14,10 @@ - #ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H - #define LLVM_TARGET_POWERPC_PPCPREDICATES_H -  -+// Generated files will use "namespace PPC". To avoid symbol clash, -+// undefine PPC here. PPC may be predefined on some hosts. -+#undef PPC -+ - namespace llvm { - namespace PPC { -   /// Predicate - These are "(BI << 5) | BO"  for various predicates. -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h	2011-07-25 19:53:23.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h	2011-12-02 16:21:23.000000000 +0000 -@@ -12,6 +12,8 @@ -  - #include "llvm/MC/MCFixup.h" -  -+#undef PPC -+ - namespace llvm { - namespace PPC { - enum Fixups { diff --git a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch b/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch deleted file mode 100644 index 031448d..0000000 --- a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/gold/Makefile	2011/11/23 03:03:21	145094 -+++ tools/gold/Makefile	2011/11/23 03:07:25	145095 -@@ -24,6 +24,6 @@ - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) -+CXXFLAGS+=-L$(SharedLibDir)/$(SharedPrefix) -lLTO -  - include $(LEVEL)/Makefile.common diff --git a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch b/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch deleted file mode 100644 index 18f5cf6..0000000 --- a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=393023 -http://llvm.org/bugs/show_bug.cgi?id=11177 - -Index: llvm-3.0-3.0/bindings/ocaml/llvm/Makefile -=================================================================== ---- llvm-3.0-3.0.orig/bindings/ocaml/llvm/Makefile	2011-11-15 12:17:02.785987852 +0100 -+++ llvm-3.0-3.0/bindings/ocaml/llvm/Makefile	2011-11-15 12:20:12.661983615 +0100 -@@ -30,7 +30,7 @@ - $(OcamlDir)/META.llvm: META.llvm - 	$(Verb) $(CP) -f $< $@ -  --install-meta:: $(ObjDir)/META.llvm -+install-meta:: $(ObjDir)/../META.llvm - 	$(Echo) "Install $(BuildMode) $(DestMETA)" - 	$(Verb) $(MKDIR) $(PROJ_libocamldir) - 	$(Verb) $(DataInstall) META.llvm "$(DestMETA)" diff --git a/sys-devel/llvm/files/llvm-3.0-set_soname.patch b/sys-devel/llvm/files/llvm-3.0-set_soname.patch deleted file mode 100644 index 69ba74d..0000000 --- a/sys-devel/llvm/files/llvm-3.0-set_soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=409267 -http://llvm.org/bugs/show_bug.cgi?id=12334 ---- tools/llvm-shlib/Makefile.orig	2012-03-26 18:14:13.071797115 +0200 -+++ tools/llvm-shlib/Makefile	2012-03-26 17:31:12.491196254 +0200 -@@ -67,6 +67,7 @@ -     # Include everything from the .a's into the shared library. -     LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ -                        -Wl,--no-whole-archive -+    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif -  - ifeq ($(HOST_OS),Linux) diff --git a/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch b/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch deleted file mode 100644 index de2d46b..0000000 --- a/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001 -From: Ben Longbons <b.r.longbons@gmail.com> -Date: Fri, 29 Jun 2012 12:58:34 -0700 -Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue - lines in a function." - -This meants that the debugger could find meaningful line information. - -This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. ---- - lib/CodeGen/AsmPrinter/DwarfDebug.cpp |    7 ++----- - test/DebugInfo/X86/ending-run.ll      |    6 ++---- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -index 3e79a6d..24aedfb 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { -   if (!MI->isDebugValue()) { -     DebugLoc DL = MI->getDebugLoc(); -     if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { --      unsigned Flags = 0; -+      unsigned Flags = DWARF2_FLAG_IS_STMT; -       PrevInstLoc = DL; -       if (DL == PrologEndLoc) { -         Flags |= DWARF2_FLAG_PROLOGUE_END; -         PrologEndLoc = DebugLoc(); -       } --      if (PrologEndLoc.isUnknown()) --        Flags |= DWARF2_FLAG_IS_STMT; -- -       if (!DL.isUnknown()) { -         const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); -         recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { -                                        MF->getFunction()->getContext()); -     recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), -                      FnStartDL.getScope(MF->getFunction()->getContext()), --                     0); -+                     DWARF2_FLAG_IS_STMT); -   } - } -  -diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll -index 6935c47..0cd3de1 100644 ---- a/test/DebugInfo/X86/ending-run.ll -+++ b/test/DebugInfo/X86/ending-run.ll -@@ -1,11 +1,9 @@ - ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj - ; RUN: llvm-dwarfdump %t | FileCheck %s -  --; Check that the line table starts at 7, not 4, but that the first --; statement isn't until line 8. -+; Check that the line table starts at 7, not 4. -  --; CHECK-NOT: 0x0000000000000000      7      0      1   0  is_stmt --; CHECK: 0x0000000000000000      7      0      1   0 -+; CHECK: 0x0000000000000000      7      0      1   0  is_stmt - ; CHECK: 0x0000000000000004      8     18      1   0  is_stmt prologue_end -  - define i32 @callee(i32 %x) nounwind uwtable ssp { ---  -1.7.10 - diff --git a/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch b/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch deleted file mode 100644 index a03ec42..0000000 --- a/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- llvm/trunk/lib/Support/Host.cpp	2012/04/23 22:22:46	155401 -+++ llvm/trunk/lib/Support/Host.cpp	2012/04/23 22:41:39	155402 -@@ -230,6 +230,10 @@ -       case 45: -         return "corei7-avx"; -  -+      // Ivy Bridge: -+      case 58: -+        return "core-avx-i"; -+ -       case 28: // Intel Atom processor. All processors are manufactured using -                // the 45 nm process -         return "atom"; diff --git a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch deleted file mode 100644 index 3a622b5..0000000 --- a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- docs/Makefile.orig	2012-04-30 17:00:01.000000000 +0200 -+++ docs/Makefile	2012-04-30 17:15:52.000000000 +0200 -@@ -52,11 +52,10 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: $(generated_targets) -  --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - 	$(Echo) Installing HTML documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - 	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) -  - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - 	$(Echo) Packaging HTML documentation -@@ -68,12 +67,11 @@ - install-doxygen: doxygen - 	$(Echo) Installing doxygen documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - 	  $(FIND) . -type f -exec \ - 	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; -  --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc -  - regendoc: - 	$(Echo) Building doxygen documentation -@@ -99,7 +97,6 @@ - install-ocamldoc: ocamldoc - 	$(Echo) Installing ocamldoc documentation - 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html --	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) - 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ - 	  $(FIND) . -type f -exec \ - 	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; -@@ -109,7 +106,6 @@ - 	$(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* - 	$(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc - 	$(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar --	$(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ -  - regen-ocamldoc: - 	$(Echo) Building ocamldoc documentation diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild deleted file mode 100644 index ff8f985..0000000 --- a/sys-devel/llvm/llvm-9999.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.39 2013/02/02 23:41:54 mgorny Exp $ - -EAPI=5 - -# pypy gives me around 1700 unresolved tests due to open file limit -# being exceeded. probably GC does not close them fast enough. -PYTHON_COMPAT=( python{2_5,2_6,2_7} ) - -inherit git eutils flag-o-matic multilib python-any-r1 toolchain-funcs pax-utils - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="http://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="git://people.freedesktop.org/~tstellar/llvm" - -LICENSE="UoI-NCSA" -SLOT="0" -KEYWORDS="" -IUSE="debug doc gold +libffi multitarget ocaml test udis86 vim-syntax r600" - -DEPEND="dev-lang/perl -    dev-python/sphinx -    >=sys-devel/make-3.79 -    >=sys-devel/flex-2.5.4 -    >=sys-devel/bison-1.875d -    || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) -    || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) -    gold? ( >=sys-devel/binutils-2.22[cxx] ) -    libffi? ( virtual/pkgconfig -        virtual/libffi ) -    ocaml? ( dev-lang/ocaml ) -    udis86? ( dev-libs/udis86[pic(+)] ) -    ${PYTHON_DEPS}" -RDEPEND="dev-lang/perl -    libffi? ( virtual/libffi ) -    vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -pkg_setup() { -    # Required for test and build -    python-any-r1_pkg_setup - -    # need to check if the active compiler is ok - -    broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 " -    broken_gcc_x86=" 3.4.0 3.4.2 " -    broken_gcc_amd64=" 3.4.6 " - -    gcc_vers=$(gcc-fullversion) - -    if [[ ${broken_gcc} == *" ${version} "* ]] ; then -        elog "Your version of gcc is known to miscompile llvm." -        elog "Check http://www.llvm.org/docs/GettingStarted.html for" -        elog "possible solutions." -        die "Your currently active version of gcc is known to miscompile llvm" -    fi - -    if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then -        elog "Your version of gcc is known to miscompile llvm on x86" -        elog "architectures.  Check" -        elog "http://www.llvm.org/docs/GettingStarted.html for possible" -        elog "solutions." -        die "Your currently active version of gcc is known to miscompile llvm" -    fi - -    if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]]; -    then -        elog "Your version of gcc is known to miscompile llvm in amd64" -        elog "architectures.  Check" -        elog "http://www.llvm.org/docs/GettingStarted.html for possible" -        elog "solutions." -        die "Your currently active version of gcc is known to miscompile llvm" -    fi -} - -src_prepare() { -    # unfortunately ./configure won't listen to --mandir and the-like, so take -    # care of this. -    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)/${PN}, \ -        -i Makefile.config.in || die "Makefile.config sed failed" -    sed -e "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \ -        -i tools/llvm-config/llvm-config.cpp || die "llvm-config sed failed" - -    einfo "Fixing rpath and CFLAGS" -    sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ -        -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ -        -i Makefile.rules || die "rpath sed failed" -    if use gold; then -        sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ -            -i tools/gold/Makefile || die "gold rpath sed failed" -    fi - -    # FileCheck is needed at least for dragonegg tests -    sed -e "/NO_INSTALL = 1/s/^/#/" -i utils/FileCheck/Makefile \ -        || die "FileCheck Makefile sed failed" - -    epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch -    epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch - -    # User patches -    epatch_user -} - -src_configure() { -    local CONF_FLAGS="--enable-shared -        --with-optimize-option= -        $(use_enable !debug optimized) -        $(use_enable debug assertions) -        $(use_enable debug expensive-checks)" - -    if use multitarget; then -        CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" -    else -        CONF_FLAGS="${CONF_FLAGS} --enable-targets=host,cpp" -    fi - -        CONF_FLAGS="${CONF_FLAGS} --enable-experimental-targets=R600" - -    if use amd64; then -        CONF_FLAGS="${CONF_FLAGS} --enable-pic" -    fi - -    if use gold; then -        CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/" -    fi -    if use ocaml; then -        CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml" -    else -        CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none" -    fi - -    if use udis86; then -        CONF_FLAGS="${CONF_FLAGS} --with-udis86" -    fi - -    if use libffi; then -        append-cppflags "$(pkg-config --cflags libffi)" -    fi -    CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)" - -    # llvm prefers clang over gcc, so we may need to force that -    tc-export CC CXX -    econf ${CONF_FLAGS} -} - -src_compile() { -    emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 - -    emake -C docs -f Makefile.sphinx man -    use doc && emake -C docs -f Makefile.sphinx html - -    pax-mark m Release/bin/lli -    if use test; then -        pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests -        pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests -        pax-mark m unittests/Support/Release/SupportTests -    fi -} - -src_install() { -    emake KEEP_SYMBOLS=1 DESTDIR="${D}" install - -    doman docs/_build/man/*.1 -    use doc && dohtml -r docs/_build/html/ - -    if use vim-syntax; then -        insinto /usr/share/vim/vimfiles/syntax -        doins utils/vim/*.vim -    fi - -    # Fix install_names on Darwin.  The build system is too complicated -    # to just fix this, so we correct it post-install -    local lib= f= odylib= libpv=${PV} -    if [[ ${CHOST} == *-darwin* ]] ; then -        eval $(grep PACKAGE_VERSION= configure) -        [[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} -        for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.dylib ; do -            # libEnhancedDisassembly is Darwin10 only, so non-fatal -            [[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue -            ebegin "fixing install_name of $lib" -            install_name_tool \ -                -id "${EPREFIX}"/usr/lib/${PN}/${lib} \ -                "${ED}"/usr/lib/${PN}/${lib} -            eend $? -        done -        for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do -            odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib) -            ebegin "fixing install_name reference to ${odylib} of ${f##*/}" -            install_name_tool \ -                -change "${odylib}" \ -                    "${EPREFIX}"/usr/lib/${PN}/libLLVM-${libpv}.dylib \ -                "${f}" -            eend $? -        done -    fi -} | 
