commit: 39e41fc4ed320afb8ba7d95efef7e4f33a728245
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 18:11:23 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 18:11:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e41fc4
sys-devel/llvm: Clean up obsolete patches
.../llvm/files/clang-3.7-strip_doc_refs.patch | 42 ------
sys-devel/llvm/files/llvm-2.7-nodoctargz.patch | 47 -------
sys-devel/llvm/files/llvm-2.9-nodoctargz.patch | 39 ------
sys-devel/llvm/files/llvm-3.3-gentoo-install.patch | 141 --------------------
sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch | 30 -----
sys-devel/llvm/files/llvm-3.4-fix_varargs.patch | 148 ---------------------
sys-devel/llvm/files/llvm-3.7-nodoctargz.patch | 49 -------
7 files changed, 496 deletions(-)
diff --git a/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch
b/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch
deleted file mode 100644
index 9576b92..0000000
--- a/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- tools/clang/docs/AddressSanitizer.rst 2015-06-26 01:36:44.000000000
+0200
-+++ tools/clang/docs/AddressSanitizer.rst 2015-08-23 15:35:10.399174574
+0200
-@@ -198,7 +198,7 @@
- Some code should not be instrumented by AddressSanitizer. One may use the
- function attribute ``__attribute__((no_sanitize("address")))``
- (which has deprecated synonyms
--:ref:`no_sanitize_address <langext-address_sanitizer>` and
-+`no_sanitize_address` and
- `no_address_safety_analysis`) to disable instrumentation of a particular
- function. This attribute may not be supported by other compilers, so we
suggest
- to use it together with ``__has_feature(address_sanitizer)``.
---- tools/clang/docs/MemorySanitizer.rst 2015-02-26 16:59:30.000000000
+0100
-+++ tools/clang/docs/MemorySanitizer.rst 2015-08-23 15:35:28.002200413
+0200
-@@ -82,7 +82,7 @@
-
- Some code should not be checked by MemorySanitizer.
- One may use the function attribute
--:ref:`no_sanitize_memory <langext-memory_sanitizer>`
-+`no_sanitize_memory`
- to disable uninitialized checks in a particular function.
- MemorySanitizer may still instrument such functions to avoid false positives.
- This attribute may not be
---- tools/clang/docs/ThreadSanitizer.rst 2015-02-18 23:26:20.000000000
+0100
-+++ tools/clang/docs/ThreadSanitizer.rst 2015-08-23 15:34:53.918150364
+0200
-@@ -88,7 +88,7 @@
-
- Some code should not be instrumented by ThreadSanitizer.
- One may use the function attribute
--:ref:`no_sanitize_thread <langext-thread_sanitizer>`
-+`no_sanitize_thread`
- to disable instrumentation of plain (non-atomic) loads/stores in a particular
function.
- ThreadSanitizer still instruments such functions to avoid false positives and
- provide meaningful stack traces.
-@@ -102,7 +102,7 @@
- ThreadSanitizer supports ``src`` and ``fun`` entity types in
- :doc:`SanitizerSpecialCaseList`, that can be used to suppress data race
reports in
- the specified source files or functions. Unlike functions marked with
--:ref:`no_sanitize_thread <langext-thread_sanitizer>` attribute,
-+`no_sanitize_thread` attribute,
- blacklisted functions are not instrumented at all. This can lead to false
positives
- due to missed synchronization via atomic operations and missed stack frames
in reports.
-
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.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.3-gentoo-install.patch
b/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
deleted file mode 100644
index e477be5..0000000
--- a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 378109dbae7e4772d9b096384904c638a6a34028 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gen...@mgorny.alt.pl>
-Date: Fri, 19 Jul 2013 10:10:52 +0200
-Subject: [PATCH 1/2] gentoo install fixes
-
----
- Makefile.config.in | 6 +++---
- Makefile.rules | 7 +++----
- tools/gold/Makefile | 2 +-
- tools/llvm-config/BuildVariables.inc.in | 2 ++
- tools/llvm-config/Makefile | 4 ++++
- tools/llvm-config/llvm-config.cpp | 5 +++--
- utils/FileCheck/Makefile | 2 +-
- 7 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile.config.in b/Makefile.config.in
-index fd4f6ef..5634ecc 100644
---- a/Makefile.config.in
-+++ b/Makefile.config.in
-@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix)
- endif
-
- PROJ_bindir := $(PROJ_prefix)/bin
--PROJ_libdir := $(PROJ_prefix)/lib
-+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR)/llvm
- PROJ_datadir := $(PROJ_prefix)/share
--PROJ_docsdir := $(PROJ_prefix)/docs/llvm
--PROJ_etcdir := $(PROJ_prefix)/etc/llvm
-+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@
-+PROJ_etcdir := @EPREFIX@/etc/llvm
- PROJ_includedir := $(PROJ_prefix)/include
- PROJ_infodir := $(PROJ_prefix)/info
- PROJ_mandir := $(PROJ_prefix)/share/man
-diff --git a/Makefile.rules b/Makefile.rules
-index f0c542b..db252f7 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -276,7 +276,7 @@ ifeq ($(ENABLE_OPTIMIZED),1)
- # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
- ifneq ($(HOST_OS),FreeBSD)
- ifneq ($(HOST_OS),Darwin)
-- OmitFramePointer := -fomit-frame-pointer
-+ OmitFramePointer :=
- endif
- endif
-
-@@ -639,7 +638,7 @@ endif
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS), Darwin)
- ifdef TOOLNAME
-- LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
-+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)'
- ifdef EXAMPLE_TOOL
- LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
- else
-@@ -648,7 +647,7 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- endif
- else
- ifneq ($(DARWIN_MAJVERS),4)
-- LD.Flags += $(RPATH) -Wl,@executable_path/../lib
-+ LD.Flags += $(RPATH) -Wl,@executable_path/../lib -Wl,'$(PROJ_libdir)'
- endif
- ifeq ($(RC_XBS),YES)
- TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp
${OBJROOT}/dSYMs/llvm-lto.XXXXXX)
-diff --git a/tools/gold/Makefile b/tools/gold/Makefile
-index 496e31c..d36b340 100644
---- a/tools/gold/Makefile
-+++ b/tools/gold/Makefile
-@@ -24,7 +24,7 @@ include $(LEVEL)/Makefile.config
- # 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
--LDFLAGS += -L$(SharedLibDir)/$(SharedPrefix)
-+LDFLAGS += -L$(PROJ_libdir)
-
- include $(LEVEL)/Makefile.common
-
-diff --git a/tools/llvm-config/BuildVariables.inc.in
b/tools/llvm-config/BuildVariables.inc.in
-index fe87afb..fd9f2c6 100644
---- a/tools/llvm-config/BuildVariables.inc.in
-+++ b/tools/llvm-config/BuildVariables.inc.in
-@@ -25,3 +25,5 @@
- #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
- #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
- #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"
-+#define LLVM_RPATH "@LLVM_RPATH@"
-+#define LLVM_LIBDIR "@LLVM_LIBDIR@"
-diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
-index b20b6bf..fc56781 100644
---- a/tools/llvm-config/Makefile
-+++ b/tools/llvm-config/Makefile
-@@ -55,6 +55,10 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH)
Makefile $(ObjDir)/.dir
- >> temp.sed
- $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst
/,\/,$(TARGETS_TO_BUILD))/' \
- >> temp.sed
-+ $(Verb) $(ECHO) 's/@LLVM_RPATH@/$(subst /,\/,$(RPATH))/' \
-+ >> temp.sed
-+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \
-+ >> temp.sed
- $(Verb) $(SED) -f temp.sed < $< > $@
- $(Verb) $(RM) temp.sed
-
-diff --git a/tools/llvm-config/llvm-config.cpp
b/tools/llvm-config/llvm-config.cpp
-index 7edf5ec..4541c28 100644
---- a/tools/llvm-config/llvm-config.cpp
-+++ b/tools/llvm-config/llvm-config.cpp
-@@ -250,7 +250,7 @@ int main(int argc, char **argv) {
- ActivePrefix = CurrentExecPrefix;
- ActiveIncludeDir = ActivePrefix + "/include";
- ActiveBinDir = ActivePrefix + "/bin";
-- ActiveLibDir = ActivePrefix + "/lib";
-+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR "/llvm";
- ActiveIncludeOption = "-I" + ActiveIncludeDir;
- }
-
-@@ -277,7 +277,8 @@ int main(int argc, char **argv) {
- } else if (Arg == "--cxxflags") {
- OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n';
- } else if (Arg == "--ldflags") {
-- OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS
-+ OS << "-L" << ActiveLibDir << ' '
-+ << LLVM_RPATH << " -Wl," << ActiveLibDir << ' ' << LLVM_LDFLAGS
- << ' ' << LLVM_SYSTEM_LIBS << '\n';
- } else if (Arg == "--libs") {
- PrintLibs = true;
-diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile
-index 268b7bc..e7674f9 100644
---- a/utils/FileCheck/Makefile
-+++ b/utils/FileCheck/Makefile
-@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a
- TOOL_NO_EXPORTS = 1
-
- # Don't install this utility
--NO_INSTALL = 1
-+#NO_INSTALL = 1
-
- include $(LEVEL)/Makefile.common
-
---
-1.8.3.2
-
diff --git a/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch
b/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch
deleted file mode 100644
index 659f237..0000000
--- a/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d23d21bc76693dd2a43b5d76c68972ac01a055ba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gen...@mgorny.alt.pl>
-Date: Sat, 20 Jul 2013 15:56:56 +0200
-Subject: [PATCH] Remove insecure RUNPATHs.
-
-LLVM seems to build fine without them, and they were removed for 3.4
-already.
----
- Makefile.rules | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/Makefile.rules b/Makefile.rules
-index db252f7..a29481b 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -639,11 +639,6 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS), Darwin)
- ifdef TOOLNAME
- LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
-- ifdef EXAMPLE_TOOL
-- LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
-- else
-- LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag)
-- endif
- endif
- else
- ifneq ($(DARWIN_MAJVERS),4)
---
-1.8.3.2
-
diff --git a/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch
b/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch
deleted file mode 100644
index 377c4da..0000000
--- a/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=497298
-http://llvm.org/bugs/show_bug.cgi?id=18346
-
-SVN revisions:
-http://llvm.org/viewvc/llvm-project?view=revision&revision=197503
-http://llvm.org/viewvc/llvm-project?view=revision&revision=197505
-http://llvm.org/viewvc/llvm-project?view=revision&revision=197520
-
-diff -Naur llvm-3.4.orig/lib/Target/X86/X86ISelLowering.cpp
llvm-3.4/lib/Target/X86/X86ISelLowering.cpp
---- llvm-3.4.orig/lib/Target/X86/X86ISelLowering.cpp 2014-01-08
11:22:23.373060109 +0100
-+++ llvm-3.4/lib/Target/X86/X86ISelLowering.cpp 2014-01-08
11:23:58.517125907 +0100
-@@ -15226,9 +15226,15 @@
- MBB->addSuccessor(EndMBB);
- }
-
-+ // Make sure the last operand is EFLAGS, which gets clobbered by the branch
-+ // that was just emitted, but clearly shouldn't be "saved".
-+ assert((MI->getNumOperands() <= 3 ||
-+ !MI->getOperand(MI->getNumOperands() - 1).isReg() ||
-+ MI->getOperand(MI->getNumOperands() - 1).getReg() == X86::EFLAGS)
-+ && "Expected last argument to be EFLAGS");
- unsigned MOVOpc = Subtarget->hasFp256() ? X86::VMOVAPSmr : X86::MOVAPSmr;
- // In the XMM save block, save all the XMM argument registers.
-- for (int i = 3, e = MI->getNumOperands(); i != e; ++i) {
-+ for (int i = 3, e = MI->getNumOperands() - 1; i != e; ++i) {
- int64_t Offset = (i - 3) * 16 + VarArgsFPOffset;
- MachineMemOperand *MMO =
- F->getMachineMemOperand(
-diff -Naur llvm-3.4.orig/lib/Target/X86/X86InstrCompiler.td
llvm-3.4/lib/Target/X86/X86InstrCompiler.td
---- llvm-3.4.orig/lib/Target/X86/X86InstrCompiler.td 2014-01-08
11:22:23.374060109 +0100
-+++ llvm-3.4/lib/Target/X86/X86InstrCompiler.td 2014-01-08
11:23:39.654112857 +0100
-@@ -72,7 +72,7 @@
-
-
- // x86-64 va_start lowering magic.
--let usesCustomInserter = 1 in {
-+let usesCustomInserter = 1, Defs = [EFLAGS] in {
- def VASTART_SAVE_XMM_REGS : I<0, Pseudo,
- (outs),
- (ins GR8:$al,
-@@ -81,7 +81,8 @@
- "#VASTART_SAVE_XMM_REGS $al, $regsavefi,
$offset",
- [(X86vastart_save_xmm_regs GR8:$al,
- imm:$regsavefi,
-- imm:$offset)]>;
-+ imm:$offset),
-+ (implicit EFLAGS)]>;
-
- // The VAARG_64 pseudo-instruction takes the address of the va_list,
- // and places the address of the next argument into a register.
-diff -Naur llvm-3.4.orig/test/CodeGen/X86/vaargs.ll
llvm-3.4/test/CodeGen/X86/vaargs.ll
---- llvm-3.4.orig/test/CodeGen/X86/vaargs.ll 1970-01-01 01:00:00.000000000
+0100
-+++ llvm-3.4/test/CodeGen/X86/vaargs.ll 2014-01-08 11:23:53.451122402
+0100
-@@ -0,0 +1,67 @@
-+; RUN: llc -mcpu=corei7-avx %s -o - | FileCheck %s --check-prefix=CHECK
--check-prefix=NO-FLAGS
-+target datalayout =
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
-+target triple = "x86_64-apple-macosx10.9.0"
-+
-+%struct.__va_list_tag = type { i32, i32, i8*, i8* }
-+
-+; Check that vastart gets the right thing.
-+define i32 @sum(i32 %count, ...) nounwind optsize ssp uwtable {
-+; CHECK: testb %al, %al
-+; CHECK-NEXT: je
-+; CHECK-NEXT: ## BB#{{[0-9]+}}:
-+; CHECK-NEXT: vmovaps %xmm0, 48(%rsp)
-+; CHECK-NEXT: vmovaps %xmm1, 64(%rsp)
-+; CHECK-NEXT: vmovaps %xmm2, 80(%rsp)
-+; CHECK-NEXT: vmovaps %xmm3, 96(%rsp)
-+; CHECK-NEXT: vmovaps %xmm4, 112(%rsp)
-+; CHECK-NEXT: vmovaps %xmm5, 128(%rsp)
-+; CHECK-NEXT: vmovaps %xmm6, 144(%rsp)
-+; CHECK-NEXT: vmovaps %xmm7, 160(%rsp)
-+
-+; Check that [EFLAGS] hasn't been pulled in.
-+; NO-FLAGS-NOT: %flags
-+
-+ %ap = alloca [1 x %struct.__va_list_tag], align 16
-+ %1 = bitcast [1 x %struct.__va_list_tag]* %ap to i8*
-+ call void @llvm.va_start(i8* %1)
-+ %2 = icmp sgt i32 %count, 0
-+ br i1 %2, label %.lr.ph, label %._crit_edge
-+
-+.lr.ph: ; preds = %0
-+ %3 = getelementptr inbounds [1 x %struct.__va_list_tag]* %ap, i64 0, i64 0,
i32 0
-+ %4 = getelementptr inbounds [1 x %struct.__va_list_tag]* %ap, i64 0, i64 0,
i32 2
-+ %.pre = load i32* %3, align 16
-+ br label %5
-+
-+; <label>:5 ; preds = %.lr.ph, %13
-+ %6 = phi i32 [ %.pre, %.lr.ph ], [ %14, %13 ]
-+ %.01 = phi i32 [ %count, %.lr.ph ], [ %15, %13 ]
-+ %7 = icmp ult i32 %6, 41
-+ br i1 %7, label %8, label %10
-+
-+; <label>:8 ; preds = %5
-+ %9 = add i32 %6, 8
-+ store i32 %9, i32* %3, align 16
-+ br label %13
-+
-+; <label>:10 ; preds = %5
-+ %11 = load i8** %4, align 8
-+ %12 = getelementptr i8* %11, i64 8
-+ store i8* %12, i8** %4, align 8
-+ br label %13
-+
-+; <label>:13 ; preds = %10, %8
-+ %14 = phi i32 [ %6, %10 ], [ %9, %8 ]
-+ %15 = add nsw i32 %.01, 1
-+ %16 = icmp sgt i32 %15, 0
-+ br i1 %16, label %5, label %._crit_edge
-+
-+._crit_edge: ; preds = %13, %0
-+ %.0.lcssa = phi i32 [ %count, %0 ], [ %15, %13 ]
-+ call void @llvm.va_end(i8* %1)
-+ ret i32 %.0.lcssa
-+}
-+
-+declare void @llvm.va_start(i8*) nounwind
-+
-+declare void @llvm.va_end(i8*) nounwind
-diff -Naur llvm-3.4.orig/test/CodeGen/X86/vastart-defs-eflags.ll
llvm-3.4/test/CodeGen/X86/vastart-defs-eflags.ll
---- llvm-3.4.orig/test/CodeGen/X86/vastart-defs-eflags.ll 1970-01-01
01:00:00.000000000 +0100
-+++ llvm-3.4/test/CodeGen/X86/vastart-defs-eflags.ll 2014-01-08
11:23:39.654112857 +0100
-@@ -0,0 +1,23 @@
-+; RUN: llc %s -o - | FileCheck %s
-+
-+target datalayout =
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
-+target triple = "x86_64-apple-macosx10.10.0"
-+
-+; Check that vastart handling doesn't get between testb and je for the branch.
-+define i32 @check_flag(i32 %flags, ...) nounwind {
-+entry:
-+; CHECK: {{^}} testb $2, %bh
-+; CHECK-NOT: test
-+; CHECK: {{^}} je
-+ %and = and i32 %flags, 512
-+ %tobool = icmp eq i32 %and, 0
-+ br i1 %tobool, label %if.end, label %if.then
-+
-+if.then: ; preds = %entry
-+ br label %if.end
-+
-+if.end: ; preds = %entry, %if.then
-+ %hasflag = phi i32 [ 1, %if.then ], [ 0, %entry ]
-+ ret i32 %hasflag
-+}
-+
diff --git a/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch
b/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch
deleted file mode 100644
index 8690523..0000000
--- a/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch
+++ /dev/null
@@ -1,49 +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) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz
$(DESTDIR)$(PROJ_docsdir)
- $(Verb) cd $(PROJ_OBJ_DIR)/doxygen/html && \
- for DIR in $$($(FIND) . -type d); do \
- DESTSUB="$(DESTDIR)$(PROJ_docsdir)/html/doxygen/$$(echo $$DIR | cut
-c 3-)"; \
- $(MKDIR) $$DESTSUB && \
- $(FIND) $$DIR -maxdepth 1 -type f -exec $(DataInstall) {} $$DESTSUB
\; ; \
- if [ $$? != 0 ]; then exit 1; fi \
- done
-
--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
