summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-08-22 15:43:14 +0200
committerMichał Górny <mgorny@gentoo.org>2016-08-22 17:11:50 +0200
commit11d093e4ec16f42e733d605dccf3100d4bb435ba (patch)
tree430bb5398c01766b2874e1226a187749ffa98f69 /sys-devel/llvm/files/cmake
parentsys-devel/clang: Enable stand-alone builds against sys-devel/llvm (diff)
downloadgentoo-11d093e4ec16f42e733d605dccf3100d4bb435ba.tar.gz
gentoo-11d093e4ec16f42e733d605dccf3100d4bb435ba.tar.bz2
gentoo-11d093e4ec16f42e733d605dccf3100d4bb435ba.zip
sys-devel/llvm: Group all patches by newest version applicable
Diffstat (limited to 'sys-devel/llvm/files/cmake')
-rw-r--r--sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch36
-rw-r--r--sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch32
-rw-r--r--sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch28
-rw-r--r--sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch35
-rw-r--r--sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch52
-rw-r--r--sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch28
-rw-r--r--sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch25
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch16
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch12
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch12
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch43
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch14
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch17
13 files changed, 0 insertions, 350 deletions
diff --git a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
deleted file mode 100644
index 3e57f0dcaa6..00000000000
--- a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2ec240a76253839cd1c5dc2e964f55698ae468fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 8 Jun 2015 06:43:00 +0200
-Subject: [PATCH 2/4] cmake: Support overriding Sphinx HTML doc install
- directory
-
-Provide ${PROJECT}_INSTALL_HTML variables (e.g. LLVM_INSTALL_HTML) to
-override Sphinx HTML doc install directory.
-
-Fixes: https://llvm.org/bugs/show_bug.cgi?id=23780
----
- cmake/modules/AddSphinxTarget.cmake | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake
-index 045dc23..9c9c444 100644
---- a/cmake/modules/AddSphinxTarget.cmake
-+++ b/cmake/modules/AddSphinxTarget.cmake
-@@ -53,8 +53,12 @@ function (add_sphinx_target builder project)
- DESTINATION share/man/man1)
-
- elseif (builder STREQUAL html)
-- install(DIRECTORY "${SPHINX_BUILD_DIR}"
-- DESTINATION "share/doc/${project}")
-+ string(TOUPPER "${project}" project_upper)
-+ set(${project_upper}_INSTALL_HTML "share/doc/${project}/html"
-+ CACHE STRING "HTML documentation install directory for ${project}")
-+
-+ install(DIRECTORY "${SPHINX_BUILD_DIR}/"
-+ DESTINATION "${${project_upper}_INSTALL_HTML}")
- else()
- message(WARNING Installation of ${builder} not supported)
- endif()
---
-2.4.3
-
diff --git a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
deleted file mode 100644
index b1c74c69443..00000000000
--- a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4f7092ba05cccfeea7d26177d93f3d7a57d9bce2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 8 Jun 2015 14:29:03 +0200
-Subject: [PATCH 3/4] cmake: Add an ordering dep between HTML & man Sphinx
- targets
-
-Add a dependency between HTML & manpage Sphinx targets to prevent two
-instances of Sphinx from running in parallel, and therefore solves race
-conditions reusing the same doctree directory.
-
-Fixes: https://llvm.org/bugs/show_bug.cgi?id=23781
----
- docs/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index da27627..63309a6 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -100,6 +100,9 @@ if (LLVM_ENABLE_SPHINX)
-
- if (${SPHINX_OUTPUT_MAN})
- add_sphinx_target(man llvm)
-+ if (${SPHINX_OUTPUT_HTML})
-+ add_dependencies(docs-llvm-html docs-llvm-man)
-+ endif()
- endif()
-
- endif()
---
-2.4.3
-
diff --git a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch
deleted file mode 100644
index 92ca2e47e81..00000000000
--- a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d9f80393cfd4e586242ac3efd4e6ba6b49ce39ae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 9 Jun 2015 11:58:52 +0200
-Subject: [PATCH 4/4] cmake: Do not install libgtest
-
-libgtest is an internal test dependency, and should not be installed to
-the live system as a part of LLVM.
----
- utils/unittest/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt
-index b34e22a..3fe5884 100644
---- a/utils/unittest/CMakeLists.txt
-+++ b/utils/unittest/CMakeLists.txt
-@@ -41,6 +41,9 @@ if (PTHREAD_LIBRARY_PATH)
- list(APPEND LIBS pthread)
- endif()
-
-+# Delay building until the tests pull it in, and avoid installing it
-+set(EXCLUDE_FROM_ALL ON)
-+
- add_llvm_library(gtest
- googletest/src/gtest-all.cc
-
---
-2.4.3
-
diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
deleted file mode 100644
index 931eb56e5a9..00000000000
--- a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
-index fa7780f..e3a6c8f 100644
---- a/tools/clang/lib/Driver/Driver.cpp
-+++ b/tools/clang/lib/Driver/Driver.cpp
-@@ -66,8 +66,7 @@ Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple,
- if (ClangResourceDir != "") {
- llvm::sys::path::append(P, ClangResourceDir);
- } else {
-- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX);
-- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang",
-+ llvm::sys::path::append(P, "..", "lib", "clang",
- CLANG_VERSION_STRING);
- }
- ResourceDir = P.str();
-diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
-index f078b37..0c514fc 100644
---- a/tools/clang/lib/Frontend/CompilerInvocation.cpp
-+++ b/tools/clang/lib/Frontend/CompilerInvocation.cpp
-@@ -1097,7 +1097,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0,
- if (ClangResourceDir != "")
- llvm::sys::path::append(P, ClangResourceDir);
- else
-- llvm::sys::path::append(P, "..", Twine("lib") + CLANG_LIBDIR_SUFFIX,
-+ llvm::sys::path::append(P, "..", "lib",
- "clang", CLANG_VERSION_STRING);
-
- return P.str();
-diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt
-index 7de5fbe..49f439b 100644
---- a/tools/clang/lib/Headers/CMakeLists.txt
-+++ b/tools/clang/lib/Headers/CMakeLists.txt
-@@ -100,4 +100,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc")
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
-+ DESTINATION lib/clang/${CLANG_VERSION}/include)
diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
deleted file mode 100644
index 904a72a358a..00000000000
--- a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b28503def986bcbc388a04be0d51cbe80bc59506 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 9 Jun 2015 12:11:50 +0200
-Subject: [PATCH] Install clang runtime into /usr/lib (without suffix)
-
----
- lib/Driver/Driver.cpp | 3 +--
- lib/Frontend/CompilerInvocation.cpp | 3 +--
- lib/Headers/CMakeLists.txt | 2 +-
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
-index a04a1f8..418d46a 100644
---- a/tools/clang/lib/Driver/Driver.cpp
-+++ b/tools/clang//lib/Driver/Driver.cpp
-@@ -66,8 +66,7 @@ Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple,
- if (ClangResourceDir != "") {
- llvm::sys::path::append(P, ClangResourceDir);
- } else {
-- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX);
-- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang",
-+ llvm::sys::path::append(P, "..", "lib", "clang",
- CLANG_VERSION_STRING);
- }
- ResourceDir = P.str();
-diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
-index 9485767..0b9ecbd 100644
---- a/tools/clang/lib/Frontend/CompilerInvocation.cpp
-+++ b/tools/clang/lib/Frontend/CompilerInvocation.cpp
-@@ -1053,8 +1053,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0,
- if (ClangResourceDir != "") {
- llvm::sys::path::append(P, ClangResourceDir);
- } else {
-- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX);
-- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang",
-+ llvm::sys::path::append(P, "..", "lib", "clang",
- CLANG_VERSION_STRING);
- }
-
-diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt
-index 29a738e..3769d23 100644
---- a/tools/clang/lib/Headers/CMakeLists.txt
-+++ b/tools/clang/lib/Headers/CMakeLists.txt
-@@ -93,4 +93,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc")
- install(
- FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
-+ DESTINATION lib/clang/${CLANG_VERSION}/include)
---
-2.4.3
-
diff --git a/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
deleted file mode 100644
index 0b93deba0b5..00000000000
--- a/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d07632abe23d55eec2aae303a142a97765a77d32 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 9 Jun 2015 12:20:06 +0200
-Subject: [PATCH 2/2] cmake: Make CLANG_LIBDIR_SUFFIX overridable
-
-Make CLANG_LIBDIR_SUFFIX a cache variable so that it can be explicitly
-overriden. It is used purely to find the LLVMgold.so plugin, so we want
-to set it to native suffix.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 357286b..647f976 100644
---- a/tools/clang/CMakeLists.txt
-+++ b/tools/clang/CMakeLists.txt
-@@ -203,7 +203,7 @@ set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING
- "Vendor-specific uti.")
-
- # The libdir suffix must exactly match whatever LLVM's configuration used.
--set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}")
-+set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING "")
-
- set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
- set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
---
-2.4.3
-
diff --git a/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
deleted file mode 100644
index 93538009d29..00000000000
--- a/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8bd62a681744d3c31a0837c0f84f99ea4987e017 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 9 Jun 2015 12:17:57 +0200
-Subject: [PATCH] cmake: Install compiler-rt into /usr/lib (without suffix)
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0d8a880..5ae98a9 100644
---- a/projects/compiler-rt/CMakeLists.txt
-+++ b/projects/compiler-rt/CMakeLists.txt
-@@ -52,7 +52,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD)
- # Setup the paths where compiler-rt runtimes and headers should be stored.
- set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
- set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION})
-+ set(COMPILER_RT_INSTALL_PATH lib/clang/${CLANG_VERSION})
- option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests."
- ${LLVM_INCLUDE_TESTS})
- option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered"
---
-2.4.3
-
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch
deleted file mode 100644
index 943a8407f12..00000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake
---- llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2015-07-30 06:28:50.000000000 +0200
-+++ llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake 2015-10-27 17:10:47.365847079 +0100
-@@ -209,12 +209,6 @@
- test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu")
- test_target_arch(mips64 "" "-mips64r2" "-mabi=n64")
- endif()
-- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm")
-- test_target_arch(arm "" "-march=armv7-a")
-- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32")
-- test_target_arch(aarch32 "" "-march=armv8-a")
-- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64")
-- test_target_arch(aarch64 "" "-march=armv8-a")
- endif()
- set(COMPILER_RT_OS_SUFFIX "")
- endif()
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
deleted file mode 100644
index 626498c57ee..00000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:13:53 247841
-+++ b/tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:14:01 247842
-@@ -141,6 +141,9 @@
- endif()
- if (NOT LLDB_DISABLE_CURSES)
- list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
-+ if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO)
-+ list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
-+ endif()
- endif()
- endif()
- # On FreeBSD backtrace() is provided by libexecinfo, not libc.
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
deleted file mode 100644
index d53ce193ca2..00000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt
---- llvm-3.7.0.src.orig/docs/CMakeLists.txt 2015-08-18 18:48:44.000000000 +0200
-+++ llvm-3.7.0.src/docs/CMakeLists.txt 2015-10-12 14:40:00.985384589 +0200
-@@ -115,7 +115,7 @@
- endif()
-
- list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml)
--if( NOT uses_ocaml LESS 0 )
-+if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS )
- set(doc_targets
- ocaml_llvm
- ocaml_llvm_all_backends
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
deleted file mode 100644
index 024bad737de..00000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- llvm-3.7.0rc3.src-orig/cmake/modules/AddOCaml.cmake 2015-06-08 05:22:22.000000000 +1000
-+++ llvm-3.7.0rc3.src/cmake/modules/AddOCaml.cmake 2015-08-30 19:22:37.216580808 +1000
-@@ -131,7 +131,7 @@
- if( APPLE )
- set(ocaml_rpath "@executable_path/../../lib")
- elseif( UNIX )
-- set(ocaml_rpath "\\$ORIGIN/../../lib")
-+ set(ocaml_rpath "\\$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}")
- endif()
- list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
-
-@@ -183,12 +183,12 @@
- endforeach()
-
- install(FILES ${install_files}
-- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
- install(FILES ${install_shlibs}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE
-- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
-
- foreach( install_file ${install_files} ${install_shlibs} )
- get_filename_component(filename "${install_file}" NAME)
---- llvm-3.7.0rc3.src-orig/bindings/ocaml/backends/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100
-+++ llvm-3.7.0rc3.src/bindings/ocaml/backends/CMakeLists.txt 2015-08-30 19:23:49.726583886 +1000
-@@ -23,5 +23,5 @@
- "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}")
-
- install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
-- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
- endforeach()
---- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100
-+++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt 2015-08-30 19:23:43.561583624 +1000
-@@ -8,4 +8,4 @@
- "${LLVM_LIBRARY_DIR}/ocaml/META.llvm")
-
- install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
-- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
diff --git a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch
deleted file mode 100644
index e42c08a8dc9..00000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt 2015-08-12 20:04:55.397881480 +0200
-+++ b/CMakeLists.txt 2015-08-12 20:05:06.625741113 +0200
-@@ -152,11 +152,6 @@
-
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-
--if (CMAKE_BUILD_TYPE AND
-- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
-- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--endif()
--
- set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
-
- # They are used as destination of target generators.
diff --git a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch
deleted file mode 100644
index d82236e85fe..00000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur llvm-3.8.0rc1.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.8.0rc1.src/projects/compiler-rt/cmake/config-ix.cmake
---- llvm-3.8.0rc1.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2016-01-13 17:56:15.000000000 +0100
-+++ llvm-3.8.0rc1.src/projects/compiler-rt/cmake/config-ix.cmake 2016-01-27 19:43:21.265315207 +0100
-@@ -219,13 +219,6 @@
- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "mips")
- test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu")
- test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu" "-mabi=n64")
-- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm")
-- test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
-- test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
-- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
-- test_target_arch(aarch32 "" "-march=armv8-a")
-- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64")
-- test_target_arch(aarch64 "" "-march=armv8-a")
- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "wasm32")
- test_target_arch(wasm32 "" "--target=wasm32-unknown-unknown")
- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "wasm64")