Import llvm-toolchain-8 (1:8.0.1-4)debian/8.0.1-4 debian

author: Igor Pashev <pashev.igor@gmail.com> 2019-12-02 17:06:08 +0300
committer: Igor Pashev <pashev.igor@gmail.com> 2019-12-02 17:06:08 +0300
commit: 18583eaa2c6fa769ce80605422fa10a60d353af7 (patch)
tree: 4b6730afc2006e86ae8b91c8c4cf52b313b5c188 /debian/patches
download: llvm-toolchain-8-debian.tar.gz
100 files changed, 5390 insertions, 0 deletions
diff --git a/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
new file mode 100644
index 0000000..3647e71
--- /dev/null
+++ b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
@@ -0,0 +1,31 @@
+From d0d969074f6e0f975ad53d21e7ce6c7b40cf2957 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Fri, 4 May 2018 15:43:06 +0200
+Subject: [PATCH] [llvm] cmake: resolve symlinks in LLVMConfig.cmake
+
+Ensure that symlinks such as /usr/lib/llvm-X.Y/cmake (pointing to
+lib/cmake/llvm) are resolved. This ensures that LLVM_INSTALL_PREFIX
+becomes /usr/lib/llvm-X.Y instead of /usr.
+
+Partially addresses PR37128
+---
+ cmake/modules/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: llvm-toolchain-snapshot_8~svn342269/cmake/modules/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/cmake/modules/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn342269/cmake/modules/CMakeLists.txt
+@@ -82,10 +82,10 @@ file(COPY .
+ # Generate LLVMConfig.cmake for the install tree.
+ set(LLVM_CONFIG_CODE "
+ # Compute the installation prefix from this LLVMConfig.cmake file location.
+-get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)")
++get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" REALPATH)")
+ # Construct the proper number of get_filename_component(... PATH)
+ # calls to compute the installation prefix.
+-string(REGEX REPLACE "/" ";" _count "${LLVM_INSTALL_PACKAGE_DIR}")
++string(REGEX REPLACE "/" ";" _count "prefix/${LLVM_INSTALL_PACKAGE_DIR}")
+ foreach(p ${_count})
+   set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}
+ get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)")
diff --git a/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch b/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
new file mode 100644
index 0000000..dca84e3
--- /dev/null
+++ b/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
@@ -0,0 +1,34 @@
+From c830d84bc802ca1e9219415a5784c4ad97a34819 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Fri, 4 May 2018 15:55:26 +0200
+Subject: [PATCH] [clang] cmake: resolve symlinks in ClangConfig.cmake
+
+Ensure that symlinks such as /usr/lib/cmake/clang-X.Y (pointing to
+/usr/lib/llvm-X.Y/lib/cmake/llvm) are resolved. This ensures that
+CLANG_INSTALL_PREFIX ends up to be /usr/lib/llvm-X.Y instead of /usr.
+
+Partially addresses PR37128
+---
+ cmake/modules/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
+index be6d1d7257..bcb61f6cc8 100644
+--- a/clang/cmake/modules/CMakeLists.txt
++++ b/clang/cmake/modules/CMakeLists.txt
+@@ -30,10 +30,10 @@ set(CLANG_CONFIG_EXPORTS_FILE)
+ # Generate ClangConfig.cmake for the install tree.
+ set(CLANG_CONFIG_CODE "
+ # Compute the installation prefix from this LLVMConfig.cmake file location.
+-get_filename_component(CLANG_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)")
++get_filename_component(CLANG_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" REALPATH)")
+ # Construct the proper number of get_filename_component(... PATH)
+ # calls to compute the installation prefix.
+-string(REGEX REPLACE "/" ";" _count "${CLANG_INSTALL_PACKAGE_DIR}")
++string(REGEX REPLACE "/" ";" _count "prefix/${CLANG_INSTALL_PACKAGE_DIR}")
+ foreach(p ${_count})
+   set(CLANG_CONFIG_CODE "${CLANG_CONFIG_CODE}
+ get_filename_component(CLANG_INSTALL_PREFIX \"\${CLANG_INSTALL_PREFIX}\" PATH)")
+-- 
+2.17.0
+
diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch
new file mode 100644
index 0000000..41feae8
--- /dev/null
+++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch
@@ -0,0 +1,19 @@
+---
+ lib/Support/CommandLine.cpp |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: llvm-toolchain-snapshot_8~svn342269/lib/Support/CommandLine.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/lib/Support/CommandLine.cpp
++++ llvm-toolchain-snapshot_8~svn342269/lib/Support/CommandLine.cpp
+@@ -2127,6 +2127,10 @@ public:
+     OS << " " << LLVM_VERSION_INFO;
+ #endif
+     OS << "\n  ";
++#ifdef LLVM_DEBIAN_INFO
++    OS << LLVM_DEBIAN_INFO;
++#endif
++    OS << "\n  ";
+ #ifndef __OPTIMIZE__
+     OS << "DEBUG build";
+ #else
diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
new file mode 100644
index 0000000..6678ea2
--- /dev/null
+++ b/debian/patches/0044-soname.diff
@@ -0,0 +1,31 @@
+---
+ clang/tools/libclang/CMakeLists.txt |    2 +-
+ tools/llvm-shlib/CMakeLists.txt     |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+Index: llvm-toolchain-snapshot_8~svn349138/clang/tools/libclang/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/tools/libclang/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn349138/clang/tools/libclang/CMakeLists.txt
+@@ -88,7 +88,7 @@ else()
+   set(output_name "clang")
+ endif()
+ 
+-add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC}
++add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} SONAME
+   OUTPUT_NAME ${output_name}
+   ${SOURCES}
+   DEPENDS clang-headers
+Index: llvm-toolchain-snapshot_8~svn349138/tools/llvm-shlib/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn349138/tools/llvm-shlib/CMakeLists.txt
+@@ -41,6 +41,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
+ 
+   add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
+ 
++  set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
++
+   list(REMOVE_DUPLICATES LIB_NAMES)
+   if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
+      OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
diff --git a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch
new file mode 100644
index 0000000..58a0b8f
--- /dev/null
+++ b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch
@@ -0,0 +1,50 @@
+From: Nicholas D Steeves <nsteeves@gmail.com>
+Date: Sat, 10 Feb 2018 21:00:55 -0500
+Subject: Set html_static_path = ['_static'] everywhere.
+
+---
+ clang-tools-extra/docs/conf.py | 2 +-
+ clang/docs/analyzer/conf.py    | 2 +-
+ clang/docs/conf.py             | 2 +-
+ polly/docs/conf.py             | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+Index: llvm-toolchain-snapshot_9~svn355080/clang/docs/analyzer/conf.py
+===================================================================
+--- llvm-toolchain-snapshot_9~svn355080.orig/clang/docs/analyzer/conf.py
++++ llvm-toolchain-snapshot_9~svn355080/clang/docs/analyzer/conf.py
+@@ -121,7 +121,7 @@ html_theme = 'haiku'
+ # Add any paths that contain custom static files (such as style sheets) here,
+ # relative to this directory. They are copied after the builtin static files,
+ # so a file named "default.css" will overwrite the builtin "default.css".
+-html_static_path = []
++html_static_path = ['_static']
+ 
+ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+ # using the given strftime format.
+Index: llvm-toolchain-snapshot_9~svn355080/clang/docs/conf.py
+===================================================================
+--- llvm-toolchain-snapshot_9~svn355080.orig/clang/docs/conf.py
++++ llvm-toolchain-snapshot_9~svn355080/clang/docs/conf.py
+@@ -122,7 +122,7 @@ html_theme = 'haiku'
+ # Add any paths that contain custom static files (such as style sheets) here,
+ # relative to this directory. They are copied after the builtin static files,
+ # so a file named "default.css" will overwrite the builtin "default.css".
+-html_static_path = []
++html_static_path = ['_static']
+ 
+ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+ # using the given strftime format.
+Index: llvm-toolchain-snapshot_9~svn355080/polly/docs/conf.py
+===================================================================
+--- llvm-toolchain-snapshot_9~svn355080.orig/polly/docs/conf.py
++++ llvm-toolchain-snapshot_9~svn355080/polly/docs/conf.py
+@@ -127,7 +127,7 @@ except ImportError:
+ # Add any paths that contain custom static files (such as style sheets) here,
+ # relative to this directory. They are copied after the builtin static files,
+ # so a file named "default.css" will overwrite the builtin "default.css".
+-html_static_path = []
++html_static_path = ['_static']
+ 
+ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+ # using the given strftime format.
diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
new file mode 100644
index 0000000..03934df
--- /dev/null
+++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
@@ -0,0 +1,109 @@
+From: Nicholas D Steeves <nsteeves@gmail.com>
+Date: Sat, 10 Feb 2018 21:02:17 -0500
+Subject: Use Debian-provided MathJax everywhere.
+
+---
+ clang-tools-extra/docs/Doxyfile       | 2 +-
+ clang-tools-extra/docs/conf.py        | 3 +++
+ clang-tools-extra/docs/doxygen.cfg.in | 2 +-
+ clang/docs/analyzer/conf.py           | 3 +++
+ clang/docs/conf.py                    | 3 +++
+ clang/docs/doxygen.cfg.in             | 2 +-
+ docs/doxygen.cfg.in                   | 2 +-
+ polly/docs/doxygen.cfg.in             | 2 +-
+ 8 files changed, 14 insertions(+), 5 deletions(-)
+
+Index: llvm-toolchain-8_8~svn353935/clang-tools-extra/docs/conf.py
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/clang-tools-extra/docs/conf.py
++++ llvm-toolchain-8_8~svn353935/clang-tools-extra/docs/conf.py
+@@ -123,6 +123,9 @@ html_theme = 'haiku'
+ # so a file named "default.css" will overwrite the builtin "default.css".
+ html_static_path = ['_static']
+ 
++# Use Debian-provided MathJax
++mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
++
+ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+ # using the given strftime format.
+ #html_last_updated_fmt = '%b %d, %Y'
+Index: llvm-toolchain-8_8~svn353935/clang-tools-extra/docs/doxygen.cfg.in
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/clang-tools-extra/docs/doxygen.cfg.in
++++ llvm-toolchain-8_8~svn353935/clang-tools-extra/docs/doxygen.cfg.in
+@@ -1443,7 +1443,7 @@ MATHJAX_FORMAT         = HTML-CSS
+ # The default value is: http://cdn.mathjax.org/mathjax/latest.
+ # This tag requires that the tag USE_MATHJAX is set to YES.
+ 
+-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
++MATHJAX_RELPATH        = /usr/share/javascript/mathjax
+ 
+ # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+ # extension names that should be enabled during MathJax rendering. For example
+Index: llvm-toolchain-8_8~svn353935/clang/docs/analyzer/conf.py
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/clang/docs/analyzer/conf.py
++++ llvm-toolchain-8_8~svn353935/clang/docs/analyzer/conf.py
+@@ -123,6 +123,9 @@ html_theme = 'haiku'
+ # so a file named "default.css" will overwrite the builtin "default.css".
+ html_static_path = ['_static']
+ 
++# Use Debian-provided MathJax
++mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
++
+ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+ # using the given strftime format.
+ #html_last_updated_fmt = '%b %d, %Y'
+Index: llvm-toolchain-8_8~svn353935/clang/docs/conf.py
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/clang/docs/conf.py
++++ llvm-toolchain-8_8~svn353935/clang/docs/conf.py
+@@ -124,6 +124,9 @@ html_theme = 'haiku'
+ # so a file named "default.css" will overwrite the builtin "default.css".
+ html_static_path = ['_static']
+ 
++# Use Debian-provided MathJax
++mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
++
+ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+ # using the given strftime format.
+ #html_last_updated_fmt = '%b %d, %Y'
+Index: llvm-toolchain-8_8~svn353935/clang/docs/doxygen.cfg.in
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/clang/docs/doxygen.cfg.in
++++ llvm-toolchain-8_8~svn353935/clang/docs/doxygen.cfg.in
+@@ -1432,7 +1432,7 @@ MATHJAX_FORMAT         = HTML-CSS
+ # The default value is: http://cdn.mathjax.org/mathjax/latest.
+ # This tag requires that the tag USE_MATHJAX is set to YES.
+ 
+-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
++MATHJAX_RELPATH        = /usr/share/javascript/mathjax
+ 
+ # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+ # extension names that should be enabled during MathJax rendering. For example
+Index: llvm-toolchain-8_8~svn353935/docs/doxygen.cfg.in
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/docs/doxygen.cfg.in
++++ llvm-toolchain-8_8~svn353935/docs/doxygen.cfg.in
+@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT         = HTML-CSS
+ # The default value is: http://cdn.mathjax.org/mathjax/latest.
+ # This tag requires that the tag USE_MATHJAX is set to YES.
+ 
+-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
++MATHJAX_RELPATH        = /usr/share/javascript/mathjax
+ 
+ # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+ # extension names that should be enabled during MathJax rendering. For example
+Index: llvm-toolchain-8_8~svn353935/polly/docs/doxygen.cfg.in
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/polly/docs/doxygen.cfg.in
++++ llvm-toolchain-8_8~svn353935/polly/docs/doxygen.cfg.in
+@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT         = HTML-CSS
+ # The default value is: http://cdn.mathjax.org/mathjax/latest.
+ # This tag requires that the tag USE_MATHJAX is set to YES.
+ 
+-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
++MATHJAX_RELPATH        = /usr/share/javascript/mathjax
+ 
+ # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+ # extension names that should be enabled during MathJax rendering. For example
diff --git a/debian/patches/0050-Remove-explicit-python-version-list.patch b/debian/patches/0050-Remove-explicit-python-version-list.patch
new file mode 100644
index 0000000..4dc34de
--- /dev/null
+++ b/debian/patches/0050-Remove-explicit-python-version-list.patch
@@ -0,0 +1,28 @@
+From 61caa3a0c61fd4f2a049e9a14b5f4f74354dbb29 Mon Sep 17 00:00:00 2001
+From: Christian Biesinger <cbiesinger@chromium.org>
+Date: Thu, 18 Jul 2019 14:52:36 -0500
+Subject: [PATCH] Remove explicit python version list
+
+This is required to make -DPYTHON_EXECUTABLE work correctly
+---
+ llvm/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 81c2bab39ec..e2222d42aae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -603,10 +603,6 @@ message(STATUS "LLVM default target triple: ${LLVM_DEFAULT_TARGET_TRIPLE}")
+ 
+ include(HandleLLVMOptions)
+ 
+-# Verify that we can find a Python 2 interpreter.  Python 3 is unsupported.
+-# FIXME: We should support systems with only Python 3, but that requires work
+-# on LLDB.
+-set(Python_ADDITIONAL_VERSIONS 2.7)
+ include(FindPythonInterp)
+ if( NOT PYTHONINTERP_FOUND )
+   message(FATAL_ERROR
+-- 
+2.22.0.510.g264f2c817a-goog
+
diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch
new file mode 100644
index 0000000..c530e14
--- /dev/null
+++ b/debian/patches/19-clang_debian_version.patch
@@ -0,0 +1,21 @@
+Index: llvm-toolchain-snapshot_3.5~svn210337/clang/lib/Basic/Version.cpp
+===================================================================
+--- llvm-toolchain-snapshot_3.5~svn210337.orig/clang/lib/Basic/Version.cpp
++++ llvm-toolchain-snapshot_3.5~svn210337/clang/lib/Basic/Version.cpp
+@@ -15,6 +15,7 @@
+ #include "clang/Basic/LLVM.h"
+ #include "clang/Config/config.h"
+ #include "llvm/Support/raw_ostream.h"
++#include "clang/Debian/debian_path.h"
+ #include <cstdlib>
+ #include <cstring>
+ 
+@@ -125,7 +126,7 @@ std::string getClangToolFullVersion(Stri
+ #ifdef CLANG_VENDOR
+   OS << CLANG_VENDOR;
+ #endif
+-  OS << ToolName << " version " CLANG_VERSION_STRING " "
++  OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION " "
+      << getClangFullRepositoryVersion();
+ 
+   // If vendor supplied, include the base LLVM version as well.
diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
new file mode 100644
index 0000000..4942762
--- /dev/null
+++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
@@ -0,0 +1,218 @@
+---
+ clang/include/clang/Basic/Builtins.def                    |    8 +-
+ clang/lib/AST/Decl.cpp                                    |   12 +--
+ clang/lib/Sema/SemaChecking.cpp                           |   11 +-
+ clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp |    6 -
+ clang/test/Sema/builtins.c                                |   11 +-
+ clang/test/Sema/warn-strlcpycat-size.c                    |   55 --------------
+ 6 files changed, 25 insertions(+), 78 deletions(-)
+
+Index: llvm-toolchain-snapshot_8~svn342269/clang/include/clang/Basic/Builtins.def
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/include/clang/Basic/Builtins.def
++++ llvm-toolchain-snapshot_8~svn342269/clang/include/clang/Basic/Builtins.def
+@@ -517,8 +517,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
+ BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
+ BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
+ BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF")
+-BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF")
+-BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF")
++//BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF")
++//BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF")
+ BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
+ BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
+ BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
+@@ -968,8 +968,8 @@ LIBBUILTIN(getcontext, "iK*",     "fj",
+ LIBBUILTIN(_longjmp, "vJi",       "fr",    "setjmp.h", ALL_GNU_LANGUAGES)
+ LIBBUILTIN(siglongjmp, "vSJi",    "fr",    "setjmp.h", ALL_GNU_LANGUAGES)
+ // non-standard but very common
+-LIBBUILTIN(strlcpy, "zc*cC*z",    "f",     "string.h", ALL_GNU_LANGUAGES)
+-LIBBUILTIN(strlcat, "zc*cC*z",    "f",     "string.h", ALL_GNU_LANGUAGES)
++//LIBBUILTIN(strlcpy, "zc*cC*z",    "f",     "string.h", ALL_GNU_LANGUAGES)
++//LIBBUILTIN(strlcat, "zc*cC*z",    "f",     "string.h", ALL_GNU_LANGUAGES)
+ //   id objc_msgSend(id, SEL, ...)
+ LIBBUILTIN(objc_msgSend, "GGH.",   "f",     "objc/message.h", OBJC_LANG)
+ // long double objc_msgSend_fpret(id self, SEL op, ...)
+Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/AST/Decl.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/AST/Decl.cpp
++++ llvm-toolchain-snapshot_8~svn342269/clang/lib/AST/Decl.cpp
+@@ -3639,13 +3639,13 @@ unsigned FunctionDecl::getMemoryFunction
+   case Builtin::BImemmove:
+     return Builtin::BImemmove;
+ 
+-  case Builtin::BIstrlcpy:
+-  case Builtin::BI__builtin___strlcpy_chk:
+-    return Builtin::BIstrlcpy;
++//  case Builtin::BIstrlcpy:
++//  case Builtin::BI__builtin___strlcpy_chk:
++//    return Builtin::BIstrlcpy;
+ 
+-  case Builtin::BIstrlcat:
+-  case Builtin::BI__builtin___strlcat_chk:
+-    return Builtin::BIstrlcat;
++//  case Builtin::BIstrlcat:
++//  case Builtin::BI__builtin___strlcat_chk:
++//    return Builtin::BIstrlcat;
+ 
+   case Builtin::BI__builtin_memcmp:
+   case Builtin::BImemcmp:
+Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Sema/SemaChecking.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Sema/SemaChecking.cpp
++++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Sema/SemaChecking.cpp
+@@ -1241,12 +1241,12 @@ Sema::CheckBuiltinFunctionCall(FunctionD
+   case Builtin::BI__builtin___memset_chk:
+     SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "memset");
+     break;
+-  case Builtin::BI__builtin___strlcat_chk:
++/*  case Builtin::BI__builtin___strlcat_chk:
+     SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "strlcat");
+     break;
+   case Builtin::BI__builtin___strlcpy_chk:
+     SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "strlcpy");
+-    break;
++    break;*/
+   case Builtin::BI__builtin___strncat_chk:
+     SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "strncat");
+     break;
+@@ -4098,9 +4098,10 @@ bool Sema::CheckFunctionCall(FunctionDec
+     return false;
+ 
+   // Handle memory setting and copying functions.
+-  if (CMId == Builtin::BIstrlcpy || CMId == Builtin::BIstrlcat)
+-    CheckStrlcpycatArguments(TheCall, FnInfo);
+-  else if (CMId == Builtin::BIstrncat)
++//  if (CMId == Builtin::BIstrlcpy || CMId == Builtin::BIstrlcat)
++//    CheckStrlcpycatArguments(TheCall, FnInfo);
++//  else
++  if (CMId == Builtin::BIstrncat)
+     CheckStrncatArguments(TheCall, FnInfo);
+   else
+     CheckMemaccessArguments(TheCall, CMId, FnInfo);
+Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
++++ llvm-toolchain-snapshot_8~svn342269/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+@@ -240,9 +240,9 @@ GenericTaintChecker::TaintPropagationRul
+     case Builtin::BIstrncpy:
+     case Builtin::BIstrncat:
+       return TaintPropagationRule(1, 2, 0, true);
+-    case Builtin::BIstrlcpy:
+-    case Builtin::BIstrlcat:
+-      return TaintPropagationRule(1, 2, 0, false);
++//    case Builtin::BIstrlcpy:
++//    case Builtin::BIstrlcat:
++//      return TaintPropagationRule(1, 2, 0, false);
+     case Builtin::BIstrndup:
+       return TaintPropagationRule(0, 1, ReturnValueIndex);
+ 
+Index: llvm-toolchain-snapshot_8~svn342269/clang/test/Sema/builtins.c
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/test/Sema/builtins.c
++++ llvm-toolchain-snapshot_8~svn342269/clang/test/Sema/builtins.c
+@@ -190,11 +190,11 @@ void test18() {
+ 
+   ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
+   result = __builtin___strlcpy_chk(dst, src, sizeof(dst), sizeof(dst));
+-  result = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst));
++//  result = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst));
+ 
+   ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src));      // expected-error {{too few arguments to function call}}
+   ptr = __builtin___strlcpy_chk(dst, src, sizeof(dst), sizeof(dst)); // expected-warning {{incompatible integer to pointer conversion}}
+-  ptr = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst)); // expected-warning {{incompatible integer to pointer conversion}}
++//  ptr = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst)); // expected-warning {{incompatible integer to pointer conversion}}
+ }
+ 
+ void no_ms_builtins() {
+@@ -209,12 +209,12 @@ void unavailable() {
+ }
+ 
+ // rdar://18259539
+-size_t strlcpy(char * restrict dst, const char * restrict src, size_t size);
+-size_t strlcat(char * restrict dst, const char * restrict src, size_t size);
++//size_t strlcpy(char * restrict dst, const char * restrict src, size_t size);
++//size_t strlcat(char * restrict dst, const char * restrict src, size_t size);
+ 
+ void Test19(void)
+ {
+-        static char b[40];
++/*        static char b[40];
+         static char buf[20];
+ 
+         strlcpy(buf, b, sizeof(b)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} \\
+@@ -223,12 +223,13 @@ void Test19(void)
+                                     // expected-note {{change size argument to be the size of the destination}} \
+ 				    // expected-warning {{'__builtin___strlcpy_chk' will always overflow; destination buffer has size 20, but size argument is 40}}
+ 
+-        strlcat(buf, b, sizeof(b)); // expected-warning {{size argument in 'strlcat' call appears to be size of the source; expected the size of the destination}} \
++/*        strlcat(buf, b, sizeof(b)); // expected-warning {{size argument in 'strlcat' call appears to be size of the source; expected the size of the destination}} \
+                                     // expected-note {{change size argument to be the size of the destination}}
+ 				    
+         __builtin___strlcat_chk(buf, b, sizeof(b), __builtin_object_size(buf, 0)); // expected-warning {{size argument in '__builtin___strlcat_chk' call appears to be size of the source; expected the size of the destination}} \
+                                                                                    // expected-note {{change size argument to be the size of the destination}} \
+ 				                                                   // expected-warning {{'__builtin___strlcat_chk' will always overflow; destination buffer has size 20, but size argument is 40}}
++*/
+ }
+ 
+ // rdar://11076881
+Index: llvm-toolchain-snapshot_8~svn342269/clang/test/Sema/warn-strlcpycat-size.c
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/test/Sema/warn-strlcpycat-size.c
++++ /dev/null
+@@ -1,55 +0,0 @@
+-// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
+-
+-typedef __SIZE_TYPE__ size_t;
+-size_t strlcpy (char * restrict dst, const char * restrict src, size_t size);
+-size_t strlcat (char * restrict dst, const char * restrict src, size_t size);
+-size_t strlen (const char *s);
+-
+-char s1[100];
+-char s2[200];
+-char * s3;
+-
+-struct {
+-  char f1[100];
+-  char f2[100][3];
+-} s4, **s5;
+-
+-int x;
+-
+-void f(void)
+-{
+-  strlcpy(s1, s2, sizeof(s1)); // no warning
+-  strlcpy(s1, s2, sizeof(s2)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
+-  strlcpy(s1, s3, strlen(s3)+1); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
+-  strlcat(s2, s3, sizeof(s3)); // expected-warning {{size argument in 'strlcat' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
+-  strlcpy(s4.f1, s2, sizeof(s2)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
+-  strlcpy((*s5)->f2[x], s2, sizeof(s2)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
+-  strlcpy(s1+3, s2, sizeof(s2)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}}
+-}
+-
+-// Don't issue FIXIT for flexible arrays.
+-struct S {
+-  int y; 
+-  char x[];
+-};
+-
+-void flexible_arrays(struct S *s) {
+-  char str[] = "hi";
+-  strlcpy(s->x, str, sizeof(str));  // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}}
+-}
+-
+-// Don't issue FIXIT for destinations of size 1.
+-void size_1() {
+-  char z[1];
+-  char str[] = "hi";
+-
+-  strlcpy(z, str, sizeof(str));  // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}}
+-}
+-
+-// Support VLAs.
+-void vlas(int size) {
+-  char z[size];
+-  char str[] = "hi";
+-
+-  strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
+-}
diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff
new file mode 100644
index 0000000..a3add91
--- /dev/null
+++ b/debian/patches/26-set-correct-float-abi.diff
@@ -0,0 +1,33 @@
+Description: set correct float abi settings for armel and armhf
+ debian armel supports systems that don't have a fpu so should use a "float abi"
+ setting of soft by default.
+ 
+ Debian armhf needs a float abi setting of "hard"
+Author: Peter Michael Green <plugwash@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
++++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+@@ -246,7 +246,7 @@ arm::FloatABI arm::getARMFloatABI(const
+       case llvm::Triple::MuslEABI:
+       case llvm::Triple::EABI:
+         // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
+-        ABI = FloatABI::SoftFP;
++        ABI = FloatABI::Soft;
+         break;
+       case llvm::Triple::Android:
+         ABI = (SubArch == 7) ? FloatABI::SoftFP : FloatABI::Soft;
diff --git a/debian/patches/27-fix_clang_stdint.diff b/debian/patches/27-fix_clang_stdint.diff
new file mode 100644
index 0000000..f1c751f
--- /dev/null
+++ b/debian/patches/27-fix_clang_stdint.diff
@@ -0,0 +1,29 @@
+Index: llvm-toolchain-snapshot_5.0~svn301630/clang/lib/Headers/stdint.h
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn301630.orig/clang/lib/Headers/stdint.h
++++ llvm-toolchain-snapshot_5.0~svn301630/clang/lib/Headers/stdint.h
+@@ -22,8 +22,6 @@
+  *
+ \*===----------------------------------------------------------------------===*/
+ 
+-#ifndef __CLANG_STDINT_H
+-#define __CLANG_STDINT_H
+ 
+ /* If we're hosted, fall back to the system's stdint.h, which might have
+  * additional definitions.
+@@ -72,6 +70,8 @@
+ # endif
+ 
+ #else
++#ifndef __CLANG_STDINT_H
++#define __CLANG_STDINT_H
+ 
+ /* C99 7.18.1.1 Exact-width integer types.
+  * C99 7.18.1.2 Minimum-width integer types.
+@@ -700,5 +700,5 @@ typedef __UINTMAX_TYPE__ uintmax_t;
+ #define  INTMAX_C(v) __int_c(v,  __INTMAX_C_SUFFIX__)
+ #define UINTMAX_C(v) __int_c(v, __UINTMAX_C_SUFFIX__)
+ 
+-#endif /* __STDC_HOSTED__ */
+ #endif /* __CLANG_STDINT_H */
++#endif /* __STDC_HOSTED__ */
diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff
new file mode 100644
index 0000000..d2ea156
--- /dev/null
+++ b/debian/patches/930008-arm.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-8-8.0.1~+rc1/lib/Support/Triple.cpp
+===================================================================
+--- llvm-toolchain-8-8.0.1~+rc1.orig/lib/Support/Triple.cpp
++++ llvm-toolchain-8-8.0.1~+rc1/lib/Support/Triple.cpp
+@@ -1620,7 +1620,7 @@ StringRef Triple::getARMCPUForArch(Strin
+     case llvm::Triple::EABIHF:
+     case llvm::Triple::GNUEABIHF:
+     case llvm::Triple::MuslEABIHF:
+-      return "arm1176jzf-s";
++      return "cortex-a7";
+     default:
+       return "arm7tdmi";
+     }
diff --git a/debian/patches/D59702-mips64el-fix.diff b/debian/patches/D59702-mips64el-fix.diff
new file mode 100644
index 0000000..ef2254a
--- /dev/null
+++ b/debian/patches/D59702-mips64el-fix.diff
@@ -0,0 +1,17 @@
+Index: llvm-toolchain-8-8/compiler-rt/cmake/base-config-ix.cmake
+===================================================================
+--- llvm-toolchain-8-8.orig/compiler-rt/cmake/base-config-ix.cmake
++++ llvm-toolchain-8-8/compiler-rt/cmake/base-config-ix.cmake
+@@ -195,10 +195,10 @@ macro(test_targets)
+       # clang's default CPU's. In the 64-bit case, we must also specify the ABI
+       # since the default ABI differs between gcc and clang.
+       # FIXME: Ideally, we would build the N32 library too.
+-      test_target_arch(mipsel "" "-mips32r2" "-mabi=32")
++      test_target_arch(mipsel "" "-mips32r2" "-mabi=32" "-D_LARGEFILE_SOURCE" "-D_FILE_OFFSET_BITS=64")
+       test_target_arch(mips64el "" "-mips64r2" "-mabi=64")
+     elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "mips")
+-      test_target_arch(mips "" "-mips32r2" "-mabi=32")
++      test_target_arch(mips "" "-mips32r2" "-mabi=32" "-D_LARGEFILE_SOURCE" "-D_FILE_OFFSET_BITS=64")
+       test_target_arch(mips64 "" "-mips64r2" "-mabi=64")
+     elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm")
+       if(WIN32)
diff --git a/debian/patches/OpenCL-Change-type-of-block-pointer-for-OpenCL.patch b/debian/patches/OpenCL-Change-type-of-block-pointer-for-OpenCL.patch
new file mode 100644
index 0000000..19055a2
--- /dev/null
+++ b/debian/patches/OpenCL-Change-type-of-block-pointer-for-OpenCL.patch
@@ -0,0 +1,152 @@
+From 39a3ac0065c23d1e2d55dfd8792cc28a146a4307 Mon Sep 17 00:00:00 2001
+From: Alexey Bader <alexey.bader@intel.com>
+Date: Tue, 19 Feb 2019 15:19:06 +0000
+Subject: [PATCH 1/2] [OpenCL] Change type of block pointer for OpenCL
+
+Summary:
+
+For some reason OpenCL blocks in LLVM IR are represented as function pointers.
+These pointers do not point to any real function and never get called. Actually
+they point to some structure, which in turn contains pointer to the real block
+invoke function.
+This patch changes represntation of OpenCL blocks in LLVM IR from function
+pointers to pointers to `%struct.__block_literal_generic`.
+Such representation allows to avoid unnecessary bitcasts and simplifies
+further processing (e.g. translation to SPIR-V ) of the module for targets
+which do not support function pointers.
+
+Patch by: Alexey Sotkin.
+
+Reviewers: Anastasia, yaxunl, svenvh
+
+Reviewed By: Anastasia
+
+Subscribers: alexbatashev, cfe-commits
+
+Tags: #clang
+
+Differential Revision: https://reviews.llvm.org/D58277
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@354337 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/CodeGen/CodeGenTypes.cpp                   |  4 +++-
+ test/CodeGenOpenCL/blocks.cl                   | 18 ++++++++----------
+ test/CodeGenOpenCL/cl20-device-side-enqueue.cl | 18 +++++++++---------
+ 3 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
+index 2acf1ac..93b3ebf 100644
+--- a/clang/lib/CodeGen/CodeGenTypes.cpp
++++ b/clang/lib/CodeGen/CodeGenTypes.cpp
+@@ -637,7 +637,9 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
+ 
+   case Type::BlockPointer: {
+     const QualType FTy = cast<BlockPointerType>(Ty)->getPointeeType();
+-    llvm::Type *PointeeType = ConvertTypeForMem(FTy);
++    llvm::Type *PointeeType = CGM.getLangOpts().OpenCL
++                                  ? CGM.getGenericBlockLiteralType()
++                                  : ConvertTypeForMem(FTy);
+     unsigned AS = Context.getTargetAddressSpace(FTy);
+     ResultType = llvm::PointerType::get(PointeeType, AS);
+     break;
+diff --git a/test/CodeGenOpenCL/blocks.cl b/test/CodeGenOpenCL/blocks.cl
+index 675240c..19aacc3 100644
+--- a/clang/test/CodeGenOpenCL/blocks.cl
++++ b/clang/test/CodeGenOpenCL/blocks.cl
+@@ -35,11 +35,10 @@ void foo(){
+   // SPIR: %[[block_captured:.*]] = getelementptr inbounds <{ i32, i32, i8 addrspace(4)*, i32 }>, <{ i32, i32, i8 addrspace(4)*, i32 }>* %[[block]], i32 0, i32 3
+   // SPIR: %[[i_value:.*]] = load i32, i32* %i
+   // SPIR: store i32 %[[i_value]], i32* %[[block_captured]],
+-  // SPIR: %[[blk_ptr:.*]] = bitcast <{ i32, i32, i8 addrspace(4)*, i32 }>* %[[block]] to i32 ()*
+-  // SPIR: %[[blk_gen_ptr:.*]] = addrspacecast i32 ()* %[[blk_ptr]] to i32 () addrspace(4)*
+-  // SPIR: store i32 () addrspace(4)* %[[blk_gen_ptr]], i32 () addrspace(4)** %[[block_B:.*]],
+-  // SPIR: %[[blk_gen_ptr:.*]] = load i32 () addrspace(4)*, i32 () addrspace(4)** %[[block_B]]
+-  // SPIR: %[[block_literal:.*]] = bitcast i32 () addrspace(4)* %[[blk_gen_ptr]] to %struct.__opencl_block_literal_generic addrspace(4)*
++  // SPIR: %[[blk_ptr:.*]] = bitcast <{ i32, i32, i8 addrspace(4)*, i32 }>* %[[block]] to %struct.__opencl_block_literal_generic*
++  // SPIR: %[[blk_gen_ptr:.*]] = addrspacecast %struct.__opencl_block_literal_generic* %[[blk_ptr]] to %struct.__opencl_block_literal_generic addrspace(4)*
++  // SPIR: store %struct.__opencl_block_literal_generic addrspace(4)* %[[blk_gen_ptr]], %struct.__opencl_block_literal_generic addrspace(4)** %[[block_B:.*]],
++  // SPIR: %[[block_literal:.*]] = load %struct.__opencl_block_literal_generic addrspace(4)*, %struct.__opencl_block_literal_generic addrspace(4)** %[[block_B]]
+   // SPIR: %[[invoke_addr:.*]] = getelementptr inbounds %struct.__opencl_block_literal_generic, %struct.__opencl_block_literal_generic addrspace(4)* %[[block_literal]], i32 0, i32 2
+   // SPIR: %[[blk_gen_ptr:.*]] = bitcast %struct.__opencl_block_literal_generic addrspace(4)* %[[block_literal]] to i8 addrspace(4)*
+   // SPIR: %[[invoke_func_ptr:.*]] = load i8 addrspace(4)*, i8 addrspace(4)* addrspace(4)* %[[invoke_addr]]
+@@ -50,11 +49,10 @@ void foo(){
+   // AMDGCN: %[[block_captured:.*]] = getelementptr inbounds <{ i32, i32, i8*, i32 }>, <{ i32, i32, i8*, i32 }> addrspace(5)* %[[block]], i32 0, i32 3
+   // AMDGCN: %[[i_value:.*]] = load i32, i32 addrspace(5)* %i
+   // AMDGCN: store i32 %[[i_value]], i32 addrspace(5)* %[[block_captured]],
+-  // AMDGCN: %[[blk_ptr:.*]] = bitcast <{ i32, i32, i8*, i32 }> addrspace(5)* %[[block]] to i32 () addrspace(5)*
+-  // AMDGCN: %[[blk_gen_ptr:.*]] = addrspacecast i32 () addrspace(5)* %[[blk_ptr]] to i32 ()*
+-  // AMDGCN: store i32 ()* %[[blk_gen_ptr]], i32 ()* addrspace(5)* %[[block_B:.*]],
+-  // AMDGCN: %[[blk_gen_ptr:.*]] = load i32 ()*, i32 ()* addrspace(5)* %[[block_B]]
+-  // AMDGCN: %[[block_literal:.*]] = bitcast i32 ()* %[[blk_gen_ptr]] to %struct.__opencl_block_literal_generic*
++  // AMDGCN: %[[blk_ptr:.*]] = bitcast <{ i32, i32, i8*, i32 }> addrspace(5)* %[[block]] to %struct.__opencl_block_literal_generic addrspace(5)*
++  // AMDGCN: %[[blk_gen_ptr:.*]] = addrspacecast %struct.__opencl_block_literal_generic addrspace(5)* %[[blk_ptr]] to %struct.__opencl_block_literal_generic*
++  // AMDGCN: store %struct.__opencl_block_literal_generic* %[[blk_gen_ptr]], %struct.__opencl_block_literal_generic* addrspace(5)* %[[block_B:.*]],
++  // AMDGCN: %[[block_literal:.*]] = load %struct.__opencl_block_literal_generic*, %struct.__opencl_block_literal_generic* addrspace(5)* %[[block_B]]
+   // AMDGCN: %[[invoke_addr:.*]] = getelementptr inbounds %struct.__opencl_block_literal_generic, %struct.__opencl_block_literal_generic* %[[block_literal]], i32 0, i32 2
+   // AMDGCN: %[[blk_gen_ptr:.*]] = bitcast %struct.__opencl_block_literal_generic* %[[block_literal]] to i8*
+   // AMDGCN: %[[invoke_func_ptr:.*]] = load i8*, i8** %[[invoke_addr]]
+diff --git a/test/CodeGenOpenCL/cl20-device-side-enqueue.cl b/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
+index 4732194..8445016 100644
+--- a/clang/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
++++ b/clang/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
+@@ -11,7 +11,7 @@ typedef struct {int a;} ndrange_t;
+ 
+ // For a block global variable, first emit the block literal as a global variable, then emit the block variable itself.
+ // COMMON: [[BL_GLOBAL:@__block_literal_global[^ ]*]] = internal addrspace(1) constant { i32, i32, i8 addrspace(4)* } { i32 {{[0-9]+}}, i32 {{[0-9]+}}, i8 addrspace(4)* addrspacecast (i8* bitcast (void (i8 addrspace(4)*, i8 addrspace(3)*)* [[INV_G:@[^ ]+]] to i8*) to i8 addrspace(4)*) }
+-// COMMON: @block_G =  addrspace(1) constant void (i8 addrspace(3)*) addrspace(4)* addrspacecast (void (i8 addrspace(3)*) addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BL_GLOBAL]] to void (i8 addrspace(3)*) addrspace(1)*) to void (i8 addrspace(3)*) addrspace(4)*)
++// COMMON: @block_G = addrspace(1) constant %struct.__opencl_block_literal_generic addrspace(4)* addrspacecast (%struct.__opencl_block_literal_generic addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BL_GLOBAL]] to %struct.__opencl_block_literal_generic addrspace(1)*) to %struct.__opencl_block_literal_generic addrspace(4)*)
+ 
+ // For anonymous blocks without captures, emit block literals as global variable.
+ // COMMON: [[BLG1:@__block_literal_global[^ ]*]] = internal addrspace(1) constant { i32, i32, i8 addrspace(4)* } { i32 {{[0-9]+}}, i32 {{[0-9]+}}, i8 addrspace(4)* addrspacecast (i8* bitcast (void (i8 addrspace(4)*, i8 addrspace(3)*)* {{@[^ ]+}} to i8*) to i8 addrspace(4)*) }
+@@ -77,9 +77,9 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+   // COMMON: [[DEF_Q:%[0-9]+]] = load %opencl.queue_t{{.*}}*, %opencl.queue_t{{.*}}** %default_queue
+   // COMMON: [[FLAGS:%[0-9]+]] = load i32, i32* %flags
+   // COMMON: store i8 addrspace(4)* addrspacecast (i8* bitcast (void (i8 addrspace(4)*)* [[INVL1:@__device_side_enqueue_block_invoke[^ ]*]] to i8*) to i8 addrspace(4)*), i8 addrspace(4)** %block.invoke
+-  // B32: [[BL:%[0-9]+]] = bitcast <{ i32, i32, i8 addrspace(4)*, i32 addrspace(1)*, i32, i32 addrspace(1)* }>* %block to void ()*
+-  // B64: [[BL:%[0-9]+]] = bitcast <{ i32, i32, i8 addrspace(4)*, i32 addrspace(1)*, i32 addrspace(1)*, i32 }>* %block to void ()*
+-  // COMMON: [[BL_I8:%[0-9]+]] = addrspacecast void ()* [[BL]] to i8 addrspace(4)*
++  // B32: [[BL:%[0-9]+]] = bitcast <{ i32, i32, i8 addrspace(4)*, i32 addrspace(1)*, i32, i32 addrspace(1)* }>* %block to %struct.__opencl_block_literal_generic*
++  // B64: [[BL:%[0-9]+]] = bitcast <{ i32, i32, i8 addrspace(4)*, i32 addrspace(1)*, i32 addrspace(1)*, i32 }>* %block to %struct.__opencl_block_literal_generic*
++  // COMMON: [[BL_I8:%[0-9]+]] = addrspacecast %struct.__opencl_block_literal_generic* [[BL]] to i8 addrspace(4)*
+   // COMMON-LABEL: call i32 @__enqueue_kernel_basic(
+   // COMMON-SAME: %opencl.queue_t{{.*}}* [[DEF_Q]], i32 [[FLAGS]], %struct.ndrange_t* byval [[NDR]]{{([0-9]+)?}},
+   // COMMON-SAME: i8 addrspace(4)* addrspacecast (i8* bitcast ({{.*}} [[INVLK1:[^ ]+_kernel]] to i8*) to i8 addrspace(4)*),
+@@ -95,8 +95,8 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+   // COMMON: [[WAIT_EVNT:%[0-9]+]] = addrspacecast %opencl.clk_event_t{{.*}}** %event_wait_list to %opencl.clk_event_t{{.*}}* addrspace(4)*
+   // COMMON: [[EVNT:%[0-9]+]] = addrspacecast %opencl.clk_event_t{{.*}}** %clk_event to %opencl.clk_event_t{{.*}}* addrspace(4)*
+   // COMMON: store i8 addrspace(4)* addrspacecast (i8* bitcast (void (i8 addrspace(4)*)* [[INVL2:@__device_side_enqueue_block_invoke[^ ]*]] to i8*) to i8 addrspace(4)*), i8 addrspace(4)** %block.invoke
+-  // COMMON: [[BL:%[0-9]+]] = bitcast <{ i32, i32, i8 addrspace(4)*, i32{{.*}}, i32{{.*}}, i32{{.*}} }>* %block3 to void ()*
+-  // COMMON: [[BL_I8:%[0-9]+]] = addrspacecast void ()* [[BL]] to i8 addrspace(4)*
++  // COMMON: [[BL:%[0-9]+]] = bitcast <{ i32, i32, i8 addrspace(4)*, i32{{.*}}, i32{{.*}}, i32{{.*}} }>* %block3 to %struct.__opencl_block_literal_generic*
++  // COMMON: [[BL_I8:%[0-9]+]] = addrspacecast %struct.__opencl_block_literal_generic* [[BL]] to i8 addrspace(4)*
+   // COMMON-LABEL: call i32 @__enqueue_kernel_basic_events
+   // COMMON-SAME: (%opencl.queue_t{{.*}}* [[DEF_Q]], i32 [[FLAGS]],  %struct.ndrange_t* {{.*}}, i32 2, %opencl.clk_event_t{{.*}}* addrspace(4)* [[WAIT_EVNT]], %opencl.clk_event_t{{.*}}* addrspace(4)* [[EVNT]],
+   // COMMON-SAME: i8 addrspace(4)* addrspacecast (i8* bitcast ({{.*}} [[INVLK2:[^ ]+_kernel]] to i8*) to i8 addrspace(4)*),
+@@ -300,13 +300,13 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+   // Emits global block literal [[BLG8]] and invoke function [[INVG8]].
+   // The full type of these expressions are long (and repeated elsewhere), so we
+   // capture it as part of the regex for convenience and clarity.
+-  // COMMON: store void () addrspace(4)* addrspacecast (void () addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG8]] to void () addrspace(1)*) to void () addrspace(4)*), void () addrspace(4)** %block_A
++  // COMMON: store %struct.__opencl_block_literal_generic addrspace(4)* addrspacecast (%struct.__opencl_block_literal_generic addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG8]] to %struct.__opencl_block_literal_generic addrspace(1)*) to %struct.__opencl_block_literal_generic addrspace(4)*), %struct.__opencl_block_literal_generic addrspace(4)** %block_A
+   void (^const block_A)(void) = ^{
+     return;
+   };
+ 
+   // Emits global block literal [[BLG9]] and invoke function [[INVG9]].
+-  // COMMON: store void (i8 addrspace(3)*) addrspace(4)* addrspacecast (void (i8 addrspace(3)*) addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG9]] to void (i8 addrspace(3)*) addrspace(1)*) to void (i8 addrspace(3)*) addrspace(4)*), void (i8 addrspace(3)*) addrspace(4)** %block_B
++  // COMMON: store %struct.__opencl_block_literal_generic addrspace(4)* addrspacecast (%struct.__opencl_block_literal_generic addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG9]] to %struct.__opencl_block_literal_generic addrspace(1)*) to %struct.__opencl_block_literal_generic addrspace(4)*), %struct.__opencl_block_literal_generic addrspace(4)** %block_B
+   void (^const block_B)(local void *) = ^(local void *a) {
+     return;
+   };
+@@ -346,7 +346,7 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+   // COMMON: store i8 addrspace(4)* addrspacecast (i8* bitcast (void (i8 addrspace(4)*)* [[INVL3:@__device_side_enqueue_block_invoke[^ ]*]] to i8*) to i8 addrspace(4)*), i8 addrspace(4)** %block.invoke
+   // COMMON: [[DEF_Q:%[0-9]+]] = load %opencl.queue_t{{.*}}*, %opencl.queue_t{{.*}}** %default_queue
+   // COMMON: [[FLAGS:%[0-9]+]] = load i32, i32* %flags
+-  // COMMON: [[BL_I8:%[0-9]+]] = addrspacecast void ()* {{.*}} to i8 addrspace(4)*
++  // COMMON: [[BL_I8:%[0-9]+]] = addrspacecast %struct.__opencl_block_literal_generic* {{.*}} to i8 addrspace(4)*
+   // COMMON-LABEL: call i32 @__enqueue_kernel_basic(
+   // COMMON-SAME: %opencl.queue_t{{.*}}* [[DEF_Q]], i32 [[FLAGS]], %struct.ndrange_t* byval [[NDR]]{{([0-9]+)?}},
+   // COMMON-SAME: i8 addrspace(4)* addrspacecast (i8* bitcast ({{.*}} [[INVLK3:[^ ]+_kernel]] to i8*) to i8 addrspace(4)*),
+-- 
+1.8.3.1
+
diff --git a/debian/patches/OpenCL-Fix-assertion-due-to-blocks.patch b/debian/patches/OpenCL-Fix-assertion-due-to-blocks.patch
new file mode 100644
index 0000000..27c0343
--- /dev/null
+++ b/debian/patches/OpenCL-Fix-assertion-due-to-blocks.patch
@@ -0,0 +1,57 @@
+From 29e2813a2ab7d5569860bb07892dfef7b5374d96 Mon Sep 17 00:00:00 2001
+From: Yaxun Liu <Yaxun.Liu@amd.com>
+Date: Tue, 26 Feb 2019 16:20:41 +0000
+Subject: [PATCH] [OpenCL] Fix assertion due to blocks
+
+A recent change caused assertion in CodeGenFunction::EmitBlockCallExpr when a block is called.
+
+There is code
+
+  Func = CGM.getOpenCLRuntime().getInvokeFunction(E->getCallee());
+getCalleeDecl calls Expr::getReferencedDeclOfCallee, which does not handle
+BlockExpr and returns nullptr, which causes isa to assert.
+
+This patch fixes that.
+
+Differential Revision: https://reviews.llvm.org/D58658
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@354893 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/AST/Expr.cpp             | 2 ++
+ test/CodeGenOpenCL/blocks.cl | 6 ++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
+index aef1eab..85690c7 100644
+--- a/clang/lib/AST/Expr.cpp
++++ b/clang/lib/AST/Expr.cpp
+@@ -1358,6 +1358,8 @@ Decl *Expr::getReferencedDeclOfCallee() {
+     return DRE->getDecl();
+   if (MemberExpr *ME = dyn_cast<MemberExpr>(CEE))
+     return ME->getMemberDecl();
++  if (auto *BE = dyn_cast<BlockExpr>(CEE))
++    return BE->getBlockDecl();
+ 
+   return nullptr;
+ }
+diff --git a/clang/test/CodeGenOpenCL/blocks.cl b/clang/test/CodeGenOpenCL/blocks.cl
+index ab5a2c6..c3e2685 100644
+--- a/clang/test/CodeGenOpenCL/blocks.cl
++++ b/clang/test/CodeGenOpenCL/blocks.cl
+@@ -90,6 +90,12 @@ int get42() {
+   return blockArgFunc(^{return 42;});
+ }
+ 
++// COMMON-LABEL: define {{.*}}@call_block
++// call {{.*}}@__call_block_block_invoke
++int call_block() {
++  return ^int(int num) { return num; } (11);
++}
++
+ // CHECK-DEBUG: !DIDerivedType(tag: DW_TAG_member, name: "__size"
+ // CHECK-DEBUG: !DIDerivedType(tag: DW_TAG_member, name: "__align"
+ 
+-- 
+1.8.3.1
+
diff --git a/debian/patches/OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch b/debian/patches/OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch
new file mode 100644
index 0000000..19ac468
--- /dev/null
+++ b/debian/patches/OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch
@@ -0,0 +1,290 @@
+From c94ec28600255098ffb9d73d1b386a7c8a535590 Mon Sep 17 00:00:00 2001
+From: Andrew Savonichev <andrew.savonichev@intel.com>
+Date: Thu, 21 Feb 2019 11:02:10 +0000
+Subject: [PATCH 2/2] [OpenCL] Simplify LLVM IR generated for OpenCL blocks
+
+Summary:
+Emit direct call of block invoke functions when possible, i.e. in case the
+block is not passed as a function argument.
+Also doing some refactoring of `CodeGenFunction::EmitBlockCallExpr()`
+
+Reviewers: Anastasia, yaxunl, svenvh
+
+Reviewed By: Anastasia
+
+Subscribers: cfe-commits
+
+Tags: #clang
+
+Differential Revision: https://reviews.llvm.org/D58388
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@354568 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/CodeGen/CGBlocks.cpp                       | 77 +++++++++++++-------------
+ lib/CodeGen/CGOpenCLRuntime.cpp                | 30 +++++++---
+ lib/CodeGen/CGOpenCLRuntime.h                  |  4 ++
+ test/CodeGenOpenCL/blocks.cl                   | 10 +---
+ test/CodeGenOpenCL/cl20-device-side-enqueue.cl | 34 +++++++++---
+ 5 files changed, 91 insertions(+), 64 deletions(-)
+
+diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp
+index fa3c3ee..10a0238 100644
+--- a/clang/lib/CodeGen/CGBlocks.cpp
++++ b/clang/lib/CodeGen/CGBlocks.cpp
+@@ -1261,52 +1261,49 @@ RValue CodeGenFunction::EmitBlockCallExpr(const CallExpr *E,
+                                           ReturnValueSlot ReturnValue) {
+   const BlockPointerType *BPT =
+     E->getCallee()->getType()->getAs<BlockPointerType>();
+-
+   llvm::Value *BlockPtr = EmitScalarExpr(E->getCallee());
+-
+-  // Get a pointer to the generic block literal.
+-  // For OpenCL we generate generic AS void ptr to be able to reuse the same
+-  // block definition for blocks with captures generated as private AS local
+-  // variables and without captures generated as global AS program scope
+-  // variables.
+-  unsigned AddrSpace = 0;
+-  if (getLangOpts().OpenCL)
+-    AddrSpace = getContext().getTargetAddressSpace(LangAS::opencl_generic);
+-
+-  llvm::Type *BlockLiteralTy =
+-      llvm::PointerType::get(CGM.getGenericBlockLiteralType(), AddrSpace);
+-
+-  // Bitcast the callee to a block literal.
+-  BlockPtr =
+-      Builder.CreatePointerCast(BlockPtr, BlockLiteralTy, "block.literal");
+-
+-  // Get the function pointer from the literal.
+-  llvm::Value *FuncPtr =
+-      Builder.CreateStructGEP(CGM.getGenericBlockLiteralType(), BlockPtr,
+-                              CGM.getLangOpts().OpenCL ? 2 : 3);
+-
+-  // Add the block literal.
++  llvm::Type *GenBlockTy = CGM.getGenericBlockLiteralType();
++  llvm::Value *Func = nullptr;
++  QualType FnType = BPT->getPointeeType();
++  ASTContext &Ctx = getContext();
+   CallArgList Args;
+ 
+-  QualType VoidPtrQualTy = getContext().VoidPtrTy;
+-  llvm::Type *GenericVoidPtrTy = VoidPtrTy;
+   if (getLangOpts().OpenCL) {
+-    GenericVoidPtrTy = CGM.getOpenCLRuntime().getGenericVoidPointerType();
+-    VoidPtrQualTy =
+-        getContext().getPointerType(getContext().getAddrSpaceQualType(
+-            getContext().VoidTy, LangAS::opencl_generic));
+-  }
+-
+-  BlockPtr = Builder.CreatePointerCast(BlockPtr, GenericVoidPtrTy);
+-  Args.add(RValue::get(BlockPtr), VoidPtrQualTy);
+-
+-  QualType FnType = BPT->getPointeeType();
++    // For OpenCL, BlockPtr is already casted to generic block literal.
++
++    // First argument of a block call is a generic block literal casted to
++    // generic void pointer, i.e. i8 addrspace(4)*
++    llvm::Value *BlockDescriptor = Builder.CreatePointerCast(
++        BlockPtr, CGM.getOpenCLRuntime().getGenericVoidPointerType());
++    QualType VoidPtrQualTy = Ctx.getPointerType(
++        Ctx.getAddrSpaceQualType(Ctx.VoidTy, LangAS::opencl_generic));
++    Args.add(RValue::get(BlockDescriptor), VoidPtrQualTy);
++    // And the rest of the arguments.
++    EmitCallArgs(Args, FnType->getAs<FunctionProtoType>(), E->arguments());
++
++    // We *can* call the block directly unless it is a function argument.
++    if (!isa<ParmVarDecl>(E->getCalleeDecl()))
++      Func = CGM.getOpenCLRuntime().getInvokeFunction(E->getCallee());
++    else {
++      llvm::Value *FuncPtr = Builder.CreateStructGEP(GenBlockTy, BlockPtr, 2);
++      Func = Builder.CreateAlignedLoad(FuncPtr, getPointerAlign());
++    }
++  } else {
++    // Bitcast the block literal to a generic block literal.
++    BlockPtr = Builder.CreatePointerCast(
++        BlockPtr, llvm::PointerType::get(GenBlockTy, 0), "block.literal");
++    // Get pointer to the block invoke function
++    llvm::Value *FuncPtr = Builder.CreateStructGEP(GenBlockTy, BlockPtr, 3);
+ 
+-  // And the rest of the arguments.
+-  EmitCallArgs(Args, FnType->getAs<FunctionProtoType>(), E->arguments());
++    // First argument is a block literal casted to a void pointer
++    BlockPtr = Builder.CreatePointerCast(BlockPtr, VoidPtrTy);
++    Args.add(RValue::get(BlockPtr), Ctx.VoidPtrTy);
++    // And the rest of the arguments.
++    EmitCallArgs(Args, FnType->getAs<FunctionProtoType>(), E->arguments());
+ 
+-  // Load the function.
+-  llvm::Value *Func = Builder.CreateAlignedLoad(FuncPtr, getPointerAlign());
++    // Load the function.
++    Func = Builder.CreateAlignedLoad(FuncPtr, getPointerAlign());
++  }
+ 
+   const FunctionType *FuncTy = FnType->castAs<FunctionType>();
+   const CGFunctionInfo &FnInfo =
+diff --git a/clang/lib/CodeGen/CGOpenCLRuntime.cpp b/clang/lib/CodeGen/CGOpenCLRuntime.cpp
+index 7f6f595..75003e5 100644
+--- a/clang/lib/CodeGen/CGOpenCLRuntime.cpp
++++ b/clang/lib/CodeGen/CGOpenCLRuntime.cpp
+@@ -123,6 +123,23 @@ llvm::PointerType *CGOpenCLRuntime::getGenericVoidPointerType() {
+       CGM.getContext().getTargetAddressSpace(LangAS::opencl_generic));
+ }
+ 
++// Get the block literal from an expression derived from the block expression.
++// OpenCL v2.0 s6.12.5:
++// Block variable declarations are implicitly qualified with const. Therefore
++// all block variables must be initialized at declaration time and may not be
++// reassigned.
++static const BlockExpr *getBlockExpr(const Expr *E) {
++  const Expr *Prev = nullptr; // to make sure we do not stuck in infinite loop.
++  while(!isa<BlockExpr>(E) && E != Prev) {
++    Prev = E;
++    E = E->IgnoreCasts();
++    if (auto DR = dyn_cast<DeclRefExpr>(E)) {
++      E = cast<VarDecl>(DR->getDecl())->getInit();
++    }
++  }
++  return cast<BlockExpr>(E);
++}
++
+ /// Record emitted llvm invoke function and llvm block literal for the
+ /// corresponding block expression.
+ void CGOpenCLRuntime::recordBlockInfo(const BlockExpr *E,
+@@ -137,20 +154,17 @@ void CGOpenCLRuntime::recordBlockInfo(const BlockExpr *E,
+   EnqueuedBlockMap[E].Kernel = nullptr;
+ }
+ 
++llvm::Function *CGOpenCLRuntime::getInvokeFunction(const Expr *E) {
++  return EnqueuedBlockMap[getBlockExpr(E)].InvokeFunc;
++}
++
+ CGOpenCLRuntime::EnqueuedBlockInfo
+ CGOpenCLRuntime::emitOpenCLEnqueuedBlock(CodeGenFunction &CGF, const Expr *E) {
+   CGF.EmitScalarExpr(E);
+ 
+   // The block literal may be assigned to a const variable. Chasing down
+   // to get the block literal.
+-  if (auto DR = dyn_cast<DeclRefExpr>(E)) {
+-    E = cast<VarDecl>(DR->getDecl())->getInit();
+-  }
+-  E = E->IgnoreImplicit();
+-  if (auto Cast = dyn_cast<CastExpr>(E)) {
+-    E = Cast->getSubExpr();
+-  }
+-  auto *Block = cast<BlockExpr>(E);
++  const BlockExpr *Block = getBlockExpr(E);
+ 
+   assert(EnqueuedBlockMap.find(Block) != EnqueuedBlockMap.end() &&
+          "Block expression not emitted");
+diff --git a/clang/lib/CodeGen/CGOpenCLRuntime.h b/clang/lib/CodeGen/CGOpenCLRuntime.h
+index 750721f..4effc7e 100644
+--- a/clang/lib/CodeGen/CGOpenCLRuntime.h
++++ b/clang/lib/CodeGen/CGOpenCLRuntime.h
+@@ -92,6 +92,10 @@ public:
+   /// \param Block block literal emitted for the block expression.
+   void recordBlockInfo(const BlockExpr *E, llvm::Function *InvokeF,
+                        llvm::Value *Block);
++
++  /// \return LLVM block invoke function emitted for an expression derived from
++  /// the block expression.
++  llvm::Function *getInvokeFunction(const Expr *E);
+ };
+ 
+ }
+diff --git a/clang/test/CodeGenOpenCL/blocks.cl b/clang/test/CodeGenOpenCL/blocks.cl
+index 19aacc3..ab5a2c6 100644
+--- a/clang/test/CodeGenOpenCL/blocks.cl
++++ b/clang/test/CodeGenOpenCL/blocks.cl
+@@ -39,11 +39,8 @@ void foo(){
+   // SPIR: %[[blk_gen_ptr:.*]] = addrspacecast %struct.__opencl_block_literal_generic* %[[blk_ptr]] to %struct.__opencl_block_literal_generic addrspace(4)*
+   // SPIR: store %struct.__opencl_block_literal_generic addrspace(4)* %[[blk_gen_ptr]], %struct.__opencl_block_literal_generic addrspace(4)** %[[block_B:.*]],
+   // SPIR: %[[block_literal:.*]] = load %struct.__opencl_block_literal_generic addrspace(4)*, %struct.__opencl_block_literal_generic addrspace(4)** %[[block_B]]
+-  // SPIR: %[[invoke_addr:.*]] = getelementptr inbounds %struct.__opencl_block_literal_generic, %struct.__opencl_block_literal_generic addrspace(4)* %[[block_literal]], i32 0, i32 2
+   // SPIR: %[[blk_gen_ptr:.*]] = bitcast %struct.__opencl_block_literal_generic addrspace(4)* %[[block_literal]] to i8 addrspace(4)*
+-  // SPIR: %[[invoke_func_ptr:.*]] = load i8 addrspace(4)*, i8 addrspace(4)* addrspace(4)* %[[invoke_addr]]
+-  // SPIR: %[[invoke_func:.*]] = addrspacecast i8 addrspace(4)* %[[invoke_func_ptr]] to i32 (i8 addrspace(4)*)*
+-  // SPIR: call {{.*}}i32 %[[invoke_func]](i8 addrspace(4)* %[[blk_gen_ptr]])
++  // SPIR: call {{.*}}i32 @__foo_block_invoke(i8 addrspace(4)* %[[blk_gen_ptr]])
+   // AMDGCN: %[[block_invoke:.*]] = getelementptr inbounds <{ i32, i32, i8*, i32 }>, <{ i32, i32, i8*, i32 }> addrspace(5)* %[[block:.*]], i32 0, i32 2
+   // AMDGCN: store i8* bitcast (i32 (i8*)* @__foo_block_invoke to i8*), i8* addrspace(5)* %[[block_invoke]]
+   // AMDGCN: %[[block_captured:.*]] = getelementptr inbounds <{ i32, i32, i8*, i32 }>, <{ i32, i32, i8*, i32 }> addrspace(5)* %[[block]], i32 0, i32 3
+@@ -53,11 +50,8 @@ void foo(){
+   // AMDGCN: %[[blk_gen_ptr:.*]] = addrspacecast %struct.__opencl_block_literal_generic addrspace(5)* %[[blk_ptr]] to %struct.__opencl_block_literal_generic*
+   // AMDGCN: store %struct.__opencl_block_literal_generic* %[[blk_gen_ptr]], %struct.__opencl_block_literal_generic* addrspace(5)* %[[block_B:.*]],
+   // AMDGCN: %[[block_literal:.*]] = load %struct.__opencl_block_literal_generic*, %struct.__opencl_block_literal_generic* addrspace(5)* %[[block_B]]
+-  // AMDGCN: %[[invoke_addr:.*]] = getelementptr inbounds %struct.__opencl_block_literal_generic, %struct.__opencl_block_literal_generic* %[[block_literal]], i32 0, i32 2
+   // AMDGCN: %[[blk_gen_ptr:.*]] = bitcast %struct.__opencl_block_literal_generic* %[[block_literal]] to i8*
+-  // AMDGCN: %[[invoke_func_ptr:.*]] = load i8*, i8** %[[invoke_addr]]
+-  // AMDGCN: %[[invoke_func:.*]] = bitcast i8* %[[invoke_func_ptr]] to i32 (i8*)*
+-  // AMDGCN: call {{.*}}i32 %[[invoke_func]](i8* %[[blk_gen_ptr]])
++  // AMDGCN: call {{.*}}i32 @__foo_block_invoke(i8* %[[blk_gen_ptr]])
+ 
+   int (^ block_B)(void) = ^{
+     return i;
+diff --git a/clang/test/CodeGenOpenCL/cl20-device-side-enqueue.cl b/clang/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
+index 8445016..1566912 100644
+--- a/clang/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
++++ b/clang/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
+@@ -312,9 +312,7 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+   };
+ 
+   // Uses global block literal [[BLG8]] and invoke function [[INVG8]].
+-  // COMMON: [[r1:%.*]] = load i8 addrspace(4)*, i8 addrspace(4)* addrspace(4)* getelementptr inbounds (%struct.__opencl_block_literal_generic, %struct.__opencl_block_literal_generic addrspace(4)* addrspacecast (%struct.__opencl_block_literal_generic addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG8]] to %struct.__opencl_block_literal_generic addrspace(1)*) to %struct.__opencl_block_literal_generic addrspace(4)*), i32 0, i32 2)
+-  // COMMON: [[r2:%.*]] = addrspacecast i8 addrspace(4)* [[r1]] to void (i8 addrspace(4)*)*
+-  // COMMON: call spir_func void [[r2]](i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG8]] to i8 addrspace(1)*) to i8 addrspace(4)*))
++  // COMMON: call spir_func void @__device_side_enqueue_block_invoke_11(i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG8]] to i8 addrspace(1)*) to i8 addrspace(4)*))
+   block_A();
+ 
+   // Emits global block literal [[BLG8]] and block kernel [[INVGK8]]. [[INVGK8]] calls [[INVG8]].
+@@ -333,15 +331,35 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+   unsigned size = get_kernel_work_group_size(block_A);
+ 
+   // Uses global block literal [[BLG8]] and invoke function [[INVG8]]. Make sure no redundant block literal and invoke functions are emitted.
+-  // COMMON: [[r1:%.*]] = load i8 addrspace(4)*, i8 addrspace(4)* addrspace(4)* getelementptr inbounds (%struct.__opencl_block_literal_generic, %struct.__opencl_block_literal_generic addrspace(4)* addrspacecast (%struct.__opencl_block_literal_generic addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG8]] to %struct.__opencl_block_literal_generic addrspace(1)*) to %struct.__opencl_block_literal_generic addrspace(4)*), i32 0, i32 2)
+-  // COMMON: [[r2:%.*]] = addrspacecast i8 addrspace(4)* [[r1]] to void (i8 addrspace(4)*)*
+-  // COMMON: call spir_func void [[r2]](i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG8]] to i8 addrspace(1)*) to i8 addrspace(4)*))
++  // COMMON: call spir_func void @__device_side_enqueue_block_invoke_11(i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BLG8]] to i8 addrspace(1)*) to i8 addrspace(4)*))
+   block_A();
+ 
++  // Make sure that block invoke function is resolved correctly after sequence of assignements.
++  // COMMON: store %struct.__opencl_block_literal_generic addrspace(4)*
++  // COMMON-SAME: addrspacecast (%struct.__opencl_block_literal_generic addrspace(1)*
++  // COMMON-SAME: bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BL_GLOBAL]] to %struct.__opencl_block_literal_generic addrspace(1)*)
++  // COMMON-SAME: to %struct.__opencl_block_literal_generic addrspace(4)*),
++  // COMMON-SAME: %struct.__opencl_block_literal_generic addrspace(4)** %b1,
++  bl_t b1 = block_G;
++  // COMMON: store %struct.__opencl_block_literal_generic addrspace(4)*
++  // COMMON-SAME: addrspacecast (%struct.__opencl_block_literal_generic addrspace(1)*
++  // COMMON-SAME: bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BL_GLOBAL]] to %struct.__opencl_block_literal_generic addrspace(1)*)
++  // COMMON-SAME: to %struct.__opencl_block_literal_generic addrspace(4)*),
++  // COMMON-SAME: %struct.__opencl_block_literal_generic addrspace(4)** %b2,
++  bl_t b2 = b1;
++  // COMMON: call spir_func void @block_G_block_invoke(i8 addrspace(4)* addrspacecast (i8 addrspace(1)*
++  // COMMON-SAME: bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BL_GLOBAL]] to i8 addrspace(1)*)
++  // COOMON-SAME: to i8 addrspace(4)*), i8 addrspace(3)* null)
++  b2(0);
++  // Uses global block literal [[BL_GLOBAL]] and block kernel [[INV_G_K]]. [[INV_G_K]] calls [[INV_G]].
++  // COMMON: call i32 @__get_kernel_preferred_work_group_size_multiple_impl(
++  // COMMON-SAME: i8 addrspace(4)* addrspacecast (i8* bitcast ({{.*}} [[INV_G_K:[^ ]+_kernel]] to i8*) to i8 addrspace(4)*),
++  // COMMON-SAME: i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast ({ i32, i32, i8 addrspace(4)* } addrspace(1)* [[BL_GLOBAL]] to i8 addrspace(1)*) to i8 addrspace(4)*))
++  size = get_kernel_preferred_work_group_size_multiple(b2);
++
+   void (^block_C)(void) = ^{
+     callee(i, a);
+   };
+-
+   // Emits block literal on stack and block kernel [[INVLK3]].
+   // COMMON: store i8 addrspace(4)* addrspacecast (i8* bitcast (void (i8 addrspace(4)*)* [[INVL3:@__device_side_enqueue_block_invoke[^ ]*]] to i8*) to i8 addrspace(4)*), i8 addrspace(4)** %block.invoke
+   // COMMON: [[DEF_Q:%[0-9]+]] = load %opencl.queue_t{{.*}}*, %opencl.queue_t{{.*}}** %default_queue
+@@ -404,8 +422,8 @@ kernel void device_side_enqueue(global int *a, global int *b, int i) {
+ // COMMON: define internal spir_func void [[INVG8]](i8 addrspace(4)*{{.*}})
+ // COMMON: define internal spir_func void [[INVG9]](i8 addrspace(4)*{{.*}}, i8 addrspace(3)* %{{.*}})
+ // COMMON: define internal spir_kernel void [[INVGK8]](i8 addrspace(4)*{{.*}})
++// COMMON: define internal spir_kernel void [[INV_G_K]](i8 addrspace(4)*{{.*}}, i8 addrspace(3)*{{.*}})
+ // COMMON: define internal spir_kernel void [[INVLK3]](i8 addrspace(4)*{{.*}})
+ // COMMON: define internal spir_kernel void [[INVGK9]](i8 addrspace(4)*{{.*}}, i8 addrspace(3)*{{.*}})
+-// COMMON: define internal spir_kernel void [[INV_G_K]](i8 addrspace(4)*{{.*}}, i8 addrspace(3)*{{.*}})
+ // COMMON: define internal spir_kernel void [[INVGK10]](i8 addrspace(4)*{{.*}})
+ // COMMON: define internal spir_kernel void [[INVGK11]](i8 addrspace(4)*{{.*}})
+-- 
+1.8.3.1
+
diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff
new file mode 100644
index 0000000..fb253e7
--- /dev/null
+++ b/debian/patches/atomic_library_1.diff
@@ -0,0 +1,25 @@
+---
+ clang/lib/Basic/Targets.cpp           |   14 ++++++++++++++
+ clang/test/CodeGen/linux-arm-atomic.c |   10 ++++++++++
+ 2 files changed, 24 insertions(+)
+
+Index: llvm-toolchain-snapshot_6.0~svn309319/clang/test/CodeGen/linux-arm-atomic.c
+===================================================================
+--- llvm-toolchain-snapshot_6.0~svn309319.orig/clang/test/CodeGen/linux-arm-atomic.c
++++ llvm-toolchain-snapshot_6.0~svn309319/clang/test/CodeGen/linux-arm-atomic.c
+@@ -1,5 +1,15 @@
+ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
+ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
++
++typedef int _Atomic_word;
++_Atomic_word exchange_and_add(volatile _Atomic_word *__mem, int __val) {
++  return __atomic_fetch_add(__mem, __val, __ATOMIC_ACQ_REL);
++}
++
++// CHECK: define {{.*}} @exchange_and_add
++// CHECK: atomicrmw {{.*}} add
++// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
++// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
+ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=thumbv7-unknown-linux | FileCheck %s
+ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-freebsd | FileCheck %s
+ 
diff --git a/debian/patches/bootstrap-fix-include-next.diff b/debian/patches/bootstrap-fix-include-next.diff
new file mode 100644
index 0000000..87514b5
--- /dev/null
+++ b/debian/patches/bootstrap-fix-include-next.diff
@@ -0,0 +1,41 @@
+When doing a bootstrap, we use a newly built clang.
+When this one is used, if already installed on the system,
+we have clang header in two places:
+llvm-toolchain-7-7/build-llvm/lib/clang/7.0.0/include/inttypes.h
+and
+/usr/include/clang/7.0.0/include/inttypes.h
+
+Because clang expects only one of his headers to be available, it uses
+include_next to get the glibc (libc6-dev package) header.
+
+However, in the previous example, because we have inttypes.h twice in the
+include search path, clang's header will call itself without any effect.
+Therefore, it will do include_next until the define from the libc is existing (ex: _INTTYPES_H)
+
+
+Index: llvm-toolchain-7-7/clang/lib/Headers/inttypes.h
+===================================================================
+--- llvm-toolchain-7-7.orig/clang/lib/Headers/inttypes.h
++++ llvm-toolchain-7-7/clang/lib/Headers/inttypes.h
+@@ -20,7 +20,7 @@
+  *
+ \*===----------------------------------------------------------------------===*/
+ 
+-#ifndef __CLANG_INTTYPES_H
++#if !defined(__CLANG_INTTYPES_H) || !defined(_INTTYPES_H)
+ #define __CLANG_INTTYPES_H
+ 
+ #if defined(_MSC_VER) && _MSC_VER < 1800
+Index: llvm-toolchain-7-7/clang/lib/Headers/limits.h
+===================================================================
+--- llvm-toolchain-7-7.orig/clang/lib/Headers/limits.h
++++ llvm-toolchain-7-7/clang/lib/Headers/limits.h
+@@ -22,7 +22,7 @@
+  *
+ \*===----------------------------------------------------------------------===*/
+ 
+-#ifndef __CLANG_LIMITS_H
++#if !defined(__CLANG_LIMITS_H) || !defined(_LIBC_LIMITS_H_)
+ #define __CLANG_LIMITS_H
+ 
+ /* The system's limits.h may, in turn, try to #include_next GCC's limits.h.
diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff
new file mode 100644
index 0000000..78bcd0d
--- /dev/null
+++ b/debian/patches/clang-analyzer-force-version.diff
@@ -0,0 +1,25 @@
+# Force the version of clang in the analyzer
+# This was causing the static analyzer to fail silently if the clang & clang++ are
+# not installed
+Index: llvm-toolchain-snapshot_8~svn339515/clang/tools/scan-build/libexec/ccc-analyzer
+===================================================================
+--- llvm-toolchain-snapshot_8~svn339515.orig/clang/tools/scan-build/libexec/ccc-analyzer
++++ llvm-toolchain-snapshot_8~svn339515/clang/tools/scan-build/libexec/ccc-analyzer
+@@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
+   if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
+ 
+   $Clang = $ENV{'CLANG_CXX'};
+-  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
++  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-8'; }
+ 
+   $IsCXX = 1
+ }
+@@ -100,7 +100,7 @@ else {
+   if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; }
+ 
+   $Clang = $ENV{'CLANG'};
+-  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
++  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-8'; }
+ 
+   $IsCXX = 0
+ }
diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
new file mode 100644
index 0000000..12efe79
--- /dev/null
+++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
@@ -0,0 +1,27 @@
+Index: llvm-toolchain-snapshot_8~svn349138/include/llvm/Support/ARMTargetParser.def
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/include/llvm/Support/ARMTargetParser.def
++++ llvm-toolchain-snapshot_8~svn349138/include/llvm/Support/ARMTargetParser.def
+@@ -75,7 +75,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k
+ ARM_ARCH("armv6-m", ARMV6M, "6-M", "v6m", ARMBuildAttrs::CPUArch::v6_M,
+           FK_NONE, ARM::AEK_NONE)
+ ARM_ARCH("armv7-a", ARMV7A, "7-A", "v7", ARMBuildAttrs::CPUArch::v7,
+-          FK_NEON, ARM::AEK_DSP)
++          FK_VFPV3_D16 /* Hard float */, ARM::AEK_DSP)
+ ARM_ARCH("armv7ve", ARMV7VE, "7VE", "v7ve", ARMBuildAttrs::CPUArch::v7,
+           FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
+           ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP))
+Index: llvm-toolchain-snapshot_8~svn349138/lib/Target/ARM/ARM.td
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/lib/Target/ARM/ARM.td
++++ llvm-toolchain-snapshot_8~svn349138/lib/Target/ARM/ARM.td
+@@ -596,7 +596,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
+                                                        FeatureStrictAlign]>;
+ 
+ def ARMv7a    : Architecture<"armv7-a",   "ARMv7a",   [HasV7Ops,
+-                                                       FeatureNEON,
++                                                       FeatureVFP3,
++                                                       FeatureD16,
+                                                        FeatureDB,
+                                                        FeatureDSP,
+                                                        FeatureAClass]>;
diff --git a/debian/patches/clang-baseline-fix-i386.patch b/debian/patches/clang-baseline-fix-i386.patch
new file mode 100644
index 0000000..4c7a492
--- /dev/null
+++ b/debian/patches/clang-baseline-fix-i386.patch
@@ -0,0 +1,13 @@
+--- a/clang/lib/Driver/ToolChains/Arch/X86.cpp
++++ b/clang/lib/Driver/ToolChains/Arch/X86.cpp
+@@ -105,8 +105,8 @@ const char *x86::getX86TargetCPU(const ArgList &Args,
+   case llvm::Triple::Haiku:
+     return "i586";
+   default:
+-    // Fallback to p4.
+-    return "pentium4";
++    // Fallback to i686.
++    return "i686";
+   }
+ }
+
diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff
new file mode 100644
index 0000000..bdd5652
--- /dev/null
+++ b/debian/patches/clang-format-version.diff
@@ -0,0 +1,45 @@
+---
+ clang/tools/clang-format/clang-format-diff.py |    2 +-
+ clang/tools/clang-format/clang-format.el      |    2 +-
+ clang/tools/clang-format/clang-format.py      |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format-diff.py
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format-diff.py
++++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format-diff.py
+@@ -57,7 +57,7 @@ def main():
+   parser.add_argument('-style',
+                       help='formatting style to apply (LLVM, Google, Chromium, '
+                       'Mozilla, WebKit)')
+-  parser.add_argument('-binary', default='clang-format',
++  parser.add_argument('-binary', default='clang-format-8',
+                       help='location of binary to use for clang-format')
+   args = parser.parse_args()
+ 
+Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.el
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format.el
++++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.el
+@@ -36,7 +36,7 @@
+   :group 'tools)
+ 
+ (defcustom clang-format-executable
+-  (or (executable-find "clang-format")
++  (or (executable-find "clang-format-8")
+       "clang-format")
+   "Location of the clang-format executable.
+ 
+Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.py
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format.py
++++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.py
+@@ -36,7 +36,7 @@ import vim
+ 
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format-8'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+   binary = vim.eval('g:clang_format_path')
+ 
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
new file mode 100644
index 0000000..73933b3
--- /dev/null
+++ b/debian/patches/clang-tidy-run-bin.diff
@@ -0,0 +1,17 @@
+Index: llvm-toolchain-snapshot_8~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-snapshot_8~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+@@ -179,10 +179,10 @@ def main():
+                                    'clang-tidy and clang-apply-replacements in '
+                                    '$PATH.')
+   parser.add_argument('-clang-tidy-binary', metavar='PATH',
+-                      default='clang-tidy',
++                      default='clang-tidy-8',
+                       help='path to clang-tidy binary')
+   parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
+-                      default='clang-apply-replacements',
++                      default='clang-apply-replacements-8',
+                       help='path to clang-apply-replacements binary')
+   parser.add_argument('-checks', default=None,
+                       help='checks filter, when not specified, use clang-tidy '
diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch
new file mode 100644
index 0000000..6529d56
--- /dev/null
+++ b/debian/patches/clangd-atomic-cmake.patch
@@ -0,0 +1,16 @@
+Index: llvm-toolchain-snapshot_8~svn346586/clang-tools-extra/clangd/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn346586.orig/clang-tools-extra/clangd/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn346586/clang-tools-extra/clangd/CMakeLists.txt
+@@ -7,6 +7,11 @@ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+   list(APPEND CLANGD_ATOMIC_LIB "atomic")
+ endif()
+ 
++if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686")
++  list(APPEND CLANGD_ATOMIC_LIB "atomic")
++endif()
++
+ add_clang_library(clangDaemon
+   AST.cpp
+   Cancellation.cpp
diff --git a/debian/patches/debug-jit-path.diff b/debian/patches/debug-jit-path.diff
new file mode 100644
index 0000000..78dc89a
--- /dev/null
+++ b/debian/patches/debug-jit-path.diff
@@ -0,0 +1,15 @@
+Index: llvm-toolchain-7_7.0.1~+rc3/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+===================================================================
+--- llvm-toolchain-7_7.0.1~+rc3.orig/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
++++ llvm-toolchain-7_7.0.1~+rc3/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+@@ -294,8 +294,8 @@ bool PerfJITEventListener::InitDebugging
+   // search for location to dump data to
+   if (const char *BaseDir = getenv("JITDUMPDIR"))
+     Path.append(BaseDir);
+-  else if (!sys::path::home_directory(Path))
+-    Path = ".";
++  else
++    sys::path::system_temp_directory(/*ErasedOnReboot*/ true, Path);
+ 
+   // create debug directory
+   Path += "/.debug/jit/";
diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff
new file mode 100644
index 0000000..a2cebb4
--- /dev/null
+++ b/debian/patches/declare_clear_cache.diff
@@ -0,0 +1,17 @@
+---
+ lib/Support/Unix/Memory.inc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: llvm-toolchain-snapshot_8~svn342269/lib/Support/Unix/Memory.inc
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/lib/Support/Unix/Memory.inc
++++ llvm-toolchain-snapshot_8~svn342269/lib/Support/Unix/Memory.inc
+@@ -237,7 +237,7 @@ void Memory::InvalidateInstructionCache(
+   // FIXME: Can we safely always call this for __GNUC__ everywhere?
+   const char *Start = static_cast<const char *>(Addr);
+   const char *End = Start + Len;
+-  __clear_cache(const_cast<char *>(Start), const_cast<char *>(End));
++  __builtin___clear_cache(const_cast<char *>(Start), const_cast<char *>(End));
+ #  endif
+ 
+ #endif  // end apple
diff --git a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
new file mode 100644
index 0000000..cde5326
--- /dev/null
+++ b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
@@ -0,0 +1,17 @@
+Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/third_party/Python/module/unittest2/unittest2/runner.py
+===================================================================
+--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/third_party/Python/module/unittest2/unittest2/runner.py
++++ llvm-toolchain-snapshot_4.0~svn280802/lldb/third_party/Python/module/unittest2/unittest2/runner.py
+@@ -174,9 +174,9 @@ class TextTestRunner(unittest.TextTestRu
+         if hasattr(result, 'separator2'):
+             self.stream.writeln(result.separator2)
+         run = result.testsRun
+-        self.stream.writeln("Ran %d test%s in %.3fs" %
+-                            (run, run != 1 and "s" or "", timeTaken))
+-        self.stream.writeln()
++#        self.stream.writeln("Ran %d test%s in %.3fs" %
++#                            (run, run != 1 and "s" or "", timeTaken))
++#        self.stream.writeln()
+ 
+         expectedFails = unexpectedSuccesses = skipped = passed = failed = errored = 0
+         try:
diff --git a/debian/patches/disable-error-xray.diff b/debian/patches/disable-error-xray.diff
new file mode 100644
index 0000000..ec68308
--- /dev/null
+++ b/debian/patches/disable-error-xray.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_8~svn347449/compiler-rt/lib/xray/xray_tsc.h
+===================================================================
+--- llvm-toolchain-snapshot_8~svn347449.orig/compiler-rt/lib/xray/xray_tsc.h
++++ llvm-toolchain-snapshot_8~svn347449/compiler-rt/lib/xray/xray_tsc.h
+@@ -83,8 +83,6 @@ inline uint64_t getTSCFrequency() XRAY_N
+ 
+ } // namespace __xray
+ 
+-#else
+-#error Target architecture is not supported.
+ #endif // CPU architecture
+ #endif // SANITIZER_FUCHSIA
+ 
diff --git a/debian/patches/disable-llvm-symbolizer-test.diff b/debian/patches/disable-llvm-symbolizer-test.diff
new file mode 100644
index 0000000..988bb59
--- /dev/null
+++ b/debian/patches/disable-llvm-symbolizer-test.diff
@@ -0,0 +1,25 @@
+Description: Silent a test failing on yakkety amd64
+ /tmp/buildd/llvm-toolchain-snapshot-4.0~svn279801/test/tools/llvm-symbolizer/print_context.c:16:11: error: expected string not found in input
+ // CHECK: inc
+          ^
+ <stdin>:1:1: note: scanning from here
+ _fini
+ ^
+ <stdin>:1:3: note: possible intended match here
+ _fini
+  ^
+Author: Sylvestre <sylvestre@debian.org>
+Last-Update: 2016-08-26
+
+Index: llvm-toolchain-snapshot_6.0~svn311429/test/tools/llvm-symbolizer/print_context.c
+===================================================================
+--- llvm-toolchain-snapshot_6.0~svn311429.orig/test/tools/llvm-symbolizer/print_context.c
++++ llvm-toolchain-snapshot_6.0~svn311429/test/tools/llvm-symbolizer/print_context.c
+@@ -14,6 +14,7 @@ int main() {
+ // RUN: cp %p/Inputs/print_context.o %t
+ // RUN: cd %t
+ // RUN: echo "%t/print_context.o 0x0" | llvm-symbolizer -print-source-context-lines=5 | FileCheck %s
++// XFAIL: *
+ 
+ // Inputs/print_context.o built with plain -g -c from this source file
+ // Specifying -Xclang -fdebug-compilation-dir -Xclang . to make the debug info
diff --git a/debian/patches/disable-path-test-failing.diff b/debian/patches/disable-path-test-failing.diff
new file mode 100644
index 0000000..4643d8f
--- /dev/null
+++ b/debian/patches/disable-path-test-failing.diff
@@ -0,0 +1,29 @@
+Index: llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn347135.orig/unittests/Support/Path.cpp
++++ llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
+@@ -437,7 +437,7 @@ protected:
+     sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
+   }
+ 
+-  void TearDown() override { ASSERT_NO_ERROR(fs::remove(TestDirectory.str())); }
++//  void TearDown() override { ASSERT_NO_ERROR(fs::remove(TestDirectory.str())); }
+ };
+ 
+ TEST_F(FileSystemTest, Unique) {
+@@ -519,13 +519,13 @@ TEST_F(FileSystemTest, RealPath) {
+ 
+   // This can fail if $HOME is not set and getpwuid fails.
+   bool Result = llvm::sys::path::home_directory(HomeDir);
+-  if (Result) {
++/*  if (Result) {
+     ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected));
+     ASSERT_NO_ERROR(fs::real_path("~", Actual, true));
+     EXPECT_EQ(Expected, Actual);
+     ASSERT_NO_ERROR(fs::real_path("~/", Actual, true));
+     EXPECT_EQ(Expected, Actual);
+-  }
++    }*/
+ 
+   ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/test1"));
+ }
diff --git a/debian/patches/disable-source-interleave.diff b/debian/patches/disable-source-interleave.diff
new file mode 100644
index 0000000..929098e
--- /dev/null
+++ b/debian/patches/disable-source-interleave.diff
@@ -0,0 +1,12 @@
+Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/llvm-objdump/X86/source-interleave-x86_64.ll
+===================================================================
+--- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/llvm-objdump/X86/source-interleave-x86_64.ll
++++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/llvm-objdump/X86/source-interleave-x86_64.ll
+@@ -4,6 +4,7 @@
+ ;  RUN: llvm-objdump -d -l %t.o | FileCheck --check-prefix="LINES" %t.ll
+ ;  RUN: llvm-objdump -d -S %t.o | FileCheck --check-prefix="SOURCE" %t.ll
+ ; ModuleID = 'source-interleave-x86_64.bc'
++; XFAIL: *
+ source_filename = "source-interleave-x86_64.c"
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff
new file mode 100644
index 0000000..fceb368
--- /dev/null
+++ b/debian/patches/disable-sse2-old-x86.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Basic/X86Target.def
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/include/clang/Basic/X86Target.def
++++ llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Basic/X86Target.def
+@@ -302,7 +302,7 @@ CPU_SPECIFIC("pentium_mmx", 'D', "+mmx")
+ CPU_SPECIFIC("pentium_ii", 'E', "+cmov,+mmx")
+ CPU_SPECIFIC("pentium_iii", 'H', "+cmov,+mmx,+sse")
+ CPU_SPECIFIC("pentium_iii_no_xmm_regs", 'H',"+cmov,+sse")
+-CPU_SPECIFIC("pentium_4", 'J', "+cmov,+mmx,+sse,+sse2")
++CPU_SPECIFIC("pentium_4", 'J', "+cmov,+mmx,+sse")
+ CPU_SPECIFIC("pentium_m", 'K', "+cmov,+mmx,+sse,+sse2")
+ CPU_SPECIFIC("pentium_4_sse3", 'L', "+cmov,+mmx,+sse,+sse2,+sse3")
+ CPU_SPECIFIC("core_2_duo_ssse3", 'M', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3")
diff --git a/debian/patches/do-not-fail-on-unexpected-pass.diff b/debian/patches/do-not-fail-on-unexpected-pass.diff
new file mode 100644
index 0000000..cc83b79
--- /dev/null
+++ b/debian/patches/do-not-fail-on-unexpected-pass.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_8~svn342269/utils/lit/lit/Test.py
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/utils/lit/lit/Test.py
++++ llvm-toolchain-snapshot_8~svn342269/utils/lit/lit/Test.py
+@@ -32,7 +32,7 @@ PASS        = ResultCode('PASS', False)
+ FLAKYPASS   = ResultCode('FLAKYPASS', False)
+ XFAIL       = ResultCode('XFAIL', False)
+ FAIL        = ResultCode('FAIL', True)
+-XPASS       = ResultCode('XPASS', True)
++XPASS       = ResultCode('XPASS', False)
+ UNRESOLVED  = ResultCode('UNRESOLVED', True)
+ UNSUPPORTED = ResultCode('UNSUPPORTED', False)
+ TIMEOUT     = ResultCode('TIMEOUT', True)
diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff
new file mode 100644
index 0000000..e1af165
--- /dev/null
+++ b/debian/patches/fix-clang-path-and-build.diff
@@ -0,0 +1,31 @@
+---
+ clang/lib/Driver/ToolChains.cpp |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: llvm-toolchain-snapshot_8~svn344157/clang/lib/Driver/ToolChains/Gnu.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn344157.orig/clang/lib/Driver/ToolChains/Gnu.cpp
++++ llvm-toolchain-snapshot_8~svn344157/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -1,4 +1,5 @@
+-//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------*- C++ -*-===//
++//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------*- C++ 
++//-*-===//
+ //
+ //                     The LLVM Compiler Infrastructure
+ //
+@@ -16,6 +17,7 @@
+ #include "Arch/SystemZ.h"
+ #include "CommonArgs.h"
+ #include "Linux.h"
++#include "clang/Basic/Version.h"
+ #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
+ #include "clang/Driver/Compilation.h"
+ #include "clang/Driver/Driver.h"
+@@ -2438,6 +2440,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
+     addLibStdCxxIncludePaths(DriverArgs, CC1Args);
+     break;
+   }
++  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+ }
+ 
+ void
diff --git a/debian/patches/fix-llvm-config-obj-src-root.patch b/debian/patches/fix-llvm-config-obj-src-root.patch
new file mode 100644
index 0000000..626598b
--- /dev/null
+++ b/debian/patches/fix-llvm-config-obj-src-root.patch
@@ -0,0 +1,20 @@
+---
+ tools/llvm-config/llvm-config.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: llvm-toolchain-snapshot_8~svn342269/tools/llvm-config/llvm-config.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/tools/llvm-config/llvm-config.cpp
++++ llvm-toolchain-snapshot_8~svn342269/tools/llvm-config/llvm-config.cpp
+@@ -558,9 +558,9 @@ int main(int argc, char **argv) {
+       } else if (Arg == "--shared-mode") {
+         PrintSharedMode = true;
+       } else if (Arg == "--obj-root") {
+-        OS << ActivePrefix << '\n';
++        OS << ActivePrefix << "/build/" << '\n';
+       } else if (Arg == "--src-root") {
+-        OS << LLVM_SRC_ROOT << '\n';
++        OS << ActivePrefix << "/build/" << '\n';
+       } else if (Arg == "--ignore-libllvm") {
+         LinkDyLib = false;
+         LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff
new file mode 100644
index 0000000..1f95380
--- /dev/null
+++ b/debian/patches/fix-scan-view-path.diff
@@ -0,0 +1,21 @@
+Index: llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view
+===================================================================
+--- llvm-toolchain-3.9-3.9.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view
+@@ -23,6 +23,7 @@ kDefaultPort = 8181
+ kMaxPortsToTry = 100
+ 
+ ###
++BASE_DIR = '/usr/share/clang/scan-view-8'
+ 
+ 
+ def url_is_up(url):
+@@ -61,7 +62,7 @@ def start_browser(port, options):
+ 
+ def run(port, options, root):
+     # Prefer to look relative to the installed binary
+-    share = os.path.dirname(__file__) + "/../share/"
++    share = os.path.join(BASE_DIR, 'share')
+     if not os.path.isdir(share):
+         # Otherwise look relative to the source
+         share = os.path.dirname(__file__) + "/../../scan-view/share"
diff --git a/debian/patches/force-gcc-header-obj.diff b/debian/patches/force-gcc-header-obj.diff
new file mode 100644
index 0000000..e47d28c
--- /dev/null
+++ b/debian/patches/force-gcc-header-obj.diff
@@ -0,0 +1,16 @@
+Index: llvm-toolchain-5.0-5.0.2~+rc1/clang/lib/Driver/ToolChains/Linux.cpp
+===================================================================
+--- llvm-toolchain-5.0-5.0.2~+rc1.orig/clang/lib/Driver/ToolChains/Linux.cpp
++++ llvm-toolchain-5.0-5.0.2~+rc1/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -571,6 +571,11 @@ void Linux::AddClangSystemIncludeArgs(co
+     return;
+   }
+ 
++  // Force the inclusion of the gcc headers (objc/objc.h)
++  addExternCSystemIncludeIfExists(
++     DriverArgs, CC1Args, GCCInstallation.getInstallPath() + "/include");
++//  std::cout << GCCInstallation.getInstallPath().str() << "/include" << std::endl;
++
+   // Lacking those, try to detect the correct set of system includes for the
+   // target triple.
+ 
diff --git a/debian/patches/hurd/D54677-hurd-path_max.diff b/debian/patches/hurd/D54677-hurd-path_max.diff
new file mode 100644
index 0000000..f0cafd1
--- /dev/null
+++ b/debian/patches/hurd/D54677-hurd-path_max.diff
@@ -0,0 +1,64 @@
+[hurd] Fix unconditional use of PATH_MAX
+
+The GNU/Hurd system does not define an arbitrary PATH_MAX limitation, the POSIX 2001 realpath extension can be used instead, and the size of symlinks can be determined.
+
+https://reviews.llvm.org/D54677
+
+Index: llvm-toolchain-7_7.0.1~svn347285/libcxx/src/filesystem/operations.cpp
+===================================================================
+--- llvm-toolchain-7_7.0.1~svn347285.orig/libcxx/src/filesystem/operations.cpp
++++ llvm-toolchain-7_7.0.1~svn347285/libcxx/src/filesystem/operations.cpp
+@@ -531,11 +531,20 @@ path __canonical(path const& orig_p, err
+   ErrorHandler<path> err("canonical", ec, &orig_p, &cwd);
+ 
+   path p = __do_absolute(orig_p, &cwd, ec);
++#if _POSIX_VERSION >= 200112 || defined(__GLIBC__)
++  char *buff;
++  if ((buff = ::realpath(p.c_str(), NULL)) == nullptr)
++    return err.report(capture_errno());
++  path ret = {buff};
++  free(buff);
++  return ret;
++#else
+   char buff[PATH_MAX + 1];
+   char* ret;
+   if ((ret = ::realpath(p.c_str(), buff)) == nullptr)
+     return err.report(capture_errno());
+   return {ret};
++#endif
+ }
+ 
+ void __copy(const path& from, const path& to, copy_options options,
+@@ -1077,16 +1086,27 @@ void __permissions(const path& p, perms
+ path __read_symlink(const path& p, error_code* ec) {
+   ErrorHandler<path> err("read_symlink", ec, &p);
+ 
+-  char buff[PATH_MAX + 1];
+-  error_code m_ec;
++  struct stat sb;
++  if (lstat(p.c_str(), &sb) == -1) {
++    return err.report(capture_errno());
++  }
++  size_t size = sb.st_size + 1;
++  char *buff = (char*) malloc(size);
++  if (buff == NULL) {
++    return err.report(capture_errno());
++  }
++
+   ::ssize_t ret;
+-  if ((ret = ::readlink(p.c_str(), buff, PATH_MAX)) == -1) {
++  if ((ret = ::readlink(p.c_str(), buff, size)) == -1) {
++    free(buff);
+     return err.report(capture_errno());
+   }
+-  _LIBCPP_ASSERT(ret <= PATH_MAX, "TODO");
++  _LIBCPP_ASSERT(ret < size, "TODO");
+   _LIBCPP_ASSERT(ret > 0, "TODO");
+   buff[ret] = 0;
+-  return {buff};
++  path res = {buff};
++  free(buff);
++  return res;
+ }
+ 
+ bool __remove(const path& p, error_code* ec) {
diff --git a/debian/patches/hurd/hurd-EIEIO-undef.diff b/debian/patches/hurd/hurd-EIEIO-undef.diff
new file mode 100644
index 0000000..3b98ad9
--- /dev/null
+++ b/debian/patches/hurd/hurd-EIEIO-undef.diff
@@ -0,0 +1,14 @@
+Index: llvm-toolchain-snapshot_3.9~svn268880/utils/TableGen/CodeEmitterGen.cpp
+===================================================================
+--- llvm-toolchain-snapshot_3.9~svn268880.orig/utils/TableGen/CodeEmitterGen.cpp
++++ llvm-toolchain-snapshot_3.9~svn268880/utils/TableGen/CodeEmitterGen.cpp
+@@ -229,6 +229,9 @@ void CodeEmitterGen::run(raw_ostream &o)
+   ArrayRef<const CodeGenInstruction*> NumberedInstructions =
+     Target.getInstructionsByEnumValue();
+ 
++  o << "// Undef for HURD\n";
++  o << "#ifdef EIEIO\n#undef EIEIO\n#endif\n";
++
+   // Emit function declaration
+   o << "uint64_t " << Target.getName();
+   o << "MCCodeEmitter::getBinaryCodeForInstr(const MCInst &MI,\n"
diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff
new file mode 100644
index 0000000..d9ba159
--- /dev/null
+++ b/debian/patches/hurd/hurd-pathmax.diff
@@ -0,0 +1,81 @@
+Index: llvm-toolchain-8_8~svn353935/clang/lib/Basic/FileManager.cpp
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-8_8~svn353935/clang/lib/Basic/FileManager.cpp
+@@ -483,6 +483,12 @@ void FileManager::invalidateCache(const
+   UniqueRealFiles.erase(Entry->getUniqueID());
+ }
+ 
++// For GNU Hurd
++#if defined(__GNU__) && !defined(PATH_MAX)
++# define PATH_MAX 4096
++#endif
++
++
+ void FileManager::GetUniqueIDMapping(
+                    SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
+   UIDToFiles.clear();
+Index: llvm-toolchain-8_8~svn353935/lldb/include/lldb/lldb-defines.h
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-8_8~svn353935/lldb/include/lldb/lldb-defines.h
+@@ -28,6 +28,11 @@
+ #define INT32_MAX 2147483647
+ #endif
+ 
++// For GNU Hurd
++#if defined(__GNU__) && !defined(PATH_MAX)
++# define PATH_MAX 4096
++#endif
++
+ #if !defined(UINT32_MAX)
+ #define UINT32_MAX 4294967295U
+ #endif
+Index: llvm-toolchain-8_8~svn353935/tools/dsymutil/DwarfLinker.cpp
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/tools/dsymutil/DwarfLinker.cpp
++++ llvm-toolchain-8_8~svn353935/tools/dsymutil/DwarfLinker.cpp
+@@ -101,6 +101,11 @@
+ #include <utility>
+ #include <vector>
+ 
++// For GNU Hurd
++#if defined(__GNU__) && !defined(PATH_MAX)
++# define PATH_MAX 4096
++#endif
++
+ namespace llvm {
+ namespace dsymutil {
+ 
+Index: llvm-toolchain-8_8~svn353935/polly/lib/External/ppcg/cuda_common.c
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/polly/lib/External/ppcg/cuda_common.c
++++ llvm-toolchain-8_8~svn353935/polly/lib/External/ppcg/cuda_common.c
+@@ -15,6 +15,11 @@
+ #include "cuda_common.h"
+ #include "ppcg.h"
+ 
++// For GNU Hurd
++#if defined(__GNU__) && !defined(PATH_MAX)
++# define PATH_MAX 4096
++#endif
++
+ /* Open the host .cu file and the kernel .hu and .cu files for writing.
+  * Add the necessary includes.
+  */
+Index: llvm-toolchain-8_8~svn353935/clang/lib/Frontend/ModuleDependencyCollector.cpp
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/clang/lib/Frontend/ModuleDependencyCollector.cpp
++++ llvm-toolchain-8_8~svn353935/clang/lib/Frontend/ModuleDependencyCollector.cpp
+@@ -99,6 +99,11 @@ struct ModuleDependencyMMCallbacks : pub
+ 
+ }
+ 
++// For GNU Hurd
++#if defined(__GNU__) && !defined(PATH_MAX)
++# define PATH_MAX 4096
++#endif
++
+ // TODO: move this to Support/Path.h and check for HAVE_REALPATH?
+ static bool real_path(StringRef SrcPath, SmallVectorImpl<char> &RealPath) {
+ #ifdef LLVM_ON_UNIX
diff --git a/debian/patches/hurd/impl-path-hurd.diff b/debian/patches/hurd/impl-path-hurd.diff
new file mode 100644
index 0000000..4d7b7a6
--- /dev/null
+++ b/debian/patches/hurd/impl-path-hurd.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_7~svn334230/lib/Support/Unix/Path.inc
+===================================================================
+--- llvm-toolchain-snapshot_7~svn334230.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-snapshot_7~svn334230/lib/Support/Unix/Path.inc
+@@ -175,7 +175,7 @@ std::string getMainExecutable(const char
+ 
+   if (getprogpath(exe_path, argv0) != NULL)
+     return exe_path;
+-#elif defined(__linux__) || defined(__CYGWIN__)
++#elif defined(__linux__) || defined(__CYGWIN__) || defined(__GNU__)
+   char exe_path[MAXPATHLEN];
+   StringRef aPath("/proc/self/exe");
+   if (sys::fs::exists(aPath)) {
diff --git a/debian/patches/install-scan-build-py.diff b/debian/patches/install-scan-build-py.diff
new file mode 100644
index 0000000..95543fd
--- /dev/null
+++ b/debian/patches/install-scan-build-py.diff
@@ -0,0 +1,16 @@
+---
+ clang/tools/CMakeLists.txt |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: llvm-toolchain-snapshot_8~svn350922/clang/tools/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn350922.orig/clang/tools/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn350922/clang/tools/CMakeLists.txt
+@@ -23,6 +23,7 @@ if(CLANG_ENABLE_STATIC_ANALYZER)
+   add_clang_subdirectory(clang-check)
+   add_clang_subdirectory(clang-extdef-mapping)
+   add_clang_subdirectory(scan-build)
++  add_clang_subdirectory(scan-build-py)
+   add_clang_subdirectory(scan-view)
+ endif()
+ 
diff --git a/debian/patches/kfreebsd/CMakeLists.txt.diff b/debian/patches/kfreebsd/CMakeLists.txt.diff
new file mode 100644
index 0000000..30ec60e
--- /dev/null
+++ b/debian/patches/kfreebsd/CMakeLists.txt.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-7-7.0.1/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-7-7.0.1.orig/CMakeLists.txt
++++ llvm-toolchain-7-7.0.1/CMakeLists.txt
+@@ -821,7 +821,7 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
+ # (this is a variable that CrossCompile sets on recursive invocations)
+ endif()
+ 
+-if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
++if( ${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)" AND NOT "kFreeBSD" )
+   # On FreeBSD, /usr/local/* is not used by default. In order to build LLVM
+   # with libxml2, iconv.h, etc., we must add /usr/local paths.
+   include_directories(SYSTEM "/usr/local/include")
diff --git a/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff b/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff
new file mode 100644
index 0000000..8361b81
--- /dev/null
+++ b/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff
@@ -0,0 +1,48 @@
+Index: llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets.cpp
+===================================================================
+--- llvm-toolchain-7-7.0.1.orig/clang/lib/Basic/Targets.cpp
++++ llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets.cpp
+@@ -469,8 +469,8 @@ TargetInfo *AllocateTarget(const llvm::T
+       return new OpenBSDI386TargetInfo(Triple, Opts);
+     case llvm::Triple::FreeBSD:
+       return new FreeBSDTargetInfo<X86_32TargetInfo>(Triple, Opts);
+-    case llvm::Triple::KFreeBSD:
+-      return new KFreeBSDTargetInfo<X86_32TargetInfo>(Triple, Opts);
++    case llvm::Triple::kFreeBSD:
++      return new kFreeBSDTargetInfo<X86_32TargetInfo>(Triple, Opts);
+     case llvm::Triple::Minix:
+       return new MinixTargetInfo<X86_32TargetInfo>(Triple, Opts);
+     case llvm::Triple::Solaris:
+@@ -528,8 +528,8 @@ TargetInfo *AllocateTarget(const llvm::T
+       return new FreeBSDTargetInfo<X86_64TargetInfo>(Triple, Opts);
+     case llvm::Triple::Fuchsia:
+       return new FuchsiaTargetInfo<X86_64TargetInfo>(Triple, Opts);
+-    case llvm::Triple::KFreeBSD:
+-      return new KFreeBSDTargetInfo<X86_64TargetInfo>(Triple, Opts);
++    case llvm::Triple::kFreeBSD:
++      return new kFreeBSDTargetInfo<X86_64TargetInfo>(Triple, Opts);
+     case llvm::Triple::Solaris:
+       return new SolarisTargetInfo<X86_64TargetInfo>(Triple, Opts);
+     case llvm::Triple::Win32: {
+Index: llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets/OSTargets.h
+===================================================================
+--- llvm-toolchain-7-7.0.1.orig/clang/lib/Basic/Targets/OSTargets.h
++++ llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets/OSTargets.h
+@@ -226,7 +226,7 @@ public:
+ 
+ // GNU/kFreeBSD Target
+ template <typename Target>
+-class LLVM_LIBRARY_VISIBILITY KFreeBSDTargetInfo : public OSTargetInfo<Target> {
++class LLVM_LIBRARY_VISIBILITY kFreeBSDTargetInfo : public OSTargetInfo<Target> {
+ protected:
+   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
+                     MacroBuilder &Builder) const override {
+@@ -243,7 +243,7 @@ protected:
+   }
+ 
+ public:
+-  KFreeBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
++  kFreeBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
+       : OSTargetInfo<Target>(Triple, Opts) {}
+ };
+ 
diff --git a/debian/patches/kfreebsd/compiler-rt_lib.diff b/debian/patches/kfreebsd/compiler-rt_lib.diff
new file mode 100644
index 0000000..726f182
--- /dev/null
+++ b/debian/patches/kfreebsd/compiler-rt_lib.diff
@@ -0,0 +1,349 @@
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+@@ -84,9 +84,14 @@
+ extern "C" {
+ // <sys/umtx.h> must be included after <errno.h> and <sys/types.h> on
+ // FreeBSD 9.2 and 10.0.
++#if SANITIZER_KFREEBSD
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <sys/umtx.h>
+ }
++#if !SANITIZER_KFREEBSD
+ #include <sys/thr.h>
++#endif
+ #endif  // SANITIZER_FREEBSD
+ 
+ #if SANITIZER_NETBSD
+@@ -468,10 +473,12 @@ bool FileExists(const char *filename) {
+ 
+ #if !SANITIZER_NETBSD
+ tid_t GetTid() {
+-#if SANITIZER_FREEBSD
++#if SANITIZER_FREEBSD && !SANITIZER_KFREEBSD
+   long Tid;
+   thr_self(&Tid);
+   return Tid;
++#elif SANITIZER_KFREEBSD
++  return (uptr)pthread_self();
+ #elif SANITIZER_OPENBSD
+   return internal_syscall(SYSCALL(getthrid));
+ #elif SANITIZER_SOLARIS
+@@ -1167,10 +1174,10 @@ bool LibraryNameIs(const char *full_name
+ // Call cb for each region mapped by map.
+ void ForEachMappedRegion(link_map *map, void (*cb)(const void *, uptr)) {
+   CHECK_NE(map, nullptr);
+-#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD || SANITIZER_KFREEBSD
+   typedef ElfW(Phdr) Elf_Phdr;
+   typedef ElfW(Ehdr) Elf_Ehdr;
+-#endif // !SANITIZER_FREEBSD && !SANITIZER_OPENBSD
++#endif // !SANITIZER_FREEBSD && !SANITIZER_OPENBSD || SANITIZER_KFREEBSD
+   char *base = (char *)map->l_addr;
+   Elf_Ehdr *ehdr = (Elf_Ehdr *)base;
+   char *phdrs = base + ehdr->e_phoff;
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -36,10 +36,12 @@
+ #include <syslog.h>
+ 
+ #if SANITIZER_FREEBSD
+-#include <pthread_np.h>
++# if !SANITIZER_KFREEBSD
++# include <pthread_np.h>
++# define pthread_getattr_np pthread_attr_get_np
++# endif
+ #include <osreldate.h>
+ #include <sys/sysctl.h>
+-#define pthread_getattr_np pthread_attr_get_np
+ #endif
+ 
+ #if SANITIZER_OPENBSD
+@@ -528,9 +530,9 @@ void GetThreadStackAndTls(bool main, upt
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD || SANITIZER_KFREEBSD
+ typedef ElfW(Phdr) Elf_Phdr;
+-#elif SANITIZER_WORDSIZE == 32 && __FreeBSD_version <= 902001 // v9.2
++#elif SANITIZER_WORDSIZE == 32 && !SANITIZER_KFREEBSD && __FreeBSD_version <= 902001 // v9.2
+ #define Elf_Phdr XElf32_Phdr
+ #define dl_phdr_info xdl_phdr_info
+ #define dl_iterate_phdr(c, b) xdl_iterate_phdr((c), (b))
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+@@ -16,7 +16,7 @@
+ #if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
+   !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(_WIN32) && \
+   !defined(__Fuchsia__) && !defined(__rtems__) && \
+-  !(defined(__sun__) && defined(__svr4__))
++  !(defined(__sun__) && defined(__svr4__)) && !defined(__FreeBSD_kernel__)
+ # error "This operating system is not supported"
+ #endif
+ 
+@@ -26,12 +26,18 @@
+ # define SANITIZER_LINUX   0
+ #endif
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ # define SANITIZER_FREEBSD 1
+ #else
+ # define SANITIZER_FREEBSD 0
+ #endif
+ 
++#if defined(__FreeBSD_kernel__)
++# define SANITIZER_KFREEBSD 1
++#else
++# define SANITIZER_KFREEBSD 0
++#endif
++
+ #if defined(__NetBSD__)
+ # define SANITIZER_NETBSD 1
+ #else
+@@ -113,7 +119,8 @@
+ 
+ #define SANITIZER_POSIX \
+   (SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC || \
+-    SANITIZER_NETBSD || SANITIZER_OPENBSD || SANITIZER_SOLARIS)
++    SANITIZER_NETBSD || SANITIZER_OPENBSD || SANITIZER_SOLARIS || \
++    SANITIZER_KFREEBSD)
+ 
+ #if __LP64__ || defined(_WIN64)
+ #  define SANITIZER_WORDSIZE 64
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/asan/asan_linux.cc
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/asan/asan_linux.cc
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/asan/asan_linux.cc
+@@ -38,7 +38,7 @@
+ #include <unistd.h>
+ #include <unwind.h>
+ 
+-#if SANITIZER_FREEBSD
++#if SANITIZER_FREEBSD && !SANITIZER_KFREEBSD
+ #include <sys/link_elf.h>
+ #endif
+ 
+@@ -48,7 +48,11 @@
+ 
+ #if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
+ #include <ucontext.h>
++#if SANITIZER_KFREEBSD
++#include <link.h>
++#else
+ extern "C" void* _DYNAMIC;
++#endif
+ #elif SANITIZER_NETBSD
+ #include <link_elf.h>
+ #include <ucontext.h>
+@@ -61,7 +65,7 @@ extern Elf_Dyn _DYNAMIC;
+ // x86-64 FreeBSD 9.2 and older define 'ucontext_t' incorrectly in
+ // 32-bit mode.
+ #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32) && \
+-  __FreeBSD_version <= 902001  // v9.2
++  !SANITIZER_KFREEBSD && __FreeBSD_version <= 902001  // v9.2
+ #define ucontext_t xucontext_t
+ #endif
+ 
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/ubsan/ubsan_platform.h
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/ubsan/ubsan_platform.h
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/ubsan/ubsan_platform.h
+@@ -15,7 +15,7 @@
+ 
+ // Other platforms should be easy to add, and probably work as-is.
+ #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) ||        \
+-    defined(__NetBSD__) || defined(__OpenBSD__) || \
++    defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || \
+     (defined(__sun__) && defined(__svr4__)) || \
+     defined(_WIN32) || defined(__Fuchsia__) || defined(__rtems__)
+ # define CAN_SANITIZE_UB 1
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+@@ -197,7 +197,7 @@ ASM_SYMBOL_INTERCEPTOR(setjmp):
+   lea 16(%rsp), %rdi
+   mov %rdi, %rsi
+   xorq ___tsan_darwin_setjmp_xor_key(%rip), %rsi
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__)
+   lea 16(%rsp), %rdi
+   mov %rdi, %rsi
+   xor %fs:0x30, %rsi  // magic mangling of rsp (see libc setjmp)
+@@ -246,7 +246,7 @@ ASM_SYMBOL_INTERCEPTOR(_setjmp):
+   lea 16(%rsp), %rdi
+   mov %rdi, %rsi
+   xorq ___tsan_darwin_setjmp_xor_key(%rip), %rsi
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__)
+   lea 16(%rsp), %rdi
+   mov %rdi, %rsi
+   xor %fs:0x30, %rsi  // magic mangling of rsp (see libc setjmp)
+@@ -302,7 +302,7 @@ ASM_SYMBOL_INTERCEPTOR(sigsetjmp):
+   lea 32(%rsp), %rdi
+   mov %rdi, %rsi
+   xorq ___tsan_darwin_setjmp_xor_key(%rip), %rsi
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__)
+   lea 32(%rsp), %rdi
+   mov %rdi, %rsi
+   xor %fs:0x30, %rsi  // magic mangling of rsp (see libc setjmp)
+@@ -389,7 +389,7 @@ ASM_SYMBOL_INTERCEPTOR(__sigsetjmp):
+ ASM_SIZE(ASM_SYMBOL_INTERCEPTOR(__sigsetjmp))
+ #endif  // !defined(__APPLE__) && !defined(__NetBSD__)
+ 
+-#if defined(__FreeBSD__) || defined(__linux__)
++#if defined(__FreeBSD__) || defined(__linux__) || defined(__FreeBSD_kernel__)
+ /* We do not need executable stack.  */
+ /* This note is not needed on NetBSD. */
+ .section        .note.GNU-stack,"",@progbits
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerDefs.h
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerDefs.h
+@@ -28,6 +28,7 @@
+ #define LIBFUZZER_LINUX 1
+ #define LIBFUZZER_NETBSD 0
+ #define LIBFUZZER_FREEBSD 0
++#define LIBFUZZER_KFREEBSD 1
+ #define LIBFUZZER_OPENBSD 0
+ #define LIBFUZZER_WINDOWS 0
+ #elif __APPLE__
+@@ -54,6 +55,15 @@
+ #define LIBFUZZER_FREEBSD 1
+ #define LIBFUZZER_OPENBSD 0
+ #define LIBFUZZER_WINDOWS 0
++#elif __FreeBSD_kernel__
++#define LIBFUZZER_APPLE 0
++#define LIBFUZZER_FUCHSIA 0
++#define LIBFUZZER_LINUX 0
++#define LIBFUZZER_NETBSD 0
++#define LIBFUZZER_FREEBSD 0
++#define LIBFUZZER_KFREEBSD 1
++#define LIBFUZZER_OPENBSD 0
++#define LIBFUZZER_WINDOWS 0
+ #elif __OpenBSD__
+ #define LIBFUZZER_APPLE 0
+ #define LIBFUZZER_FUCHSIA 0
+@@ -95,7 +105,7 @@
+ 
+ #define LIBFUZZER_POSIX                                                        \
+   (LIBFUZZER_APPLE || LIBFUZZER_LINUX || LIBFUZZER_NETBSD ||                   \
+-   LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD)
++   LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD)
+ 
+ #ifdef __x86_64
+ #  if __has_attribute(target)
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+@@ -119,7 +119,7 @@ size_t GetPeakRSSMb() {
+   if (getrusage(RUSAGE_SELF, &usage))
+     return 0;
+   if (LIBFUZZER_LINUX || LIBFUZZER_FREEBSD || LIBFUZZER_NETBSD ||
+-      LIBFUZZER_OPENBSD) {
++      LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD) {
+     // ru_maxrss is in KiB
+     return usage.ru_maxrss >> 10;
+   } else if (LIBFUZZER_APPLE) {
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+@@ -12,7 +12,7 @@
+ #include "FuzzerDefs.h"
+ 
+ #if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FREEBSD ||                \
+-    LIBFUZZER_OPENBSD
++    LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD
+ __attribute__((weak)) extern uint8_t __start___libfuzzer_extra_counters;
+ __attribute__((weak)) extern uint8_t __stop___libfuzzer_extra_counters;
+ 
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+@@ -14,7 +14,7 @@
+ //===----------------------------------------------------------------------===//
+ #include "FuzzerDefs.h"
+ #if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FUCHSIA ||                \
+-    LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD
++    LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD
+ 
+ #include "FuzzerExtFunctions.h"
+ #include "FuzzerIO.h"
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+@@ -10,7 +10,7 @@
+ //===----------------------------------------------------------------------===//
+ #include "FuzzerDefs.h"
+ #if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FREEBSD ||                \
+-    LIBFUZZER_OPENBSD
++    LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD
+ #include "FuzzerCommand.h"
+ 
+ #include <stdlib.h>
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+@@ -21,7 +21,7 @@
+ // 32-bit mode.
+ #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
+ # include <osreldate.h>
+-# if __FreeBSD_version <= 902001  // v9.2
++# if !SANITIZER_KFREEBSD && __FreeBSD_version <= 902001 // v9.2
+ #  include <link.h>
+ #  include <sys/param.h>
+ #  include <ucontext.h>
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+@@ -38,7 +38,7 @@
+ // Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode.
+ #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
+ #include <osreldate.h>
+-#if __FreeBSD_version <= 902001 // v9.2
++#if !SANITIZER_KFREEBSD && __FreeBSD_version <= 902001 // v9.2
+ #define kinfo_vmentry xkinfo_vmentry
+ #endif
+ #endif
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -20,7 +20,9 @@
+ #include "sanitizer_internal_defs.h"
+ #include "sanitizer_platform.h"
+ 
++#if !SANITIZER_KFREEBSD
+ # define GET_LINK_MAP_BY_DLOPEN_HANDLE(handle) ((link_map*)(handle))
++#endif
+ 
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+Index: llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
++++ llvm-toolchain-8_8~+rc2/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+@@ -20,7 +20,7 @@
+ # define SYSCALL(name) __NR_ ## name
+ #endif
+ 
+-#if defined(__x86_64__) && (SANITIZER_FREEBSD || SANITIZER_MAC)
++#if defined(__x86_64__) && ((SANITIZER_FREEBSD  && !SANITIZER_KFREEBSD) || SANITIZER_MAC)
+ # define internal_syscall __syscall
+ # else
+ # define internal_syscall syscall
diff --git a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
new file mode 100644
index 0000000..219c7a2
--- /dev/null
+++ b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
@@ -0,0 +1,33 @@
+Index: llvm-toolchain-7-7.0.1/include/llvm/ADT/Triple.h
+===================================================================
+--- llvm-toolchain-7-7.0.1.orig/include/llvm/ADT/Triple.h
++++ llvm-toolchain-7-7.0.1/include/llvm/ADT/Triple.h
+@@ -158,7 +158,7 @@ public:
+     FreeBSD,
+     Fuchsia,
+     IOS,
+-    KFreeBSD,
++    kFreeBSD,
+     Linux,
+     Lv2,        // PS3
+     MacOSX,
+@@ -575,8 +575,8 @@ public:
+   }
+ 
+   /// Tests whether the OS is kFreeBSD.
+-  bool isOSKFreeBSD() const {
+-    return getOS() == Triple::KFreeBSD;
++  bool isOSkFreeBSD() const {
++    return getOS() == Triple::kFreeBSD;
+   }
+ 
+   /// Tests whether the OS is Hurd.
+@@ -586,7 +586,7 @@ public:
+ 
+   /// Tests whether the OS uses glibc.
+   bool isOSGlibc() const {
+-    return (getOS() == Triple::Linux || getOS() == Triple::KFreeBSD ||
++    return (getOS() == Triple::Linux || getOS() == Triple::kFreeBSD ||
+             getOS() == Triple::Hurd) &&
+            !isAndroid();
+   }
diff --git a/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff b/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff
new file mode 100644
index 0000000..ae37db2
--- /dev/null
+++ b/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff
@@ -0,0 +1,12 @@
+Index: llvm-toolchain-7-7.0.1/libcxx/include/__config
+===================================================================
+--- llvm-toolchain-7-7.0.1.orig/libcxx/include/__config
++++ llvm-toolchain-7-7.0.1/libcxx/include/__config
+@@ -1107,6 +1107,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit
+     !defined(_LIBCPP_HAS_THREAD_API_WIN32) && \
+     !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
+ #  if defined(__FreeBSD__) || \
++      defined(__FreeBSD_kernel__) || \
+       defined(__Fuchsia__) || \
+       defined(__NetBSD__) || \
+       defined(__linux__) || \
diff --git a/debian/patches/kfreebsd/kfreebsd-openmp.diff b/debian/patches/kfreebsd/kfreebsd-openmp.diff
new file mode 100644
index 0000000..fc6dbf1
--- /dev/null
+++ b/debian/patches/kfreebsd/kfreebsd-openmp.diff
@@ -0,0 +1,129 @@
+Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp.h
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/kmp.h
++++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp.h
+@@ -1077,6 +1077,10 @@ extern kmp_uint64 __kmp_now_nsec();
+ /* TODO: tune for KMP_OS_OPENBSD */
+ #define KMP_INIT_WAIT 1024U /* initial number of spin-tests   */
+ #define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */
++#elif KMP_OS_KFREEBSD
++/* TODO: tune for KMP_OS_KFREEBSD */
++#define KMP_INIT_WAIT 1024U /* initial number of spin-tests   */
++#define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */
+ #endif
+ 
+ #if KMP_ARCH_X86 || KMP_ARCH_X86_64
+Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_ftn_entry.h
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/kmp_ftn_entry.h
++++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_ftn_entry.h
+@@ -535,7 +535,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_
+   int gtid;
+ 
+ #if KMP_OS_DARWIN || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||    \
+-        KMP_OS_HURD
++        KMP_OS_HURD || KMP_OS_KFREEBSD
+   gtid = __kmp_entry_gtid();
+ #elif KMP_OS_WINDOWS
+   if (!__kmp_init_parallel ||
+Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_platform.h
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/kmp_platform.h
++++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_platform.h
+@@ -19,6 +19,7 @@
+ #define KMP_OS_LINUX 0
+ #define KMP_OS_DRAGONFLY 0
+ #define KMP_OS_FREEBSD 0
++#define KMP_OS_KFREEBSD 0
+ #define KMP_OS_NETBSD 0
+ #define KMP_OS_OPENBSD 0
+ #define KMP_OS_DARWIN 0
+@@ -57,6 +58,11 @@
+ #define KMP_OS_FREEBSD 1
+ #endif
+ 
++#if (defined __FreeBSD_kernel__)
++#undef KMP_OS_KFREEBSD
++#define KMP_OS_KFREEBSD 1
++#endif
++
+ #if (defined __NetBSD__)
+ #undef KMP_OS_NETBSD
+ #define KMP_OS_NETBSD 1
+@@ -79,12 +85,12 @@
+ 
+ #if (1 !=                                                                      \
+      KMP_OS_LINUX + KMP_OS_DRAGONFLY + KMP_OS_FREEBSD + KMP_OS_NETBSD +        \
+-         KMP_OS_OPENBSD + KMP_OS_DARWIN + KMP_OS_WINDOWS + KMP_OS_HURD)
++         KMP_OS_OPENBSD + KMP_OS_DARWIN + KMP_OS_WINDOWS + KMP_OS_HURD + KMP_OS_KFREEBSD)
+ #error Unknown OS
+ #endif
+ 
+ #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
+-        KMP_OS_OPENBSD || KMP_OS_DARWIN || KMP_OS_HURD
++        KMP_OS_OPENBSD || KMP_OS_DARWIN || KMP_OS_HURD || KMP_OS_KFREEBSD
+ #undef KMP_OS_UNIX
+ #define KMP_OS_UNIX 1
+ #endif
+Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_runtime.cpp
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/kmp_runtime.cpp
++++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_runtime.cpp
+@@ -8076,7 +8076,7 @@ __kmp_determine_reduction_method(
+ #if KMP_ARCH_X86_64 || KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64
+ 
+ #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
+-    KMP_OS_OPENBSD || KMP_OS_WINDOWS || KMP_OS_DARWIN || KMP_OS_HURD
++    KMP_OS_OPENBSD || KMP_OS_WINDOWS || KMP_OS_DARWIN || KMP_OS_HURD || KMP_OS_KFREEBSD
+ 
+     int teamsize_cutoff = 4;
+ 
+@@ -8104,7 +8104,7 @@ __kmp_determine_reduction_method(
+ 
+ #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
+ 
+-#if KMP_OS_LINUX || KMP_OS_WINDOWS || KMP_OS_HURD
++#if KMP_OS_LINUX || KMP_OS_WINDOWS || KMP_OS_HURD || KMP_OS_KFREEBSD
+ 
+     // basic tuning
+ 
+Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/z_Linux_util.cpp
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/z_Linux_util.cpp
++++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/z_Linux_util.cpp
+@@ -448,7 +448,7 @@ void __kmp_terminate_thread(int gtid) {
+ static kmp_int32 __kmp_set_stack_info(int gtid, kmp_info_t *th) {
+   int stack_data;
+ #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
+-        KMP_OS_HURD
++        KMP_OS_HURD || KMP_OS_KFREEBSD
+   pthread_attr_t attr;
+   int status;
+   size_t size = 0;
+@@ -502,7 +502,7 @@ static void *__kmp_launch_worker(void *t
+ #endif /* KMP_BLOCK_SIGNALS */
+   void *exit_val;
+ #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
+-        KMP_OS_OPENBSD || KMP_OS_HURD
++        KMP_OS_OPENBSD || KMP_OS_HURD || KMP_OS_KFREEBSD
+   void *volatile padding = 0;
+ #endif
+   int gtid;
+@@ -1772,7 +1772,7 @@ static int __kmp_get_xproc(void) {
+   int r = 0;
+ 
+ #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
+-        KMP_OS_OPENBSD || KMP_OS_HURD
++        KMP_OS_OPENBSD || KMP_OS_HURD || KMP_OS_KFREEBSD
+ 
+   r = sysconf(_SC_NPROCESSORS_ONLN);
+ 
+@@ -1967,7 +1967,7 @@ int __kmp_is_address_mapped(void *addr)
+   int found = 0;
+   int rc;
+ 
+-#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_HURD
++#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_HURD || KMP_OS_KFREEBSD
+ 
+   /* On GNUish OSes, read the /proc/<pid>/maps pseudo-file to get all the address
+      ranges mapped into the address space. */
diff --git a/debian/patches/kfreebsd/kfreebsd-threads-build.diff b/debian/patches/kfreebsd/kfreebsd-threads-build.diff
new file mode 100644
index 0000000..7ed8ed6
--- /dev/null
+++ b/debian/patches/kfreebsd/kfreebsd-threads-build.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-7-7.0.1/libcxx/src/thread.cpp
+===================================================================
+--- llvm-toolchain-7-7.0.1.orig/libcxx/src/thread.cpp
++++ llvm-toolchain-7-7.0.1/libcxx/src/thread.cpp
+@@ -19,7 +19,7 @@
+ 
+ #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+ # include <sys/param.h>
+-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
++# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) || defined(__FreeBSD_kernel__)
+ #   include <sys/sysctl.h>
+ # endif
+ #endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
diff --git a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
new file mode 100644
index 0000000..b118189
--- /dev/null
+++ b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
@@ -0,0 +1,632 @@
+Index: llvm-toolchain-8_8~+rc2/clang/lib/Driver/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/clang/lib/Driver/CMakeLists.txt
++++ llvm-toolchain-8_8~+rc2/clang/lib/Driver/CMakeLists.txt
+@@ -49,6 +49,7 @@ add_clang_library(clangDriver
+   ToolChains/HIP.cpp
+   ToolChains/Hexagon.cpp
+   ToolChains/Hurd.cpp
++  ToolChains/KFreeBSD.cpp
+   ToolChains/Linux.cpp
+   ToolChains/MipsLinux.cpp
+   ToolChains/MinGW.cpp
+Index: llvm-toolchain-8_8~+rc2/clang/lib/Driver/Driver.cpp
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/clang/lib/Driver/Driver.cpp
++++ llvm-toolchain-8_8~+rc2/clang/lib/Driver/Driver.cpp
+@@ -27,6 +27,7 @@
+ #include "ToolChains/Haiku.h"
+ #include "ToolChains/Hexagon.h"
+ #include "ToolChains/Hurd.h"
++#include "ToolChains/KFreeBSD.h"
+ #include "ToolChains/Lanai.h"
+ #include "ToolChains/Linux.h"
+ #include "ToolChains/MSP430.h"
+@@ -4546,6 +4547,9 @@ const ToolChain &Driver::getToolChain(co
+     case llvm::Triple::FreeBSD:
+       TC = llvm::make_unique<toolchains::FreeBSD>(*this, Target, Args);
+       break;
++    case llvm::Triple::kFreeBSD:
++      TC = llvm::make_unique<toolchains::kFreeBSD>(*this, Target, Args);
++      break;
+     case llvm::Triple::Minix:
+       TC = llvm::make_unique<toolchains::Minix>(*this, Target, Args);
+       break;
+Index: llvm-toolchain-8_8~+rc2/clang/lib/Driver/ToolChains/Clang.cpp
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/clang/lib/Driver/ToolChains/Clang.cpp
++++ llvm-toolchain-8_8~+rc2/clang/lib/Driver/ToolChains/Clang.cpp
+@@ -535,7 +535,7 @@ static bool useFramePointerForTargetByDe
+   }
+ 
+   if (Triple.isOSLinux() || Triple.getOS() == llvm::Triple::CloudABI ||
+-      Triple.isOSHurd()) {
++      Triple.isOSHurd() || Triple.isOSkFreeBSD()) {
+     switch (Triple.getArch()) {
+     // Don't use a frame pointer on linux if optimizing for certain targets.
+     case llvm::Triple::mips64:
+Index: llvm-toolchain-8_8~+rc2/clang/lib/Driver/ToolChains/Gnu.cpp
+===================================================================
+--- llvm-toolchain-8_8~+rc2.orig/clang/lib/Driver/ToolChains/Gnu.cpp
++++ llvm-toolchain-8_8~+rc2/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -259,6 +259,8 @@ static const char *getLDMOption(const ll
+   case llvm::Triple::x86:
+     if (T.isOSIAMCU())
+       return "elf_iamcu";
++    if (T.isOSkFreeBSD())
++      return "elf_i386_fbsd";
+     return "elf_i386";
+   case llvm::Triple::aarch64:
+     return "aarch64linux";
+@@ -303,6 +305,8 @@ static const char *getLDMOption(const ll
+   case llvm::Triple::x86_64:
+     if (T.getEnvironment() == llvm::Triple::GNUX32)
+       return "elf32_x86_64";
++    if (T.isOSkFreeBSD())
++      return "elf_x86_64_fbsd";
+     return "elf_x86_64";
+   default:
+     return nullptr;
+@@ -522,6 +526,18 @@ void tools::gnutools::Linker::ConstructJ
+         CmdArgs.push_back("--wrap=pthread_create");
+ 
+       CmdArgs.push_back("-lc");
++      if (getToolChain().getTriple().isOSkFreeBSD()) {
++	switch (getToolChain().getArch()) {
++	case llvm::Triple::x86_64:
++	  CmdArgs.push_back("-rpath-link=/lib/x86_64-kfreebsd-gnu");
++	  break;
++	case llvm::Triple::x86:
++	  CmdArgs.push_back("-rpath-link=/lib/i386-kfreebsd-gnu");
++	  break;
++	default:
++	  break;
++	}
++      }
+ 
+       // Add IAMCU specific libs, if needed.
+       if (IsIAMCU)
+@@ -1898,7 +1914,8 @@ void Generic_GCC::GCCInstallationDetecto
+       "x86_64-redhat-linux",    "x86_64-suse-linux",
+       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
+       "x86_64-slackware-linux", "x86_64-unknown-linux",
+-      "x86_64-amazon-linux",    "x86_64-linux-android"};
++      "x86_64-amazon-linux",    "x86_64-linux-android",
++      "x86_64-kfreebsd-gnu",    "x86_64-pc-kfreebsd-gnu"};
+   static const char *const X32LibDirs[] = {"/libx32"};
+   static const char *const X86LibDirs[] = {"/lib32", "/lib"};
+   static const char *const X86Triples[] = {
+@@ -1907,7 +1924,9 @@ void Generic_GCC::GCCInstallationDetecto
+       "i586-redhat-linux",    "i386-redhat-linux",     "i586-suse-linux",
+       "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
+       "i686-linux-android",   "i386-gnu",              "i486-gnu",
+-      "i586-gnu",             "i686-gnu"};
++      "i586-gnu",             "i686-gnu",
++      "i686-kfreebsd-gnu",    "i686-pc-kfreebsd-gnu",  "i486-kfreebsd-gnu",
++      "i386-kfreebsd-gnu" };
+ 
+   static const char *const MIPSLibDirs[] = {"/lib"};
+   static const char *const MIPSTriples[] = {
+Index: llvm-toolchain-8_8~+rc2/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+===================================================================
+--- /dev/null
++++ llvm-toolchain-8_8~+rc2/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+@@ -0,0 +1,459 @@
++//===--- KFreeBSD.cpp - kFreeBSD ToolChain Implementations --------*- C++ -*-===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++#include "KFreeBSD.h"
++#include "CommonArgs.h"
++#include "llvm/Support/VirtualFileSystem.h"
++#include "clang/Config/config.h"
++#include "clang/Driver/Driver.h"
++#include "clang/Driver/Options.h"
++#include "clang/Driver/SanitizerArgs.h"
++#include "llvm/Option/ArgList.h"
++#include "llvm/ProfileData/InstrProf.h"
++#include "llvm/Support/Path.h"
++
++using namespace clang::driver;
++using namespace clang::driver::toolchains;
++using namespace clang;
++using namespace llvm::opt;
++
++using tools::addPathIfExists;
++
++/// Get our best guess at the multiarch triple for a target.
++///
++/// Debian-based systems are starting to use a multiarch setup where they use
++/// a target-triple directory in the library and header search paths.
++/// Unfortunately, this triple does not align with the vanilla target triple,
++/// so we provide a rough mapping here.
++static std::string getMultiarchTriple(const Driver &D,
++                                      const llvm::Triple &TargetTriple,
++                                      StringRef SysRoot) {
++  // For most architectures, just use whatever we have rather than trying to be
++  // clever.
++  switch (TargetTriple.getArch()) {
++  default:
++    break;
++
++  // We use the existence of '/lib/<triple>' as a directory to detect
++  // some common kfreebsd triples that don't quite match the Clang
++  // triple for both 32-bit and 64-bit targets. Multiarch fixes its
++  // install triples to these regardless of what the actual target
++  // triple is.
++  case llvm::Triple::x86_64:
++    if (D.getVFS().exists(SysRoot + "/lib/x86_64-kfreebsd-gnu"))
++      return "x86_64-kfreebsd-gnu";
++    break;
++  case llvm::Triple::x86:
++    if (D.getVFS().exists(SysRoot + "/lib/i386-kfreebsd-gnu"))
++      return "i386-kfreebsd-gnu";
++    break;
++  }
++
++  return TargetTriple.str();
++}
++
++static StringRef getOSLibDir(const llvm::Triple &Triple, const ArgList &Args) {
++  // It happens that only x86 and PPC use the 'lib32' variant of oslibdir, and
++  // using that variant while targeting other architectures causes problems
++  // because the libraries are laid out in shared system roots that can't cope
++  // with a 'lib32' library search path being considered. So we only enable
++  // them when we know we may need it.
++  //
++  // FIXME: This is a bit of a hack. We should really unify this code for
++  // reasoning about oslibdir spellings with the lib dir spellings in the
++  // GCCInstallationDetector, but that is a more significant refactoring.
++
++  if (Triple.getArch() == llvm::Triple::x86)
++    return "lib";
++
++  if (Triple.getArch() == llvm::Triple::x86_64)
++    return "lib";
++
++  return Triple.isArch32Bit() ? "lib" : "lib64";
++}
++
++static void addMultilibsFilePaths(const Driver &D, const MultilibSet &Multilibs,
++                                  const Multilib &Multilib,
++                                  StringRef InstallPath,
++                                  ToolChain::path_list &Paths) {
++  if (const auto &PathsCallback = Multilibs.filePathsCallback())
++    for (const auto &Path : PathsCallback(Multilib))
++      addPathIfExists(D, InstallPath + Path, Paths);
++}
++
++kFreeBSD::kFreeBSD(const Driver &D, const llvm::Triple &Triple,
++		   const ArgList &Args)
++    : Generic_ELF(D, Triple, Args) {
++  GCCInstallation.init(Triple, Args);
++  Multilibs = GCCInstallation.getMultilibs();
++  std::string SysRoot = computeSysRoot();
++
++  // Cross-compiling binutils and GCC installations (vanilla and openSUSE at
++  // least) put various tools in a triple-prefixed directory off of the parent
++  // of the GCC installation. We use the GCC triple here to ensure that we end
++  // up with tools that support the same amount of cross compiling as the
++  // detected GCC installation. For example, if we find a GCC installation
++  // targeting x86_64, but it is a bi-arch GCC installation, it can also be
++  // used to target i386.
++  // FIXME: This seems unlikely to be Linux-, kFreeBSD- or Hurd-specific.
++  ToolChain::path_list &PPaths = getProgramPaths();
++  PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
++                         GCCInstallation.getTriple().str() + "/bin")
++                       .str());
++
++#ifdef ENABLE_LINKER_BUILD_ID
++  ExtraOpts.push_back("--build-id");
++#endif
++
++  // The selection of paths to try here is designed to match the patterns which
++  // the GCC driver itself uses, as this is part of the GCC-compatible driver.
++  // This was determined by running GCC in a fake filesystem, creating all
++  // possible permutations of these directories, and seeing which ones it added
++  // to the link paths.
++  path_list &Paths = getFilePaths();
++
++  const std::string OSLibDir = getOSLibDir(Triple, Args);
++  const std::string MultiarchTriple = getMultiarchTriple(D, Triple, SysRoot);
++
++  // Add the multilib suffixed paths where they are available.
++  if (GCCInstallation.isValid()) {
++    const llvm::Triple &GCCTriple = GCCInstallation.getTriple();
++    const std::string &LibPath = GCCInstallation.getParentLibPath();
++    const Multilib &Multilib = GCCInstallation.getMultilib();
++    const MultilibSet &Multilibs = GCCInstallation.getMultilibs();
++
++    // Add toolchain / multilib specific file paths.
++    addMultilibsFilePaths(D, Multilibs, Multilib,
++                          GCCInstallation.getInstallPath(), Paths);
++
++    // Sourcery CodeBench MIPS toolchain holds some libraries under
++    // a biarch-like suffix of the GCC installation.
++    addPathIfExists(D, GCCInstallation.getInstallPath() + Multilib.gccSuffix(),
++                    Paths);
++
++    // GCC cross compiling toolchains will install target libraries which ship
++    // as part of the toolchain under <prefix>/<triple>/<libdir> rather than as
++    // any part of the GCC installation in
++    // <prefix>/<libdir>/gcc/<triple>/<version>. This decision is somewhat
++    // debatable, but is the reality today. We need to search this tree even
++    // when we have a sysroot somewhere else. It is the responsibility of
++    // whomever is doing the cross build targeting a sysroot using a GCC
++    // installation that is *not* within the system root to ensure two things:
++    //
++    //  1) Any DSOs that are linked in from this tree or from the install path
++    //     above must be present on the system root and found via an
++    //     appropriate rpath.
++    //  2) There must not be libraries installed into
++    //     <prefix>/<triple>/<libdir> unless they should be preferred over
++    //     those within the system root.
++    //
++    // Note that this matches the GCC behavior. See the below comment for where
++    // Clang diverges from GCC's behavior.
++    addPathIfExists(D, LibPath + "/../" + GCCTriple.str() + "/lib/../" +
++                           OSLibDir + Multilib.osSuffix(),
++                    Paths);
++
++    // If the GCC installation we found is inside of the sysroot, we want to
++    // prefer libraries installed in the parent prefix of the GCC installation.
++    // It is important to *not* use these paths when the GCC installation is
++    // outside of the system root as that can pick up unintended libraries.
++    // This usually happens when there is an external cross compiler on the
++    // host system, and a more minimal sysroot available that is the target of
++    // the cross. Note that GCC does include some of these directories in some
++    // configurations but this seems somewhere between questionable and simply
++    // a bug.
++    if (StringRef(LibPath).startswith(SysRoot)) {
++      addPathIfExists(D, LibPath + "/" + MultiarchTriple, Paths);
++      addPathIfExists(D, LibPath + "/../" + OSLibDir, Paths);
++    }
++  }
++
++  // Similar to the logic for GCC above, if we currently running Clang inside
++  // of the requested system root, add its parent library paths to
++  // those searched.
++  // FIXME: It's not clear whether we should use the driver's installed
++  // directory ('Dir' below) or the ResourceDir.
++  if (StringRef(D.Dir).startswith(SysRoot)) {
++    addPathIfExists(D, D.Dir + "/../lib/" + MultiarchTriple, Paths);
++    addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
++  }
++
++  addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths);
++  addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths);
++
++  addPathIfExists(D, SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
++  addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths);
++
++  // Try walking via the GCC triple path in case of biarch or multiarch GCC
++  // installations with strange symlinks.
++  if (GCCInstallation.isValid()) {
++    addPathIfExists(D,
++                    SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
++                        "/../../" + OSLibDir,
++                    Paths);
++
++    // Add the 'other' biarch variant path
++    Multilib BiarchSibling;
++    if (GCCInstallation.getBiarchSibling(BiarchSibling)) {
++      addPathIfExists(D, GCCInstallation.getInstallPath() +
++                             BiarchSibling.gccSuffix(),
++                      Paths);
++    }
++
++    // See comments above on the multilib variant for details of why this is
++    // included even from outside the sysroot.
++    const std::string &LibPath = GCCInstallation.getParentLibPath();
++    const llvm::Triple &GCCTriple = GCCInstallation.getTriple();
++    const Multilib &Multilib = GCCInstallation.getMultilib();
++    addPathIfExists(D, LibPath + "/../" + GCCTriple.str() + "/lib" +
++                           Multilib.osSuffix(),
++                    Paths);
++
++    // See comments above on the multilib variant for details of why this is
++    // only included from within the sysroot.
++    if (StringRef(LibPath).startswith(SysRoot))
++      addPathIfExists(D, LibPath, Paths);
++  }
++
++  // Similar to the logic for GCC above, if we are currently running Clang
++  // inside of the requested system root, add its parent library path to those
++  // searched.
++  // FIXME: It's not clear whether we should use the driver's installed
++  // directory ('Dir' below) or the ResourceDir.
++  if (StringRef(D.Dir).startswith(SysRoot))
++    addPathIfExists(D, D.Dir + "/../lib", Paths);
++
++  addPathIfExists(D, SysRoot + "/lib", Paths);
++  addPathIfExists(D, SysRoot + "/usr/lib", Paths);
++}
++
++bool kFreeBSD::HasNativeLLVMSupport() const { return true; }
++
++Tool *kFreeBSD::buildLinker() const { return new tools::gnutools::Linker(*this); }
++
++Tool *kFreeBSD::buildAssembler() const {
++  return new tools::gnutools::Assembler(*this);
++}
++
++std::string kFreeBSD::computeSysRoot() const {
++  if (!getDriver().SysRoot.empty())
++    return getDriver().SysRoot;
++
++  return std::string();
++}
++
++std::string kFreeBSD::getDynamicLinker(const ArgList &Args) const {
++  const llvm::Triple::ArchType Arch = getArch();
++
++  if (Arch == llvm::Triple::x86_64)
++    return "/lib/ld-kfreebsd-x86-64.so.1";
++
++  if (Arch == llvm::Triple::x86)
++    return "/lib/ld.so.1";
++
++  llvm_unreachable("unsupported architecture");
++}
++
++void kFreeBSD::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
++                                     ArgStringList &CC1Args) const {
++  const Driver &D = getDriver();
++  std::string SysRoot = computeSysRoot();
++
++  if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc))
++    return;
++
++  if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
++    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
++
++  if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
++    SmallString<128> P(D.ResourceDir);
++    llvm::sys::path::append(P, "include");
++    addSystemInclude(DriverArgs, CC1Args, P);
++  }
++
++  if (DriverArgs.hasArg(options::OPT_nostdlibinc))
++    return;
++
++  // Check for configure-time C include directories.
++  StringRef CIncludeDirs(C_INCLUDE_DIRS);
++  if (CIncludeDirs != "") {
++    SmallVector<StringRef, 5> dirs;
++    CIncludeDirs.split(dirs, ":");
++    for (StringRef dir : dirs) {
++      StringRef Prefix =
++          llvm::sys::path::is_absolute(dir) ? StringRef(SysRoot) : "";
++      addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir);
++    }
++    // addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
++    return;
++  }
++
++  // Lacking those, try to detect the correct set of system includes for the
++  // target triple.
++
++  // Add include directories specific to the selected multilib set and multilib.
++  if (GCCInstallation.isValid()) {
++    const auto &Callback = Multilibs.includeDirsCallback();
++    if (Callback) {
++      for (const auto &Path : Callback(GCCInstallation.getMultilib()))
++        addExternCSystemIncludeIfExists(
++            DriverArgs, CC1Args, GCCInstallation.getInstallPath() + Path);
++    }
++  }
++
++  // Implement generic Debian multiarch support.
++  const StringRef X86_64MultiarchIncludeDirs[] = {
++      "/usr/include/x86_64-kfreebsd-gnu"};
++
++  // CHECK
++  const StringRef X86MultiarchIncludeDirs[] = {
++      "/usr/include/i386-kfreebsd-gnu"};
++
++  ArrayRef<StringRef> MultiarchIncludeDirs;
++  switch (getTriple().getArch()) {
++  case llvm::Triple::x86:
++    MultiarchIncludeDirs = X86MultiarchIncludeDirs;
++    break;
++  case llvm::Triple::x86_64:
++    MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
++    break;
++  default:
++    break;
++  }
++
++  for (StringRef Dir : MultiarchIncludeDirs) {
++    if (D.getVFS().exists(SysRoot + Dir)) {
++      addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + Dir);
++      break;
++    }
++  }
++
++  // Add an include of '/include' directly. This isn't provided by default by
++  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
++  // add even when Clang is acting as-if it were a system compiler.
++  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
++
++  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
++}
++
++static std::string DetectLibcxxIncludePath(StringRef base) {
++  std::error_code EC;
++  int MaxVersion = 0;
++  std::string MaxVersionString = "";
++  for (llvm::sys::fs::directory_iterator LI(base, EC), LE; !EC && LI != LE;
++       LI = LI.increment(EC)) {
++    StringRef VersionText = llvm::sys::path::filename(LI->path());
++    int Version;
++    if (VersionText[0] == 'v' &&
++        !VersionText.slice(1, StringRef::npos).getAsInteger(10, Version)) {
++      if (Version > MaxVersion) {
++        MaxVersion = Version;
++        MaxVersionString = VersionText;
++      }
++    }
++  }
++  return MaxVersion ? (base + "/" + MaxVersionString).str() : "";
++}
++
++void kFreeBSD::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
++                                 llvm::opt::ArgStringList &CC1Args) const {
++  const std::string& SysRoot = computeSysRoot();
++  const std::string LibCXXIncludePathCandidates[] = {
++      DetectLibcxxIncludePath(getDriver().ResourceDir + "/include/c++"),
++      DetectLibcxxIncludePath(getDriver().Dir + "/../include/c++"),
++      // If this is a development, non-installed, clang, libcxx will
++      // not be found at ../include/c++ but it likely to be found at
++      // one of the following two locations:
++      DetectLibcxxIncludePath(SysRoot + "/usr/local/include/c++"),
++      DetectLibcxxIncludePath(SysRoot + "/usr/include/c++") };
++  for (const auto &IncludePath : LibCXXIncludePathCandidates) {
++    if (IncludePath.empty() || !getVFS().exists(IncludePath))
++      continue;
++    // Use the first candidate that exists.
++    addSystemInclude(DriverArgs, CC1Args, IncludePath);
++    return;
++  }
++}
++
++void kFreeBSD::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
++                                    llvm::opt::ArgStringList &CC1Args) const {
++  // We need a detected GCC installation on kFreeBSD to provide libstdc++'s
++  // headers.
++  if (!GCCInstallation.isValid())
++    return;
++
++  // By default, look for the C++ headers in an include directory adjacent to
++  // the lib directory of the GCC installation. Note that this is expect to be
++  // equivalent to '/usr/include/c++/X.Y' in almost all cases.
++  StringRef LibDir = GCCInstallation.getParentLibPath();
++  StringRef InstallDir = GCCInstallation.getInstallPath();
++  StringRef TripleStr = GCCInstallation.getTriple().str();
++  const Multilib &Multilib = GCCInstallation.getMultilib();
++  const std::string GCCMultiarchTriple = getMultiarchTriple(
++      getDriver(), GCCInstallation.getTriple(), getDriver().SysRoot);
++  const std::string TargetMultiarchTriple =
++      getMultiarchTriple(getDriver(), getTriple(), getDriver().SysRoot);
++  const GCCVersion &Version = GCCInstallation.getVersion();
++
++  // The primary search for libstdc++ supports multiarch variants.
++  if (addLibStdCXXIncludePaths(LibDir.str() + "/../include",
++                               "/c++/" + Version.Text, TripleStr,
++                               GCCMultiarchTriple, TargetMultiarchTriple,
++                               Multilib.includeSuffix(), DriverArgs, CC1Args))
++    return;
++
++  // Otherwise, fall back on a bunch of options which don't use multiarch
++  // layouts for simplicity.
++  const std::string LibStdCXXIncludePathCandidates[] = {
++      // Gentoo is weird and places its headers inside the GCC install,
++      // so if the first attempt to find the headers fails, try these patterns.
++      InstallDir.str() + "/include/g++-v" + Version.Text,
++      InstallDir.str() + "/include/g++-v" + Version.MajorStr + "." +
++          Version.MinorStr,
++      InstallDir.str() + "/include/g++-v" + Version.MajorStr,
++      // Android standalone toolchain has C++ headers in yet another place.
++      LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.Text,
++      // Freescale SDK C++ headers are directly in <sysroot>/usr/include/c++,
++      // without a subdirectory corresponding to the gcc version.
++      LibDir.str() + "/../include/c++",
++  };
++
++  for (const auto &IncludePath : LibStdCXXIncludePathCandidates) {
++    if (addLibStdCXXIncludePaths(IncludePath, /*Suffix*/ "", TripleStr,
++                                 /*GCCMultiarchTriple*/ "",
++                                 /*TargetMultiarchTriple*/ "",
++                                 Multilib.includeSuffix(), DriverArgs, CC1Args))
++      break;
++  }
++}
++
++/* FIXME:
++/home/srs/DEBs/llvm-toolchain-7/llvm-toolchain-7-7.0.1~+rc2-7/clang/lib/Driver/ToolChains/KFreeBSD.cpp:431:15: error: no declaration matches ‘clang::SanitizerMask clang::driver::toolchains::kFreeBSD::getSupportedSanitizers() const’
++ SanitizerMask kFreeBSD::getSupportedSanitizers() const {
++*/
++SanitizerMask kFreeBSD::getSupportedSanitizers() const {
++  const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
++  const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
++  SanitizerMask Res = ToolChain::getSupportedSanitizers();
++  // FIXME: Add here!!
++  if (IsX86_64) {
++    Res |= SanitizerKind::DataFlow;
++    Res |= SanitizerKind::Leak;
++    Res |= SanitizerKind::Thread;
++    Res |= SanitizerKind::Efficiency;
++    Res |= SanitizerKind::Scudo;
++    Res |= SanitizerKind::HWAddress;
++    Res |= SanitizerKind::KernelHWAddress;
++  }
++  if (IsX86 || IsX86_64)
++    Res |= SanitizerKind::Function;
++
++  return Res;
++}
++
+Index: llvm-toolchain-8_8~+rc2/clang/lib/Driver/ToolChains/KFreeBSD.h
+===================================================================
+--- /dev/null
++++ llvm-toolchain-8_8~+rc2/clang/lib/Driver/ToolChains/KFreeBSD.h
+@@ -0,0 +1,54 @@
++//===--- KFreeBSD.h - kFreeBSD ToolChain Implementations ----------*- C++ -*-===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_KFreeBSD_H
++#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_KFreeBSD_H
++
++#include "Gnu.h"
++#include "clang/Driver/ToolChain.h"
++
++namespace clang {
++namespace driver {
++namespace toolchains {
++
++class LLVM_LIBRARY_VISIBILITY kFreeBSD : public Generic_ELF {
++public:
++  kFreeBSD(const Driver &D, const llvm::Triple &Triple,
++          const llvm::opt::ArgList &Args);
++
++  bool HasNativeLLVMSupport() const override;
++
++  void
++  AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
++                            llvm::opt::ArgStringList &CC1Args) const override;
++  void addLibCxxIncludePaths(
++      const llvm::opt::ArgList &DriverArgs,
++      llvm::opt::ArgStringList &CC1Args) const override;
++  void addLibStdCxxIncludePaths(
++      const llvm::opt::ArgList &DriverArgs,
++      llvm::opt::ArgStringList &CC1Args) const override;
++
++  SanitizerMask getSupportedSanitizers() const override;
++
++  virtual std::string computeSysRoot() const;
++
++  virtual std::string getDynamicLinker(const llvm::opt::ArgList &Args) const;
++
++  std::vector<std::string> ExtraOpts;
++
++protected:
++  Tool *buildAssembler() const override;
++  Tool *buildLinker() const override;
++};
++
++} // end namespace toolchains
++} // end namespace driver
++} // end namespace clang
++
++#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_KFreeBSD_H
diff --git a/debian/patches/kfreebsd/kfreebsd-triple.diff b/debian/patches/kfreebsd/kfreebsd-triple.diff
new file mode 100644
index 0000000..227fbde
--- /dev/null
+++ b/debian/patches/kfreebsd/kfreebsd-triple.diff
@@ -0,0 +1,23 @@
+Index: llvm-toolchain-7-7.0.1/unittests/ADT/TripleTest.cpp
+===================================================================
+--- llvm-toolchain-7-7.0.1.orig/unittests/ADT/TripleTest.cpp
++++ llvm-toolchain-7-7.0.1/unittests/ADT/TripleTest.cpp
+@@ -99,6 +99,18 @@ TEST(TripleTest, ParsedIDs) {
+   EXPECT_EQ(Triple::Hurd, T.getOS());
+   EXPECT_EQ(Triple::GNU, T.getEnvironment());
+ 
++  T = Triple("i386-pc-kfreebsd-gnu");
++  EXPECT_EQ(Triple::x86, T.getArch());
++  EXPECT_EQ(Triple::PC, T.getVendor());
++  EXPECT_EQ(Triple::kFreeBSD, T.getOS());
++  EXPECT_EQ(Triple::GNU, T.getEnvironment());
++
++  T = Triple("x86_64-pc-kfreebsd-gnu");
++  EXPECT_EQ(Triple::x86_64, T.getArch());
++  EXPECT_EQ(Triple::PC, T.getVendor());
++  EXPECT_EQ(Triple::kFreeBSD, T.getOS());
++  EXPECT_EQ(Triple::GNU, T.getEnvironment());
++
+   T = Triple("x86_64-pc-linux-gnu");
+   EXPECT_EQ(Triple::x86_64, T.getArch());
+   EXPECT_EQ(Triple::PC, T.getVendor());
diff --git a/debian/patches/kfreebsd/lib_Support.diff b/debian/patches/kfreebsd/lib_Support.diff
new file mode 100644
index 0000000..1f98cff
--- /dev/null
+++ b/debian/patches/kfreebsd/lib_Support.diff
@@ -0,0 +1,35 @@
+Index: llvm-toolchain-8-8~+rc1/lib/Support/Triple.cpp
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/lib/Support/Triple.cpp
++++ llvm-toolchain-8-8~+rc1/lib/Support/Triple.cpp
+@@ -182,7 +182,7 @@ StringRef Triple::getOSTypeName(OSType K
+   case FreeBSD: return "freebsd";
+   case Fuchsia: return "fuchsia";
+   case IOS: return "ios";
+-  case KFreeBSD: return "kfreebsd";
++  case kFreeBSD: return "kfreebsd";
+   case Linux: return "linux";
+   case Lv2: return "lv2";
+   case MacOSX: return "macosx";
+@@ -479,7 +479,7 @@ static Triple::OSType parseOS(StringRef
+     .StartsWith("freebsd", Triple::FreeBSD)
+     .StartsWith("fuchsia", Triple::Fuchsia)
+     .StartsWith("ios", Triple::IOS)
+-    .StartsWith("kfreebsd", Triple::KFreeBSD)
++    .StartsWith("kfreebsd", Triple::kFreeBSD)
+     .StartsWith("linux", Triple::Linux)
+     .StartsWith("lv2", Triple::Lv2)
+     .StartsWith("macos", Triple::MacOSX)
+Index: llvm-toolchain-8-8~+rc1/lib/Support/Unix/Path.inc
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-8-8~+rc1/lib/Support/Unix/Path.inc
+@@ -62,7 +62,7 @@
+ #define FSTATVFS fstatvfs
+ #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
+ #else
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <sys/mount.h>
+ #include <sys/param.h>
+ #elif defined(__linux__)
diff --git a/debian/patches/kfreebsd/lib_Target_X86.diff b/debian/patches/kfreebsd/lib_Target_X86.diff
new file mode 100644
index 0000000..94566f4
--- /dev/null
+++ b/debian/patches/kfreebsd/lib_Target_X86.diff
@@ -0,0 +1,26 @@
+Index: llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.cpp
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/lib/Target/X86/X86Subtarget.cpp
++++ llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.cpp
+@@ -284,7 +284,7 @@ void X86Subtarget::initSubtargetFeatures
+   if (StackAlignOverride)
+     stackAlignment = StackAlignOverride;
+   else if (isTargetDarwin() || isTargetLinux() || isTargetSolaris() ||
+-           isTargetKFreeBSD() || In64BitMode)
++           isTargetkFreeBSD() || In64BitMode)
+     stackAlignment = 16;
+ 
+   // Some CPUs have more overhead for gather. The specified overhead is relative
+Index: llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.h
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/lib/Target/X86/X86Subtarget.h
++++ llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.h
+@@ -731,7 +731,7 @@ public:
+   bool isTargetMachO() const { return TargetTriple.isOSBinFormatMachO(); }
+ 
+   bool isTargetLinux() const { return TargetTriple.isOSLinux(); }
+-  bool isTargetKFreeBSD() const { return TargetTriple.isOSKFreeBSD(); }
++  bool isTargetkFreeBSD() const { return TargetTriple.isOSkFreeBSD(); }
+   bool isTargetGlibc() const { return TargetTriple.isOSGlibc(); }
+   bool isTargetAndroid() const { return TargetTriple.isAndroid(); }
+   bool isTargetNaCl() const { return TargetTriple.isOSNaCl(); }
diff --git a/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff b/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
new file mode 100644
index 0000000..f84011c
--- /dev/null
+++ b/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
@@ -0,0 +1,18 @@
+Index: llvm-toolchain-8-8~+rc1/lldb/source/Host/freebsd/Host.cpp
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/lldb/source/Host/freebsd/Host.cpp
++++ llvm-toolchain-8-8~+rc1/lldb/source/Host/freebsd/Host.cpp
+@@ -11,6 +11,13 @@
+ #include <sys/types.h>
+ 
+ #include <sys/exec.h>
++#ifdef __FreeBSD_kernel__
++#  ifdef __amd64__
++#  include </usr/include/x86_64-kfreebsd-gnu/sys/kglue/sys/types.h>
++#  else
++#  include </usr/include/i386-kfreebsd-gnu/sys/kglue/sys/types.h>
++#  endif
++#endif
+ #include <sys/proc.h>
+ #include <sys/ptrace.h>
+ #include <sys/sysctl.h>
diff --git a/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff b/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
new file mode 100644
index 0000000..f519b31
--- /dev/null
+++ b/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
@@ -0,0 +1,28 @@
+Index: llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
++++ llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
+@@ -9,7 +9,9 @@
+ 
+ #include <errno.h>
+ #include <pthread.h>
++#ifndef __FreeBSD_kernel__
+ #include <pthread_np.h>
++#endif
+ #include <stdlib.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+Index: llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
++++ llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+@@ -10,7 +10,9 @@
+ 
+ #include <errno.h>
+ #include <pthread.h>
++#ifndef __FreeBSD_kernel__
+ #include <pthread_np.h>
++#endif
+ #include <stdlib.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
diff --git a/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff b/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
new file mode 100644
index 0000000..56c957f
--- /dev/null
+++ b/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
@@ -0,0 +1,12 @@
+Index: llvm-toolchain-8-8~+rc1/tools/llvm-shlib/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-8-8~+rc1.orig/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-8-8~+rc1/tools/llvm-shlib/CMakeLists.txt
+@@ -46,6 +46,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
+   list(REMOVE_DUPLICATES LIB_NAMES)
+   if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
+      OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
++     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "kFreeBSD")
+      OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU")
+      OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
+      OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
new file mode 100644
index 0000000..1b58bf8
--- /dev/null
+++ b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
@@ -0,0 +1,24 @@
+Index: llvm-toolchain-8_8~svn353935/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
++++ llvm-toolchain-8_8~svn353935/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+@@ -8,6 +8,7 @@
+ //===----------------------------------------------------------------------===//
+ //
+ // UNSUPPORTED: libcpp-has-no-threads
++// XFAIL: *
+ 
+ // FLAKY_TEST
+ 
+Index: llvm-toolchain-8_8~svn353935/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
++++ llvm-toolchain-8_8~svn353935/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+@@ -9,6 +9,7 @@
+ //
+ // UNSUPPORTED: libcpp-has-no-threads
+ // UNSUPPORTED: c++98, c++03, c++11
++// XFAIL: *
+ 
+ // <shared_mutex>
+ 
diff --git a/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff b/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff
new file mode 100644
index 0000000..3a84f1a
--- /dev/null
+++ b/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
+@@ -14,7 +14,7 @@
+ //
+ // GCC currently fails because it needs -fabi-version=6 to fix mangling of
+ // std::atomic when used with __attribute__((vector(X))).
+-// XFAIL: gcc
++// XFAIL: *
+ 
+ // <atomic>
+ 
diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
new file mode 100644
index 0000000..c272b94
--- /dev/null
+++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
@@ -0,0 +1,51 @@
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+@@ -12,6 +12,8 @@
+ // template<class RealType, size_t bits, class URNG>
+ //     RealType generate_canonical(URNG& g);
+ 
++// XFAIL: *
++
+ #include <random>
+ #include <cassert>
+ 
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/re/re.traits/isctype.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/re/re.traits/isctype.pass.cpp
+@@ -16,6 +16,7 @@
+ // TODO(EricWF): This test takes 40+ minutes to build with Clang 3.8 under ASAN or MSAN.
+ // UNSUPPORTED: asan, msan
+ 
++// XFAIL: *
+ 
+ #include <regex>
+ #include <cassert>
+Index: llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+@@ -9,6 +9,8 @@
+ 
+ // UNSUPPORTED: libcxxabi-no-exceptions
+ 
++// XFAIL: *
++
+ #include <cassert>
+ #include <cstdlib>
+ #include <iostream>
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+@@ -16,6 +16,8 @@
+ 
+ // template <class T, class... Args> void construct(T* p, Args&&... args);
+ 
++// XFAIL: *
++
+ #include <scoped_allocator>
+ #include <cassert>
+ #include <string>
diff --git a/debian/patches/libcxx/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch b/debian/patches/libcxx/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch
new file mode 100644
index 0000000..af43457
--- /dev/null
+++ b/debian/patches/libcxx/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch
@@ -0,0 +1,58 @@
+Clang 3.9 regression causes a bug when generating code for
+std::atomic_compare_and_exchange*(std::atomic<long long>,...) without
+optimizations. If same code is compiled with -O2 tests pass without problems.
+Atomics are implement in headers with builtin functions which makes this
+affect application code instead of libc++ library code.
+
+libcxx tests default to -O0 compilation so these test need to be marked failing
+on arm to allow installing packages. Use cases is so borderline failure that it
+shouldn't prevent building the package. (64bit atomics in 32bit mode)
+
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+@@ -8,6 +8,7 @@
+ //===----------------------------------------------------------------------===//
+ //
+ // UNSUPPORTED: libcpp-has-no-threads
++// XFAIL: arm
+ //  ... assertion fails line 34
+ 
+ // <atomic>
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+@@ -8,6 +8,7 @@
+ //===----------------------------------------------------------------------===//
+ //
+ // UNSUPPORTED: libcpp-has-no-threads
++// XFAIL: arm
+ //  ... assertion fails line 38
+ 
+ // <atomic>
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+@@ -8,6 +8,7 @@
+ //===----------------------------------------------------------------------===//
+ //
+ // UNSUPPORTED: libcpp-has-no-threads
++// XFAIL: arm
+ //  ... assertion fails line 34
+ 
+ // <atomic>
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+@@ -8,6 +8,7 @@
+ //===----------------------------------------------------------------------===//
+ //
+ // UNSUPPORTED: libcpp-has-no-threads
++// XFAIL: arm
+ //  ... assertion fails line 38
+ 
+ // <atomic>
diff --git a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
new file mode 100644
index 0000000..631b554
--- /dev/null
+++ b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
@@ -0,0 +1,31 @@
+Lock is_always_lock free test fails on i386 because std::atomic is aligned
+to 8 bytes while long long is aligned to 4 bytes. clang can't generate inline
+code for unaligned 8 byte atomics even tough instruction set and gcc support
+it.
+
+That makes it expected thaqt ATOMIC_LLONG_LOCK_FREE and
+std::atomic<long long>::is_always_lock_free don't match on i386. Correct test
+for std::atomic<long long> is to check if target cpu support cmpxchg8 instruction.
+To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 define.
+
+Bug: https://llvm.org/bugs/show_bug.cgi?id=19355
+
+Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+@@ -20,6 +20,14 @@
+ # error Feature test macro missing.
+ #endif
+ 
++#if defined(__i386__) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
++/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorecctly for x86
++ * https://llvm.org/bugs/show_bug.cgi?id=19355
++ */
++#undef ATOMIC_LLONG_LOCK_FREE
++#define ATOMIC_LLONG_LOCK_FREE 2
++#endif
++
+ template <typename T> void checkAlwaysLockFree() {
+   if (std::atomic<T>::is_always_lock_free)
+     assert(std::atomic<T>().is_lock_free());
diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
new file mode 100644
index 0000000..7649324
--- /dev/null
+++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
@@ -0,0 +1,118 @@
+Fix arm EHABI code to work. armhf had exception test failing without EHABI support.
+
+No known upstream bug about this. Actual code change is more like workaround than
+something that upstream would accept. Proper fix would be adding _Unwind_Control_Block
+to clang unwind.h. _Unwind_Control_Block should also extend _Unwind_Exception to make
+sure their ABI stays in sync.
+
+No known upstream bug about this.
+
+Index: llvm-toolchain-8_8~svn353935/libcxxabi/src/cxa_exception.cpp
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/libcxxabi/src/cxa_exception.cpp
++++ llvm-toolchain-8_8~svn353935/libcxxabi/src/cxa_exception.cpp
+@@ -277,15 +277,16 @@ __cxa_throw(void *thrown_object, std::ty
+ 
+ #ifdef __USING_SJLJ_EXCEPTIONS__
+     _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
+-#else
++#elif !LIBCXXABI_ARM_EHABI
+     _Unwind_RaiseException(&exception_header->unwindHeader);
++#else
++    _Unwind_RaiseException(exception_header->unwindHeader);
+ #endif
+     //  This only happens when there is no handler, or some unexpected unwinding
+     //     error happens.
+     failed_throw(exception_header);
+ }
+ 
+-
+ // 2.5.3 Exception Handlers
+ /*
+ The adjusted pointer is computed by the personality routine during phase 1
+@@ -548,7 +549,11 @@ void __cxa_end_catch() {
+             //    to touch a foreign exception in any way, that is undefined
+             //     behavior.  They likely can't since the only way to catch
+             //     a foreign exception is with catch (...)!
++#if !LIBCXXABI_ARM_EHABI
+             _Unwind_DeleteException(&globals->caughtExceptions->unwindHeader);
++#else
++            _Unwind_DeleteException(globals->caughtExceptions->unwindHeader);
++#endif
+             globals->caughtExceptions = 0;
+         }
+     }
+@@ -605,8 +610,10 @@ void __cxa_rethrow() {
+     }
+ #ifdef __USING_SJLJ_EXCEPTIONS__
+     _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
+-#else
++#elif !LIBCXXABI_ARM_EHABI
+     _Unwind_RaiseException(&exception_header->unwindHeader);
++#else
++    _Unwind_RaiseException(exception_header->unwindHeader);
+ #endif
+ 
+     //  If we get here, some kind of unwinding error has occurred.
+@@ -730,8 +737,10 @@ __cxa_rethrow_primary_exception(void* th
+         dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup;
+ #ifdef __USING_SJLJ_EXCEPTIONS__
+         _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader);
++#elif !LIBCXXABI_ARM_EHABI
++	_Unwind_RaiseException(&dep_exception_header->unwindHeader);
+ #else
+-        _Unwind_RaiseException(&dep_exception_header->unwindHeader);
++	_Unwind_RaiseException(dep_exception_header->unwindHeader);
+ #endif
+         // Some sort of unwinding error.  Note that terminate is a handler.
+         __cxa_begin_catch(&dep_exception_header->unwindHeader);
+Index: llvm-toolchain-8_8~svn353935/libcxxabi/src/cxa_exception.hpp
+===================================================================
+--- llvm-toolchain-8_8~svn353935.orig/libcxxabi/src/cxa_exception.hpp
++++ llvm-toolchain-8_8~svn353935/libcxxabi/src/cxa_exception.hpp
+@@ -28,6 +28,45 @@ uint64_t __getExceptionClass  (const _Un
+ void     __setExceptionClass  (      _Unwind_Exception*, uint64_t);
+ bool     __isOurExceptionClass(const _Unwind_Exception*);
+ 
++#if LIBCXXABI_ARM_EHABI
++// GCC has _Unwind_Control_Block in unwind.h (unwind_arm_common.h)
++#if defined(__clang__)
++struct _Unwind_Control_Block
++{
++	uint64_t exception_class;
++	void (*exception_cleanup)(_Unwind_Reason_Code, _Unwind_Control_Block *);
++	struct {
++		_Unwind_Word reserved1;
++		_Unwind_Word reserved2;
++		_Unwind_Word reserved3;
++		_Unwind_Word reserved4;
++		_Unwind_Word reserved5;
++	} unwinder_cache;
++	struct {
++		_Unwind_Word sp;
++		_Unwind_Word bitpattern[5];
++	} barrier_cache;
++	struct {
++		_Unwind_Word bitpattern[4];
++	} cleanup_cache;
++	struct {
++		_Unwind_Word fnstart;
++		_Unwind_Word *ehtp;
++		_Unwind_Word additional;
++		_Unwind_Word reserved1;
++	} pr_cache;
++	long long int :0;
++	operator _Unwind_Exception*() noexcept
++	{
++		return reinterpret_cast<_Unwind_Exception*>(this);
++	}
++};
++
++#endif
++
++#define _Unwind_Exception _Unwind_Control_Block
++#endif
++
+ struct _LIBCXXABI_HIDDEN __cxa_exception {
+ #if defined(__LP64__) || defined(_LIBCXXABI_ARM_EHABI)
+     // This is a new field to support C++ 0x exception_ptr.
diff --git a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
new file mode 100644
index 0000000..1b5b723
--- /dev/null
+++ b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
@@ -0,0 +1,17 @@
+Powerpc has extended double that doesn't match x86 coding. Power format would
+need special tests to verify correctness but for now it is enough to prevent
+incorrect test from running.
+
+Index: llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/test_demangle.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_7~svn337372.orig/libcxxabi/test/test_demangle.pass.cpp
++++ llvm-toolchain-snapshot_7~svn337372svn337372/libcxxabi/test/test_demangle.pass.cpp
+@@ -29648,7 +29648,7 @@ const char* invalid_cases[] =
+     "NSoERj5E=Y1[uM:ga",
+     "Aon_PmKVPDk7?fg4XP5smMUL6;<WsI_mgbf23cCgsHbT<l8EE\0uVRkNOoXDrgdA4[8IU>Vl<>IL8ayHpiVDDDXTY;^o9;i",
+     "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_",
+-#if !LDBL_FP80
++#if !LDBL_FP80 && __LDBL_MANT_DIG__ < 64
+     "_ZN5test01hIfEEvRAcvjplstT_Le4001a000000000000000E_c",
+ #endif
+ 	// The following test cases were found by libFuzzer+ASAN
diff --git a/debian/patches/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxxabi-arm-ehabi-fix.patch
new file mode 100644
index 0000000..6574717
--- /dev/null
+++ b/debian/patches/libcxxabi-arm-ehabi-fix.patch
@@ -0,0 +1,118 @@
+Fix arm EHABI code to work. armhf had exception test failing without EHABI support.
+
+No known upstream bug about this. Actual code change is more like workaround than
+something that upstream would accept. Proper fix would be adding _Unwind_Control_Block
+to clang unwind.h. _Unwind_Control_Block should also extend _Unwind_Exception to make
+sure their ABI stays in sync.
+
+No known upstream bug about this.
+
+Index: llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn344157.orig/libcxxabi/src/cxa_exception.cpp
++++ llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.cpp
+@@ -277,15 +277,16 @@ __cxa_throw(void *thrown_object, std::ty
+ 
+ #ifdef __USING_SJLJ_EXCEPTIONS__
+     _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
+-#else
++#elif !LIBCXXABI_ARM_EHABI
+     _Unwind_RaiseException(&exception_header->unwindHeader);
++#else
++    _Unwind_RaiseException(exception_header->unwindHeader);
+ #endif
+     //  This only happens when there is no handler, or some unexpected unwinding
+     //     error happens.
+     failed_throw(exception_header);
+ }
+ 
+-
+ // 2.5.3 Exception Handlers
+ /*
+ The adjusted pointer is computed by the personality routine during phase 1
+@@ -548,7 +549,11 @@ void __cxa_end_catch() {
+             //    to touch a foreign exception in any way, that is undefined
+             //     behavior.  They likely can't since the only way to catch
+             //     a foreign exception is with catch (...)!
++#if !LIBCXXABI_ARM_EHABI
+             _Unwind_DeleteException(&globals->caughtExceptions->unwindHeader);
++#else
++            _Unwind_DeleteException(globals->caughtExceptions->unwindHeader);
++#endif
+             globals->caughtExceptions = 0;
+         }
+     }
+@@ -605,8 +610,10 @@ void __cxa_rethrow() {
+     }
+ #ifdef __USING_SJLJ_EXCEPTIONS__
+     _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
+-#else
++#elif !LIBCXXABI_ARM_EHABI
+     _Unwind_RaiseException(&exception_header->unwindHeader);
++#else
++    _Unwind_RaiseException(exception_header->unwindHeader);
+ #endif
+ 
+     //  If we get here, some kind of unwinding error has occurred.
+@@ -730,8 +737,10 @@ __cxa_rethrow_primary_exception(void* th
+         dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup;
+ #ifdef __USING_SJLJ_EXCEPTIONS__
+         _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader);
++#elif !LIBCXXABI_ARM_EHABI
++	_Unwind_RaiseException(&dep_exception_header->unwindHeader);
+ #else
+-        _Unwind_RaiseException(&dep_exception_header->unwindHeader);
++	_Unwind_RaiseException(dep_exception_header->unwindHeader);
+ #endif
+         // Some sort of unwinding error.  Note that terminate is a handler.
+         __cxa_begin_catch(&dep_exception_header->unwindHeader);
+Index: llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.hpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn344157.orig/libcxxabi/src/cxa_exception.hpp
++++ llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.hpp
+@@ -28,6 +28,45 @@ uint64_t __getExceptionClass  (const _Un
+ void     __setExceptionClass  (      _Unwind_Exception*, uint64_t);
+ bool     __isOurExceptionClass(const _Unwind_Exception*);
+ 
++#if LIBCXXABI_ARM_EHABI
++// GCC has _Unwind_Control_Block in unwind.h (unwind_arm_common.h)
++#if defined(__clang__)
++struct _Unwind_Control_Block
++{
++	uint64_t exception_class;
++	void (*exception_cleanup)(_Unwind_Reason_Code, _Unwind_Control_Block *);
++	struct {
++		_Unwind_Word reserved1;
++		_Unwind_Word reserved2;
++		_Unwind_Word reserved3;
++		_Unwind_Word reserved4;
++		_Unwind_Word reserved5;
++	} unwinder_cache;
++	struct {
++		_Unwind_Word sp;
++		_Unwind_Word bitpattern[5];
++	} barrier_cache;
++	struct {
++		_Unwind_Word bitpattern[4];
++	} cleanup_cache;
++	struct {
++		_Unwind_Word fnstart;
++		_Unwind_Word *ehtp;
++		_Unwind_Word additional;
++		_Unwind_Word reserved1;
++	} pr_cache;
++	long long int :0;
++	operator _Unwind_Exception*() noexcept
++	{
++		return reinterpret_cast<_Unwind_Exception*>(this);
++	}
++};
++
++#endif
++
++#define _Unwind_Exception _Unwind_Control_Block
++#endif
++
+ struct _LIBCXXABI_HIDDEN __cxa_exception {
+ #if defined(__LP64__) || defined(_LIBCXXABI_ARM_EHABI)
+     // This is a new field to support C++ 0x exception_ptr.
diff --git a/debian/patches/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxxabi-test-don-t-fail-extended-long-double.patch
new file mode 100644
index 0000000..48536c5
--- /dev/null
+++ b/debian/patches/libcxxabi-test-don-t-fail-extended-long-double.patch
@@ -0,0 +1,17 @@
+Powerpc has extended double that doesn't match x86 coding. Power format would
+need special tests to verify correctness but for now it is enough to prevent
+incorrect test from running.
+
+Index: llvm-toolchain-snapshot_8~svn342269/libcxxabi/test/test_demangle.pass.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/libcxxabi/test/test_demangle.pass.cpp
++++ llvm-toolchain-snapshot_8~svn342269/libcxxabi/test/test_demangle.pass.cpp
+@@ -29797,7 +29797,7 @@ const char* invalid_cases[] =
+     "NSoERj5E=Y1[uM:ga",
+     "Aon_PmKVPDk7?fg4XP5smMUL6;<WsI_mgbf23cCgsHbT<l8EE\0uVRkNOoXDrgdA4[8IU>Vl<>IL8ayHpiVDDDXTY;^o9;i",
+     "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_",
+-#if !LDBL_FP80
++#if !LDBL_FP80 && __LDBL_MANT_DIG__ < 64
+     "_ZN5test01hIfEEvRAcvjplstT_Le4001a000000000000000E_c",
+ #endif
+ 	// The following test cases were found by libFuzzer+ASAN
diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff
new file mode 100644
index 0000000..5621ce3
--- /dev/null
+++ b/debian/patches/lldb-libname.diff
@@ -0,0 +1,17 @@
+---
+ lldb/scripts/Python/finishSwigPythonLLDB.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
+===================================================================
+--- llvm-toolchain-snapshot_8~svn339515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
++++ llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
+@@ -443,7 +443,7 @@ def make_symlink_liblldb(
+             if eOSType == utilsOsType.EnumOsType.Darwin:
+                 strLibFileExtn = ".dylib"
+             else:
+-                strLibFileExtn = ".so"
++                strLibFileExtn = "-8.so"
+             strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
+ 
+     bOk, strErrMsg = make_symlink(
diff --git a/debian/patches/lldb-soname.diff b/debian/patches/lldb-soname.diff
new file mode 100644
index 0000000..059f733
--- /dev/null
+++ b/debian/patches/lldb-soname.diff
@@ -0,0 +1,43 @@
+---
+ lldb/source/API/CMakeLists.txt |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+Index: llvm-toolchain-snapshot_8~svn350421/lldb/source/API/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn350421.orig/lldb/source/API/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn350421/lldb/source/API/CMakeLists.txt
+@@ -9,7 +9,12 @@ if(NOT LLDB_DISABLE_PYTHON)
+   set(lldb_python_wrapper ${lldb_scripts_dir}/LLDBWrapPython.cpp)
+ endif()
+ 
+-add_lldb_library(liblldb SHARED
++set(output_name lldb)
++if (CMAKE_SYSTEM_NAME MATCHES "Windows")
++  set(output_name liblldb)
++endif()
++
++add_lldb_library(liblldb SHARED OUTPUT_NAME ${output_name} SONAME
+   SBAddress.cpp
+   SBAttachInfo.cpp
+   SBBlock.cpp
+@@ -120,7 +125,7 @@ endif()
+ 
+ set_target_properties(liblldb
+   PROPERTIES
+-  VERSION ${LLDB_VERSION}
++  VERSION 1
+ )
+ 
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
+@@ -144,11 +149,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
+   if (MSVC AND NOT LLDB_DISABLE_PYTHON)
+     target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
+   endif()
+-else()
+-  set_target_properties(liblldb
+-    PROPERTIES
+-    OUTPUT_NAME lldb
+-  )
+ endif()
+ 
+ if(LLDB_BUILD_FRAMEWORK)
diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
new file mode 100644
index 0000000..598deb5
--- /dev/null
+++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
@@ -0,0 +1,34 @@
+lldb-server exec users always /usr/bin/lldb-server. Server is required
+for any debugging with lldb which makes it unusable unless default version
+package has been installed. Small changes to code and debian/rules allows
+a workaround for lldb-server start up.
+
+To use this one needs to add cmake definition during configure. eg
+-DDEBIAN_VERSION_SUFFIX=-$(LLVM_VERSION)
+
+Better implementation would be to use /usr/share/llvm-$(VERSION)/bin but 
+that change seems to require a big change to the path handling code
+which could then break something else.
+
+This probably should have upstream bug but I couldn't find any existing report.
+
+Index: llvm-toolchain-snapshot_8~svn349668/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349668.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
++++ llvm-toolchain-snapshot_8~svn349668/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+@@ -33,13 +33,14 @@
+ #include "lldb/Utility/StreamString.h"
+ #include "llvm/ADT/SmallString.h"
+ #include "llvm/Support/ScopedPrinter.h"
++#include "llvm/Config/llvm-config.h"
+ 
+ #include "ProcessGDBRemoteLog.h"
+ 
+ #if defined(__APPLE__)
+ #define DEBUGSERVER_BASENAME "debugserver"
+ #else
+-#define DEBUGSERVER_BASENAME "lldb-server"
++# define DEBUGSERVER_BASENAME    "lldb-server-" LLVM_VERSION_STRING
+ #endif
+ 
+ #if defined(__APPLE__)
diff --git a/debian/patches/lldb/lldb-disable-swig-error.diff b/debian/patches/lldb/lldb-disable-swig-error.diff
new file mode 100644
index 0000000..a715805
--- /dev/null
+++ b/debian/patches/lldb/lldb-disable-swig-error.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_5.0~svn306792/lldb/scripts/lldb.swig
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn306792.orig/lldb/scripts/lldb.swig
++++ llvm-toolchain-snapshot_5.0~svn306792/lldb/scripts/lldb.swig
+@@ -50,7 +50,7 @@ except ImportError:
+ %enddef
+ // These versions will not generate working python modules, so error out early.
+ #if SWIG_VERSION >= 0x030009 && SWIG_VERSION < 0x030011
+-#error Swig versions 3.0.9 and 3.0.10 are incompatible with lldb.
++#warning Swig versions 3.0.9 and 3.0.10 are incompatible with lldb.
+ #endif
+ 
+ // The name of the module to be created.
diff --git a/debian/patches/lldb/lldb-link-atomic-cmake.patch b/debian/patches/lldb/lldb-link-atomic-cmake.patch
new file mode 100644
index 0000000..f4f2cab
--- /dev/null
+++ b/debian/patches/lldb/lldb-link-atomic-cmake.patch
@@ -0,0 +1,27 @@
+Description: Link with -latomic when mips* processor is detected
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2016-07-27
+
+---
+ lldb/cmake/LLDBDependencies.cmake |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: llvm-toolchain-snapshot_8~svn349138/lldb/source/Utility/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/lldb/source/Utility/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn349138/lldb/source/Utility/CMakeLists.txt
+@@ -32,6 +32,14 @@ endif()
+ 
+ list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
+ 
++if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mipsel" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64el" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "powerpcspe")
++  list(APPEND LLDB_SYSTEM_LIBS atomic)
++endif()
++
++
+ if (LLVM_BUILD_STATIC)
+   if (NOT LLDB_DISABLE_PYTHON)
+     list(APPEND LLDB_SYSTEM_LIBS python2.7 util)
diff --git a/debian/patches/lldb/lldb-missing-install.diff b/debian/patches/lldb/lldb-missing-install.diff
new file mode 100644
index 0000000..a9541a6
--- /dev/null
+++ b/debian/patches/lldb/lldb-missing-install.diff
@@ -0,0 +1,24 @@
+Index: llvm-toolchain-snapshot_8~svn342269/lldb/tools/argdumper/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/lldb/tools/argdumper/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn342269/lldb/tools/argdumper/CMakeLists.txt
+@@ -4,3 +4,7 @@ add_lldb_tool(lldb-argdumper INCLUDE_IN_
+   LINK_LIBS
+     lldbUtility
+   )
++
++install(TARGETS lldb-argdumper
++  RUNTIME DESTINATION bin)
++
+Index: llvm-toolchain-snapshot_8~svn342269/lldb/tools/lldb-server/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/lldb/tools/lldb-server/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn342269/lldb/tools/lldb-server/CMakeLists.txt
+@@ -64,3 +64,7 @@ add_lldb_tool(lldb-server INCLUDE_IN_SUI
+ )
+ 
+ target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})
++
++install(TARGETS lldb-server
++  RUNTIME DESTINATION bin)
++
diff --git a/debian/patches/mips-fpxx-enable.diff b/debian/patches/mips-fpxx-enable.diff
new file mode 100644
index 0000000..442b4d1
--- /dev/null
+++ b/debian/patches/mips-fpxx-enable.diff
@@ -0,0 +1,17 @@
+Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
++++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+@@ -457,10 +457,10 @@ bool mips::isFP64ADefault(const llvm::Tr
+ 
+ bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
+                          StringRef ABIName, mips::FloatABI FloatABI) {
+-  if (Triple.getVendor() != llvm::Triple::ImaginationTechnologies &&
++/*  if (Triple.getVendor() != llvm::Triple::ImaginationTechnologies &&
+       Triple.getVendor() != llvm::Triple::MipsTechnologies &&
+       !Triple.isAndroid())
+-    return false;
++    return false;*/
+ 
+   if (ABIName != "32")
+     return false;
diff --git a/debian/patches/mips64el-fix.diff b/debian/patches/mips64el-fix.diff
new file mode 100644
index 0000000..fec1bda
--- /dev/null
+++ b/debian/patches/mips64el-fix.diff
@@ -0,0 +1,26 @@
+Index: llvm-toolchain-8-8~+rc5/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
+===================================================================
+--- llvm-toolchain-8-8~+rc5.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
++++ llvm-toolchain-8-8~+rc5/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
+@@ -29,7 +29,7 @@
+ // are not defined anywhere in userspace headers. Fake them. This seems to work
+ // fine with newer headers, too.
+ #include <linux/posix_types.h>
+-#if defined(__x86_64__) ||  defined(__mips__)
++#if defined(__x86_64__)
+ #include <sys/stat.h>
+ #else
+ #define ino_t __kernel_ino_t
+Index: llvm-toolchain-8-8~+rc5/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+===================================================================
+--- llvm-toolchain-8-8~+rc5.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ llvm-toolchain-8-8~+rc5/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -84,7 +84,7 @@ namespace __sanitizer {
+ #elif defined(__mips__)
+   const unsigned struct_kernel_stat_sz =
+                  SANITIZER_ANDROID ? FIRST_32_SECOND_64(104, 128) :
+-                                     FIRST_32_SECOND_64(160, 216);
++                                     FIRST_32_SECOND_64(144, 104);
+   const unsigned struct_kernel_stat64_sz = 104;
+ #elif defined(__s390__) && !defined(__s390x__)
+   const unsigned struct_kernel_stat_sz = 64;
diff --git a/debian/patches/openmp-soname.diff b/debian/patches/openmp-soname.diff
new file mode 100644
index 0000000..ed6bbdc
--- /dev/null
+++ b/debian/patches/openmp-soname.diff
@@ -0,0 +1,14 @@
+Index: llvm-toolchain-snapshot_8~svn342269/openmp/runtime/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn342269/openmp/runtime/CMakeLists.txt
+@@ -355,7 +355,8 @@ else()
+   set(LIBOMP_INSTALL_KIND ARCHIVE)
+ endif()
+ 
+-set(LIBOMP_LIB_FILE ${LIBOMP_LIB_NAME}${LIBOMP_LIBRARY_SUFFIX})
++set(LIBOMP_LIB_FILE ${LIBOMP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBOMP_VERSION_MAJOR})
++
+ 
+ # Optional backwards compatibility aliases.
+ set(LIBOMP_INSTALL_ALIASES TRUE CACHE BOOL
diff --git a/debian/patches/openmp/bootstrap-with-openmp-version-export-missing.diff b/debian/patches/openmp/bootstrap-with-openmp-version-export-missing.diff
new file mode 100644
index 0000000..f503df2
--- /dev/null
+++ b/debian/patches/openmp/bootstrap-with-openmp-version-export-missing.diff
@@ -0,0 +1,14 @@
+Index: llvm-toolchain-7-7/openmp/runtime/src/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-7-7.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-7-7/openmp/runtime/src/CMakeLists.txt
+@@ -174,7 +174,8 @@ endif()
+ 
+ # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
+ libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS)
+-target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${CMAKE_DL_LIBS})
++target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${CMAKE_DL_LIBS}
++  "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports_so.txt")
+ 
+ # Create *.inc before compiling any sources
+ # objects depend on : .inc files
diff --git a/debian/patches/openmp/openmp-check-execstack.diff b/debian/patches/openmp/openmp-check-execstack.diff
new file mode 100644
index 0000000..5bfbc2c
--- /dev/null
+++ b/debian/patches/openmp/openmp-check-execstack.diff
@@ -0,0 +1,14 @@
+Index: llvm-toolchain-snapshot_7~svn335949/openmp/runtime/tools/check-execstack.pl
+===================================================================
+--- llvm-toolchain-snapshot_7~svn335949.orig/openmp/runtime/tools/check-execstack.pl
++++ llvm-toolchain-snapshot_7~svn335949/openmp/runtime/tools/check-execstack.pl
+@@ -46,7 +46,8 @@ sub execstack($) {
+     #    GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4
+     # Linux* OS Intel(R) 64:
+     #    GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RWE 0x8
+-    if ( $stack[ 0 ] !~ m{\A\s*(?:GNU_)?STACK(?:\s+0x[0-9a-f]+){5}\s+([R ][W ][E ])\s+0x[0-9a-f]+\s*\z} ) {
++#    if ( $stack[ 0 ] !~ m{\A\s*(?:GNU_)?STACK(?:\s+0x[0-9a-f]+){5}\s+([R ][W ][E ])\s+0x[0-9a-f]+\s*\z} ) {
++    if ( $stack[ 0 ] !~ m{\A\s*(?:GNU_)?STACK(?:\s+0x[0-9a-f]+){5}\s+([R ][W ][E ])\s+0(?:x[0-9a-f]+)*\s*\z} ) {
+         runtime_error( "$file: Cannot parse stack segment line:", ">>> $stack[ 0 ]" );
+     }; # if
+     my $attrs = $1;
diff --git a/debian/patches/openmp/openmp-mips-affinity.patch b/debian/patches/openmp/openmp-mips-affinity.patch
new file mode 100644
index 0000000..7f3eb13
--- /dev/null
+++ b/debian/patches/openmp/openmp-mips-affinity.patch
@@ -0,0 +1,56 @@
+Index: llvm-toolchain-snapshot_8~svn342269/openmp/runtime/src/kmp_affinity.h
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/openmp/runtime/src/kmp_affinity.h
++++ llvm-toolchain-snapshot_8~svn342269/openmp/runtime/src/kmp_affinity.h
+@@ -211,28 +211,29 @@ public:
+ #elif __NR_sched_getaffinity != 223
+ #error Wrong code for getaffinity system call.
+ #endif /* __NR_sched_getaffinity */
+-#elif KMP_ARCH_MIPS
+-#ifndef __NR_sched_setaffinity
+-#define __NR_sched_setaffinity 4239
+-#elif __NR_sched_setaffinity != 4239
+-#error Wrong code for setaffinity system call.
+-#endif /* __NR_sched_setaffinity */
+-#ifndef __NR_sched_getaffinity
+-#define __NR_sched_getaffinity 4240
+-#elif __NR_sched_getaffinity != 4240
+-#error Wrong code for getaffinity system call.
+-#endif /* __NR_sched_getaffinity */
+-#elif KMP_ARCH_MIPS64
+-#ifndef __NR_sched_setaffinity
+-#define __NR_sched_setaffinity 5195
+-#elif __NR_sched_setaffinity != 5195
+-#error Wrong code for setaffinity system call.
+-#endif /* __NR_sched_setaffinity */
+-#ifndef __NR_sched_getaffinity
+-#define __NR_sched_getaffinity 5196
+-#elif __NR_sched_getaffinity != 5196
+-#error Wrong code for getaffinity system call.
+-#endif /* __NR_sched_getaffinity */
++# elif KMP_ARCH_MIPS
++#  ifndef __NR_sched_setaffinity
++#   define __NR_sched_setaffinity  4239
++#  elif __NR_sched_setaffinity != 4239
++#   error Wrong code for setaffinity system call.
++#  endif /* __NR_sched_setaffinity */
++#  ifndef __NR_sched_getaffinity
++#   define __NR_sched_getaffinity  4240
++#  elif __NR_sched_getaffinity != 4240
++#   error Wrong code for getaffinity system call.
++#  endif /* __NR_sched_getaffinity */
++# elif KMP_ARCH_MIPS64
++#  ifndef __NR_sched_setaffinity
++#   define __NR_sched_setaffinity  5195
++#  elif __NR_sched_setaffinity != 5195
++#   error Wrong code for setaffinity system call.
++#  endif /* __NR_sched_setaffinity */
++#  ifndef __NR_sched_getaffinity
++#   define __NR_sched_getaffinity  5196
++#  elif __NR_sched_getaffinity != 5196
++#   error Wrong code for getaffinity system call.
++#  endif /* __NR_sched_getaffinity */
++# else
+ #error Unknown or unsupported architecture
+ #endif /* KMP_ARCH_* */
+ class KMPNativeAffinity : public KMPAffinity {
diff --git a/debian/patches/powerpcspe/D49754-powerpcspe-clang.diff b/debian/patches/powerpcspe/D49754-powerpcspe-clang.diff
new file mode 100644
index 0000000..13ba9f6
--- /dev/null
+++ b/debian/patches/powerpcspe/D49754-powerpcspe-clang.diff
@@ -0,0 +1,148 @@
+Description: Add -m(no-)spe, and e500 CPU definitions and support to clang
+Author: Justin Hibbits <jrh29@alumni.cwru.edu>
+Origin: https://reviews.llvm.org/D49754
+Last-Update: 2018-12-04
+
+Index: llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Driver/Options.td
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/include/clang/Driver/Options.td
++++ llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Driver/Options.td
+@@ -2142,6 +2142,8 @@ def faltivec : Flag<["-"], "faltivec">,
+ def fno_altivec : Flag<["-"], "fno-altivec">, Group<f_Group>, Flags<[DriverOption]>;
+ def maltivec : Flag<["-"], "maltivec">, Group<m_ppc_Features_Group>;
+ def mno_altivec : Flag<["-"], "mno-altivec">, Group<m_ppc_Features_Group>;
++def mspe : Flag<["-"], "mspe">, Group<m_ppc_Features_Group>;
++def mno_spe : Flag<["-"], "mno-spe">, Group<m_ppc_Features_Group>;
+ def mvsx : Flag<["-"], "mvsx">, Group<m_ppc_Features_Group>;
+ def mno_vsx : Flag<["-"], "mno-vsx">, Group<m_ppc_Features_Group>;
+ def msecure_plt : Flag<["-"], "msecure-plt">, Group<m_ppc_Features_Group>;
+Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Basic/Targets/PPC.cpp
++++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.cpp
+@@ -54,6 +54,8 @@ bool PPCTargetInfo::handleTargetFeatures
+       HasFloat128 = true;
+     } else if (Feature == "+power9-vector") {
+       HasP9Vector = true;
++    } else if (Feature == "+spe") {
++      HasSPE = true;
+     }
+     // TODO: Finish this list and add an assert that we've handled them
+     // all.
+@@ -161,6 +163,8 @@ void PPCTargetInfo::getTargetDefines(con
+     Builder.defineMacro("__VEC__", "10206");
+     Builder.defineMacro("__ALTIVEC__");
+   }
++  if (HasSPE)
++    Builder.defineMacro("__SPE__");
+   if (HasVSX)
+     Builder.defineMacro("__VSX__");
+   if (HasP8Vector)
+@@ -334,6 +338,7 @@ bool PPCTargetInfo::hasFeature(StringRef
+       .Case("extdiv", HasExtDiv)
+       .Case("float128", HasFloat128)
+       .Case("power9-vector", HasP9Vector)
++      .Case("spe", HasSPE)
+       .Default(false);
+ }
+ 
+@@ -443,16 +448,16 @@ ArrayRef<TargetInfo::AddlRegName> PPCTar
+ }
+ 
+ static constexpr llvm::StringLiteral ValidCPUNames[] = {
+-    {"generic"}, {"440"},         {"450"},     {"601"},    {"602"},
+-    {"603"},     {"603e"},        {"603ev"},   {"604"},    {"604e"},
+-    {"620"},     {"630"},         {"g3"},      {"7400"},   {"g4"},
+-    {"7450"},    {"g4+"},         {"750"},     {"970"},    {"g5"},
+-    {"a2"},      {"a2q"},         {"e500mc"},  {"e5500"},  {"power3"},
+-    {"pwr3"},    {"power4"},      {"pwr4"},    {"power5"}, {"pwr5"},
+-    {"power5x"}, {"pwr5x"},       {"power6"},  {"pwr6"},   {"power6x"},
+-    {"pwr6x"},   {"power7"},      {"pwr7"},    {"power8"}, {"pwr8"},
+-    {"power9"},  {"pwr9"},        {"powerpc"}, {"ppc"},    {"powerpc64"},
+-    {"ppc64"},   {"powerpc64le"}, {"ppc64le"},
++    {"generic"},   {"440"},       {"450"},         {"601"},     {"602"},
++    {"603"},       {"603e"},      {"603ev"},       {"604"},     {"604e"},
++    {"620"},       {"630"},       {"g3"},          {"7400"},    {"g4"},
++    {"7450"},      {"g4+"},       {"750"},         {"970"},     {"g5"},
++    {"a2"},        {"a2q"},       {"e500"},        {"e500mc"},  {"e5500"},
++    {"power3"},    {"pwr3"},      {"power4"},      {"pwr4"},    {"power5"},
++    {"pwr5"},      {"power5x"},   {"pwr5x"},       {"power6"},  {"pwr6"},
++    {"power6x"},   {"pwr6x"},     {"power7"},      {"pwr7"},    {"power8"},
++    {"pwr8"},      {"power9"},    {"pwr9"},        {"powerpc"}, {"ppc"},
++    {"powerpc64"}, {"ppc64"},     {"powerpc64le"}, {"ppc64le"},
+ };
+ 
+ bool PPCTargetInfo::isValidCPUName(StringRef Name) const {
+Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.h
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Basic/Targets/PPC.h
++++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.h
+@@ -45,7 +45,8 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetI
+     ArchDefinePwr8 = 1 << 12,
+     ArchDefinePwr9 = 1 << 13,
+     ArchDefineA2 = 1 << 14,
+-    ArchDefineA2q = 1 << 15
++    ArchDefineA2q = 1 << 15,
++    ArchDefine500v2 = 1 << 16
+   } ArchDefineTypes;
+ 
+ 
+@@ -66,6 +67,7 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetI
+   bool HasBPERMD = false;
+   bool HasExtDiv = false;
+   bool HasP9Vector = false;
++  bool HasSPE = false;
+ 
+ protected:
+   std::string ABI;
+@@ -145,6 +147,8 @@ public:
+                         ArchDefinePwr6x | ArchDefinePwr6 | ArchDefinePwr5x |
+                         ArchDefinePwr5 | ArchDefinePwr4 | ArchDefinePpcgr |
+                         ArchDefinePpcsq)
++              .Cases("e500", "e500v2",
++                    ArchDefineName | ArchDefine500v2)
+               .Default(ArchDefineNone);
+     }
+     return CPUKnown;
+Index: llvm-toolchain-snapshot_8~svn349138/clang/test/Driver/ppc-features.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/test/Driver/ppc-features.cpp
++++ llvm-toolchain-snapshot_8~svn349138/clang/test/Driver/ppc-features.cpp
+@@ -168,6 +168,9 @@
+ // RUN: %clang -target powerpc64-unknown-linux-gnu %s -mno-invariant-function-descriptors -minvariant-function-descriptors -### -o %t.o 2>&1 | FileCheck -check-prefix=CHECK-INVFUNCDESC %s
+ // CHECK-INVFUNCDESC: "-target-feature" "+invariant-function-descriptors"
+ 
++// RUN: %clang -target powerpc-unknown-linux-gnu %s -mno-spe -mspe -### -o %t.o 2>&1 | FileCheck -check-prefix=CHECK-SPE %s
++// CHECK-SPE: "-target-feature" "+spe"
++
+ // Assembler features
+ // RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o -no-integrated-as 2>&1 | FileCheck -check-prefix=CHECK_BE_AS_ARGS %s
+ // CHECK_BE_AS_ARGS: "-mppc64"
+Index: llvm-toolchain-snapshot_8~svn349138/clang/test/Misc/target-invalid-cpu-note.c
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/test/Misc/target-invalid-cpu-note.c
++++ llvm-toolchain-snapshot_8~svn349138/clang/test/Misc/target-invalid-cpu-note.c
+@@ -79,7 +79,7 @@
+ // PPC: error: unknown target CPU 'not-a-cpu'
+ // PPC: note: valid target CPU values are: generic, 440, 450, 601, 602, 603,
+ // PPC-SAME: 603e, 603ev, 604, 604e, 620, 630, g3, 7400, g4, 7450, g4+, 750,
+-// PPC-SAME: 970, g5, a2, a2q, e500mc, e5500, power3, pwr3, power4, pwr4,
++// PPC-SAME: 970, g5, a2, a2q, e500, e500mc, e5500, power3, pwr3, power4, pwr4,
+ // PPC-SAME: power5, pwr5, power5x, pwr5x, power6, pwr6, power6x, pwr6x, power7,
+ // PPC-SAME: pwr7, power8, pwr8, power9, pwr9, powerpc, ppc, powerpc64, ppc64,
+ // PPC-SAME: powerpc64le, ppc64le
+Index: llvm-toolchain-snapshot_8~svn349138/clang/test/Preprocessor/init.c
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/test/Preprocessor/init.c
++++ llvm-toolchain-snapshot_8~svn349138/clang/test/Preprocessor/init.c
+@@ -7016,6 +7016,10 @@
+ //
+ // PPC32-LINUX-NOT: _CALL_LINUX
+ //
++// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc-unknown-linux-gnu -target-feature +spe < /dev/null | FileCheck -match-full-lines -check-prefix PPC32-SPE %s
++//
++// PPC32-SPE:#define __SPE__ 1
++//
+ // RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc-apple-darwin8 < /dev/null | FileCheck -match-full-lines -check-prefix PPC-DARWIN %s
+ //
+ // PPC-DARWIN:#define _ARCH_PPC 1
diff --git a/debian/patches/powerpcspe/D54409-powerpcspe-register-spilling.diff b/debian/patches/powerpcspe/D54409-powerpcspe-register-spilling.diff
new file mode 100644
index 0000000..3a50a54
--- /dev/null
+++ b/debian/patches/powerpcspe/D54409-powerpcspe-register-spilling.diff
@@ -0,0 +1,88 @@
+Description: PowerPC/SPE: Fix register spilling for SPE registers
+Author: Justin Hibbits <jrh29@alumni.cwru.edu>
+Origin: https://reviews.llvm.org/D54409
+Last-Update: 2018-12-05
+
+--- llvm-toolchain-7-7.0.1~+rc2.orig/lib/Target/PowerPC/PPCRegisterInfo.cpp
++++ llvm-toolchain-7-7.0.1~+rc2/lib/Target/PowerPC/PPCRegisterInfo.cpp
+@@ -844,6 +844,9 @@ static unsigned offsetMinAlign(const Mac
+   case PPC::STXSD:
+   case PPC::STXSSP:
+     return 4;
++  case PPC::EVLDD:
++  case PPC::EVSTDD:
++    return 8;
+   case PPC::LXV:
+   case PPC::STXV:
+     return 16;
+@@ -960,7 +963,10 @@ PPCRegisterInfo::eliminateFrameIndex(Mac
+   // happen in invalid code.
+   assert(OpC != PPC::DBG_VALUE &&
+          "This should be handled in a target-independent way");
+-  if (!noImmForm && ((isInt<16>(Offset) &&
++  bool canBeImmediate = (OpC == PPC::EVSTDD || OpC == PPC::EVLDD) ?
++                        isUInt<8>(Offset) :
++                        isInt<16>(Offset);
++  if (!noImmForm && ((canBeImmediate &&
+                       ((Offset % offsetMinAlign(MI)) == 0)) ||
+                      OpC == TargetOpcode::STACKMAP ||
+                      OpC == TargetOpcode::PATCHPOINT)) {
+--- llvm-toolchain-7-7.0.1~+rc2.orig/test/CodeGen/PowerPC/spe.ll
++++ llvm-toolchain-7-7.0.1~+rc2/test/CodeGen/PowerPC/spe.ll
+@@ -525,18 +525,53 @@ entry:
+ ; CHECK: #NO_APP
+ }
+ 
+-define double @test_spill(double %a) nounwind {
++declare double @test_spill_spe_regs(double, double);
++define dso_local void @test_func2() #0 {
+ entry:
++  ret void
++}
++
++@global_var1 = global i32 0, align 4
++define double @test_spill(double %a, i32 %a1, i64 %a2, i8 * %a3, i32 *%a4, i32* %a5) nounwind {
++entry:
++  %a.addr = alloca double, align 8
++  %a1.addr = alloca i32, align 4
++  %a2.addr = alloca i64, align 8
++  %a3.addr = alloca i8*, align 4
++  %a4.addr = alloca i32*, align 4
++  %a5.addr = alloca i32*, align 4
++  %ptr = alloca i32*, align 4
++  %v1 = alloca [8 x i32], align 4
++  %v2 = alloca [7 x i32], align 4
++  %v3 = alloca [5 x i32], align 4
++  store i32 %a1, i32* %a1.addr, align 4
++  store i64 %a2, i64* %a2.addr, align 8
++  store i8* %a3, i8** %a3.addr, align 4
++  store i32* %a4, i32** %a4.addr, align 4
++  store i32* %a5, i32** %a5.addr, align 4
++  store i32* @global_var1, i32** %ptr, align 4
+   %0 = fadd double %a, %a
+-  call void asm sideeffect "","~{r0},~{r3},~{s4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{r13},~{r14},~{r15},~{r16},~{r17},~{r18},~{r19},~{r20},~{r21},~{r22},~{r23},~{r24},~{r25},~{r26},~{r27},~{r28},~{r29},~{r30},~{r31}"() nounwind
++  call void asm sideeffect "","~{s0},~{s3},~{s4},~{s5},~{s6},~{s7},~{s8},~{s9},~{s10},~{s11},~{s12},~{s13},~{s14},~{s15},~{s16},~{s17},~{s18},~{s19},~{s20},~{s21},~{s22},~{s23},~{s24},~{s25},~{s26},~{s27},~{s28},~{s29},~{s30},~{s31}"() nounwind
+   %1 = fadd double %0, 3.14159
++  %2 = load i32*, i32** %ptr, align 4
++  %3 = bitcast [8 x i32]* %v1 to i8*
++  call void @llvm.memset.p0i8.i32(i8* align 4 %3, i8 0, i32 24, i1 true)
++  %4 = load i32*, i32** %a5.addr, align 4
++  store i32 0, i32* %4, align 4
++  call void @test_func2()
++  %5 = bitcast [7 x i32]* %v2 to i8*
++  call void @llvm.memset.p0i8.i32(i8* align 4 %5, i8 0, i32 20, i1 true)
+   br label %return
+ 
+ return:
+   ret double %1
+ 
+ ; CHECK-LABEL: test_spill
+-; CHECK: efdadd
++; CHECK: li [[VREG:[0-9]+]], 256
++; CHECK: evstddx {{[0-9]+}}, {{[0-9]+}}, [[VREG]]
++; CHECK-NOT: evstdd {{[0-9]+}}, 256({{[0-9]+}}
+ ; CHECK: evstdd
++; CHECK: efdadd
+ ; CHECK: evldd
+ }
++declare void @llvm.memset.p0i8.i32(i8* nocapture writeonly, i8, i32, i1) #1
diff --git a/debian/patches/powerpcspe/D54584-powerpcspe-double-parameter.diff b/debian/patches/powerpcspe/D54584-powerpcspe-double-parameter.diff
new file mode 100644
index 0000000..d7d670a
--- /dev/null
+++ b/debian/patches/powerpcspe/D54584-powerpcspe-double-parameter.diff
@@ -0,0 +1,217 @@
+Description: PowerPC: Optimize SPE double parameter calling setup
+Author: Justin Hibbits <jrh29@alumni.cwru.edu>
+Origin: https://reviews.llvm.org/D54583
+Last-Update: 2018-12-04
+
+Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCISelLowering.cpp
++++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -385,8 +385,16 @@ PPCTargetLowering::PPCTargetLowering(con
+   } else {
+     setOperationAction(ISD::BITCAST, MVT::f32, Expand);
+     setOperationAction(ISD::BITCAST, MVT::i32, Expand);
+-    setOperationAction(ISD::BITCAST, MVT::i64, Expand);
+     setOperationAction(ISD::BITCAST, MVT::f64, Expand);
++    if (Subtarget.hasSPE()) {
++      setOperationAction(ISD::BITCAST, MVT::i64, Custom);
++    } else {
++      setOperationAction(ISD::BITCAST, MVT::i64, Expand);
++    }
++  }
++
++  if (Subtarget.hasSPE()) {
++    setOperationAction(ISD::EXTRACT_ELEMENT, MVT::i64, Custom);
+   }
+ 
+   // We cannot sextinreg(i1).  Expand to shifts.
+@@ -1366,6 +1374,9 @@ const char *PPCTargetLowering::getTarget
+   case PPCISD::QVLFSb:          return "PPCISD::QVLFSb";
+   case PPCISD::BUILD_FP128:     return "PPCISD::BUILD_FP128";
+   case PPCISD::EXTSWSLI:        return "PPCISD::EXTSWSLI";
++  case PPCISD::BUILD_SPE64:     return "PPCISD::BUILD_SPE64";
++  case PPCISD::EXTRACT_SPE_LO:  return "PPCISD::EXTRACT_SPE_LO";
++  case PPCISD::EXTRACT_SPE_HI:  return "PPCISD::EXTRACT_SPE_HI";
+   }
+   return nullptr;
+ }
+@@ -7886,6 +7897,15 @@ SDValue PPCTargetLowering::LowerBITCAST(
+   SDLoc dl(Op);
+   SDValue Op0 = Op->getOperand(0);
+ 
++  if (Subtarget.hasSPE()) {
++    if (Op.getValueType() == MVT::f64 &&
++        Op0.getOpcode() == ISD::BUILD_PAIR &&
++        (Op0.getOperand(1).getValueType() == MVT::i32) &&
++        (Op0.getOperand(0).getValueType() == MVT::i32))
++      return DAG.getNode(PPCISD::BUILD_SPE64, dl, MVT::f64, Op0.getOperand(0),
++          Op0.getOperand(1));
++  }
++
+   if (!EnableQuadPrecision ||
+       (Op.getValueType() != MVT::f128 ) ||
+       (Op0.getOpcode() != ISD::BUILD_PAIR) ||
+@@ -7897,6 +7917,26 @@ SDValue PPCTargetLowering::LowerBITCAST(
+                      Op0.getOperand(1));
+ }
+ 
++// Lower EXTRACT_ELEMENT (i64 BITCAST f64), 0/1 to evmerge*
++SDValue PPCTargetLowering::LowerEXTRACT_ELEMENT(SDValue Op, SelectionDAG &DAG) const {
++
++  SDLoc dl(Op);
++  SDValue Op0 = Op->getOperand(0);
++
++  if (!Subtarget.hasSPE())
++    return SDValue();
++
++  if (!(Op.getValueType() == MVT::i32 &&
++      Op0.getOpcode() == ISD::BITCAST))
++    return SDValue();
++
++  assert(Op0.getNumOperands() > 0 && "WTF?");
++  if (Op->getConstantOperandVal(1) == 0)
++    return DAG.getNode(PPCISD::EXTRACT_SPE_LO,  dl, MVT::i32, Op0.getOperand(0));
++
++  return DAG.getNode(PPCISD::EXTRACT_SPE_HI, dl, MVT::i32, Op0.getOperand(0));
++}
++
+ // If this is a case we can't handle, return null and let the default
+ // expansion code take care of it.  If we CAN select this case, and if it
+ // selects to a single instruction, return Op.  Otherwise, if we can codegen
+@@ -9680,6 +9720,8 @@ SDValue PPCTargetLowering::LowerOperatio
+     return LowerBSWAP(Op, DAG);
+   case ISD::ATOMIC_CMP_SWAP:
+     return LowerATOMIC_CMP_SWAP(Op, DAG);
++  case ISD::EXTRACT_ELEMENT:
++    return LowerEXTRACT_ELEMENT(Op, DAG);
+   }
+ }
+ 
+Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.h
+===================================================================
+--- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCISelLowering.h
++++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.h
+@@ -196,6 +196,15 @@ namespace llvm {
+       /// Direct move of 2 consective GPR to a VSX register.
+       BUILD_FP128,
+ 
++      /// Merge 2 GPRs to a single SPE register
++      BUILD_SPE64,
++
++      /// Extract high SPE register component
++      EXTRACT_SPE_HI,
++
++      /// Extract low SPE register component
++      EXTRACT_SPE_LO,
++
+       /// Extract a subvector from signed integer vector and convert to FP.
+       /// It is primarily used to convert a (widened) illegal integer vector
+       /// type to a legal floating point vector type.
+@@ -1110,6 +1119,7 @@ namespace llvm {
+     SDValue lowerEH_SJLJ_SETJMP(SDValue Op, SelectionDAG &DAG) const;
+     SDValue lowerEH_SJLJ_LONGJMP(SDValue Op, SelectionDAG &DAG) const;
+     SDValue LowerBITCAST(SDValue Op, SelectionDAG &DAG) const;
++    SDValue LowerEXTRACT_ELEMENT(SDValue Op, SelectionDAG &DAG) const;
+ 
+     SDValue DAGCombineExtBoolTrunc(SDNode *N, DAGCombinerInfo &DCI) const;
+     SDValue DAGCombineBuildVector(SDNode *N, DAGCombinerInfo &DCI) const;
+Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrInfo.td
+===================================================================
+--- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCInstrInfo.td
++++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrInfo.td
+@@ -231,6 +231,22 @@ def PPCbuild_fp128: SDNode<"PPCISD::BUIL
+                               SDTCisSameAs<1,2>]>,
+                            []>;
+ 
++def PPCbuild_spe64: SDNode<"PPCISD::BUILD_SPE64",
++                           SDTypeProfile<1, 2,
++                             [SDTCisFP<0>, SDTCisSameSizeAs<1,2>,
++                              SDTCisSameAs<1,2>]>,
++                           []>;
++
++def PPCextract_spe_hi : SDNode<"PPCISD::EXTRACT_SPE_HI",
++                               SDTypeProfile<1, 1,
++                                 [SDTCisInt<0>, SDTCisFP<1>]>,
++                                 []>;
++
++def PPCextract_spe_lo : SDNode<"PPCISD::EXTRACT_SPE_LO",
++                               SDTypeProfile<1, 1,
++                               [SDTCisInt<0>, SDTCisFP<1>]>,
++                               []>;
++
+ // These are target-independent nodes, but have target-specific formats.
+ def callseq_start : SDNode<"ISD::CALLSEQ_START", SDT_PPCCallSeqStart,
+                            [SDNPHasChain, SDNPOutGlue]>;
+Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrSPE.td
+===================================================================
+--- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCInstrSPE.td
++++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrSPE.td
+@@ -512,7 +512,7 @@ def EVLWWSPLATX    : EVXForm_1<792, (out
+ 
+ def EVMERGEHI      : EVXForm_1<556, (outs sperc:$RT), (ins sperc:$RA, sperc:$RB),
+                                "evmergehi $RT, $RA, $RB", IIC_VecGeneral, []>;
+-def EVMERGELO      : EVXForm_1<557, (outs sperc:$RT), (ins sperc:$RA, sperc:$RB),
++def EVMERGELO      : EVXForm_1<557, (outs sperc:$RT), (ins gprc:$RA, gprc:$RB),
+                                "evmergelo $RT, $RA, $RB", IIC_VecGeneral, []>;
+ def EVMERGEHILO    : EVXForm_1<558, (outs sperc:$RT), (ins sperc:$RA, sperc:$RB),
+                                "evmergehilo $RT, $RA, $RB", IIC_VecGeneral, []>;
+@@ -887,4 +887,15 @@ def : Pat<(f64 (selectcc i1:$lhs, i1:$rh
+           (SELECT_SPE (CRANDC $lhs, $rhs), $tval, $fval)>;
+ def : Pat<(f64 (selectcc i1:$lhs, i1:$rhs, f64:$tval, f64:$fval, SETNE)),
+           (SELECT_SPE (CRXOR $lhs, $rhs), $tval, $fval)>;
++
++
++def : Pat<(f64 (PPCbuild_spe64 i32:$rB, i32:$rA)),
++          (f64 (COPY_TO_REGCLASS (EVMERGELO $rA, $rB), SPERC))>;
++
++def : Pat<(i32 (PPCextract_spe_hi f64:$rA)),
++          (i32 (EXTRACT_SUBREG (EVMERGEHI $rA, $rA), sub_32))>;
++
++def : Pat<(i32 (PPCextract_spe_lo f64:$rA)),
++          (i32 (EXTRACT_SUBREG $rA, sub_32))>;
++
+ }
+Index: llvm-toolchain-snapshot_8~svn350421/test/CodeGen/PowerPC/spe.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn350421.orig/test/CodeGen/PowerPC/spe.ll
++++ llvm-toolchain-snapshot_8~svn350421/test/CodeGen/PowerPC/spe.ll
+@@ -472,10 +472,8 @@ entry:
+ ; CHECK-LABEL: test_dselect
+ ; CHECK: andi.
+ ; CHECK: bc
+-; CHECK: evldd
+-; CHECK: b
+-; CHECK: evldd
+-; CHECK: evstdd
++; CHECK: evor
++; CHECK: evmergehi
+ ; CHECK: blr
+ }
+ 
+@@ -519,7 +517,7 @@ entry:
+   %1 = call i32 asm sideeffect "efdctsi $0, $1", "=d,d"(double %0)
+   ret i32 %1
+ ; CHECK-LABEL: test_dasmconst
+-; CHECK: evldd
++; CHECK: evmergelo
+ ; CHECK: #APP
+ ; CHECK: efdctsi
+ ; CHECK: #NO_APP
+@@ -541,7 +539,7 @@ entry:
+   %a4.addr = alloca i32*, align 4
+   %a5.addr = alloca i32*, align 4
+   %ptr = alloca i32*, align 4
+-  %v1 = alloca [8 x i32], align 4
++  %v1 = alloca [9 x i32], align 4
+   %v2 = alloca [7 x i32], align 4
+   %v3 = alloca [5 x i32], align 4
+   store i32 %a1, i32* %a1.addr, align 4
+@@ -554,7 +552,7 @@ entry:
+   call void asm sideeffect "","~{s0},~{s3},~{s4},~{s5},~{s6},~{s7},~{s8},~{s9},~{s10},~{s11},~{s12},~{s13},~{s14},~{s15},~{s16},~{s17},~{s18},~{s19},~{s20},~{s21},~{s22},~{s23},~{s24},~{s25},~{s26},~{s27},~{s28},~{s29},~{s30},~{s31}"() nounwind
+   %1 = fadd double %0, 3.14159
+   %2 = load i32*, i32** %ptr, align 4
+-  %3 = bitcast [8 x i32]* %v1 to i8*
++  %3 = bitcast [9 x i32]* %v1 to i8*
+   call void @llvm.memset.p0i8.i32(i8* align 4 %3, i8 0, i32 24, i1 true)
+   %4 = load i32*, i32** %a5.addr, align 4
+   store i32 0, i32* %4, align 4
diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff
new file mode 100644
index 0000000..db8a9d7
--- /dev/null
+++ b/debian/patches/python-clangpath.diff
@@ -0,0 +1,17 @@
+---
+ clang/bindings/python/clang/cindex.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: llvm-toolchain-snapshot_8~svn342269/clang/bindings/python/clang/cindex.py
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/bindings/python/clang/cindex.py
++++ llvm-toolchain-snapshot_8~svn342269/clang/bindings/python/clang/cindex.py
+@@ -4144,7 +4144,7 @@ class Config:
+         elif name == 'Windows':
+             file = 'libclang.dll'
+         else:
+-            file = 'libclang.so'
++            file = 'libclang-8.so'
+ 
+         if Config.library_path:
+             file = Config.library_path + '/' + file
diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff
new file mode 100644
index 0000000..71d176c
--- /dev/null
+++ b/debian/patches/remove-apple-clang-manpage.diff
@@ -0,0 +1,38 @@
+Index: llvm-toolchain-7-7/clang/docs/CommandGuide/clang.rst
+===================================================================
+--- llvm-toolchain-7-7.orig/clang/docs/CommandGuide/clang.rst
++++ llvm-toolchain-7-7/clang/docs/CommandGuide/clang.rst
+@@ -310,20 +310,10 @@ Clang fully supports cross compilation a
+ Depending on how your version of Clang is configured, it may have support for a
+ number of cross compilers, or may only support a native target.
+ 
+-.. option:: -arch <architecture>
++.. option:: -target <architecture>
+ 
+   Specify the architecture to build for.
+ 
+-.. option:: -mmacosx-version-min=<version>
+-
+-  When building for Mac OS X, specify the minimum version supported by your
+-  application.
+-
+-.. option:: -miphoneos-version-min
+-
+-  When building for iPhone OS, specify the minimum version supported by your
+-  application.
+-
+ .. option:: -march=<cpu>
+ 
+   Specify that Clang should generate code for a specific processor family
+@@ -616,11 +606,6 @@ ENVIRONMENT
+   These environment variables specify additional paths, as for :envvar:`CPATH`, which are
+   only used when processing the appropriate language.
+ 
+-.. envvar:: MACOSX_DEPLOYMENT_TARGET
+-
+-  If :option:`-mmacosx-version-min` is unspecified, the default deployment
+-  target is read from this environment variable. This option only affects
+-  Darwin targets.
+ 
+ BUGS
+ ----
diff --git a/debian/patches/remove-test-freezing.diff b/debian/patches/remove-test-freezing.diff
new file mode 100644
index 0000000..f34afe6
--- /dev/null
+++ b/debian/patches/remove-test-freezing.diff
@@ -0,0 +1,34 @@
+Index: llvm-toolchain-snapshot_7~svn335949/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
+===================================================================
+--- llvm-toolchain-snapshot_7~svn335949.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
++++ llvm-toolchain-snapshot_7~svn335949/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
+@@ -1,29 +0,0 @@
+-// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
+-
+-#include <stdio.h>
+-
+-#if !defined(__GLIBC_PREREQ)
+-#define __GLIBC_PREREQ(a, b) 0
+-#endif
+-
+-// getauxval() used instead of sysconf() in GetPageSize() is defined starting
+-// glbc version 2.16.
+-#if __GLIBC_PREREQ(2, 16)
+-extern "C" long sysconf(int name) {
+-  fprintf(stderr, "sysconf wrapper called\n");
+-  return 0;
+-}
+-#endif  // defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 16)
+-
+-int main() {
+-  // All we need to check is that the sysconf() interceptor defined above was
+-  // not called. Should it get called, it will crash right there, any
+-  // instrumented code executed before sanitizer init is finished will crash
+-  // accessing non-initialized sanitizer internals. Even if it will not crash
+-  // in some configuration, it should never be called anyway.
+-  fprintf(stderr, "Passed\n");
+-  // CHECK-NOT: sysconf wrapper called
+-  // CHECK: Passed
+-  // CHECK-NOT: sysconf wrapper called
+-  return 0;
+-}
diff --git a/debian/patches/reproducible-pch.diff b/debian/patches/reproducible-pch.diff
new file mode 100644
index 0000000..b3f3930
--- /dev/null
+++ b/debian/patches/reproducible-pch.diff
@@ -0,0 +1,40 @@
+Description: Make ordering of OPENCL_EXTENSION_TYPES reproducible
+
+Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+Bug-Debian: https://bugs.debian.org/877359
+Forwarded: no
+
+Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Serialization/ASTWriter.cpp
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Serialization/ASTWriter.cpp
++++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Serialization/ASTWriter.cpp
+@@ -4279,9 +4279,13 @@ void ASTWriter::WriteOpenCLExtensionType
+     return;
+ 
+   RecordData Record;
++  // Sort to allow reproducible .pch files - https://bugs.debian.org/877359
++  std::map<TypeID, std::set<std::string>> sortedOpenCLTypeExtMap;
+   for (const auto &I : SemaRef.OpenCLTypeExtMap) {
+-    Record.push_back(
+-        static_cast<unsigned>(getTypeID(I.first->getCanonicalTypeInternal())));
++    sortedOpenCLTypeExtMap[getTypeID(I.first->getCanonicalTypeInternal())]=I.second;
++  }
++  for (const auto &I : sortedOpenCLTypeExtMap) {
++    Record.push_back(static_cast<unsigned>(I.first));
+     Record.push_back(I.second.size());
+     for (auto Ext : I.second)
+       AddString(Ext, Record);
+@@ -4294,8 +4298,12 @@ void ASTWriter::WriteOpenCLExtensionDecl
+     return;
+ 
+   RecordData Record;
++  std::map<DeclID, std::set<std::string>> sortedOpenCLDeclExtMap;
+   for (const auto &I : SemaRef.OpenCLDeclExtMap) {
+-    Record.push_back(getDeclID(I.first));
++    sortedOpenCLDeclExtMap[getDeclID(I.first)]=I.second;
++  }
++  for (const auto &I : sortedOpenCLDeclExtMap) {
++    Record.push_back(I.first);
+     Record.push_back(static_cast<unsigned>(I.second.size()));
+     for (auto Ext : I.second)
+       AddString(Ext, Record);
diff --git a/debian/patches/revert-change-soname.diff b/debian/patches/revert-change-soname.diff
new file mode 100644
index 0000000..24cca1e
--- /dev/null
+++ b/debian/patches/revert-change-soname.diff
@@ -0,0 +1,65 @@
+Index: tools/llvm-shlib/simple_version_script.map.in
+===================================================================
+--- tools/llvm-shlib/simple_version_script.map.in	(revision 352580)
++++ tools/llvm-shlib/simple_version_script.map.in	(revision 352579)
+@@ -1 +1 @@
+-LLVM_@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@ { global: *; };
++LLVM_@LLVM_VERSION_MAJOR@ { global: *; };
+Index: tools/llvm-config/CMakeLists.txt
+===================================================================
+--- tools/llvm-config/CMakeLists.txt	(revision 352580)
++++ tools/llvm-config/CMakeLists.txt	(revision 352579)
+@@ -37,7 +37,7 @@
+ set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
+ set(LLVM_BUILD_SYSTEM cmake)
+ set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
+-set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
++set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}")
+ set(LLVM_HAS_GLOBAL_ISEL "ON")
+ 
+ # Use the C++ link flags, since they should be a superset of C link flags.
+Index: cmake/modules/AddLLVM.cmake
+===================================================================
+--- cmake/modules/AddLLVM.cmake	(revision 352580)
++++ cmake/modules/AddLLVM.cmake	(revision 352579)
+@@ -83,7 +83,7 @@
+     # FIXME: Don't write the "local:" line on OpenBSD.
+     # in the export file, also add a linker script to version LLVM symbols (form: LLVM_N.M)
+     add_custom_command(OUTPUT ${native_export_file}
+-      COMMAND echo "LLVM_${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR} {" > ${native_export_file}
++      COMMAND echo "LLVM_${LLVM_VERSION_MAJOR} {" > ${native_export_file}
+       COMMAND grep -q "[[:alnum:]]" ${export_file} && echo "  global:" >> ${native_export_file} || :
+       COMMAND sed -e "s/$/;/" -e "s/^/    /" < ${export_file} >> ${native_export_file}
+       COMMAND echo "  local: *;" >> ${native_export_file}
+@@ -500,7 +500,7 @@
+         PROPERTIES
+         # Since 4.0.0, the ABI version is indicated by the major version
+         SOVERSION ${LLVM_VERSION_MAJOR}
+-        VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
++        VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX})
+     endif()
+   endif()
+ 
+@@ -522,7 +522,7 @@
+       if(${output_name} STREQUAL "output_name-NOTFOUND")
+         set(output_name ${name})
+       endif()
+-      set(library_name ${output_name}-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX})
++      set(library_name ${output_name}-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX})
+       set(api_name ${output_name}-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
+       set_target_properties(${name} PROPERTIES OUTPUT_NAME ${library_name})
+       llvm_install_library_symlink(${api_name} ${library_name} SHARED
+Index: docs/ReleaseNotes.rst
+===================================================================
+--- docs/ReleaseNotes.rst	(revision 352580)
++++ docs/ReleaseNotes.rst	(revision 352579)
+@@ -30,6 +30,9 @@
+   is available on the Visual Studio Marketplace. The new integration
+   supports Visual Studio 2017.
+ 
++* Libraries have been renamed from 7.0 to 7. This change also impacts
++  downstream libraries like lldb.
++
+ * The LoopInstSimplify pass (``-loop-instsimplify``) has been removed.
+ 
+ * Symbols starting with ``?`` are no longer mangled by LLVM when using the
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
new file mode 100644
index 0000000..d1e1e22
--- /dev/null
+++ b/debian/patches/scan-build-clang-path.diff
@@ -0,0 +1,17 @@
+---
+ clang/tools/scan-build/bin/scan-build |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: llvm-toolchain-snapshot_8~svn349138/clang/tools/scan-build/bin/scan-build
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/clang/tools/scan-build/bin/scan-build
++++ llvm-toolchain-snapshot_8~svn349138/clang/tools/scan-build/bin/scan-build
+@@ -1468,7 +1468,7 @@ sub FindClang {
+   if (!defined $Options{AnalyzerDiscoveryMethod}) {
+     $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
+     if (!defined $Clang || ! -x $Clang) {
+-      $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
++      $Clang = Cwd::realpath("/usr/lib/llvm-8/bin/clang");
+     }
+     if (!defined $Clang || ! -x $Clang) {
+       return "error: Cannot find an executable 'clang' relative to" .
diff --git a/debian/patches/scan-view-fix-path.diff b/debian/patches/scan-view-fix-path.diff
new file mode 100644
index 0000000..a37e688
--- /dev/null
+++ b/debian/patches/scan-view-fix-path.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_5.0~svn297449/clang/tools/scan-view/bin/scan-view
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_5.0~svn297449/clang/tools/scan-view/bin/scan-view
+@@ -61,7 +61,7 @@ def start_browser(port, options):
+ 
+ def run(port, options, root):
+     # Prefer to look relative to the installed binary
+-    share = os.path.dirname(__file__) + "/../share/scan-view"
++    share = os.path.dirname(__file__) + "/../share/"
+     if not os.path.isdir(share):
+         # Otherwise look relative to the source
+         share = os.path.dirname(__file__) + "/../../scan-view/share"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..29a5446
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,140 @@
+# Debian versions
+19-clang_debian_version.patch
+0003-Debian-version-info-and-bugreport.patch
+clang-format-version.diff
+clang-analyzer-force-version.diff
+
+# Disabling features
+23-strlcpy_strlcat_warning_removed.diff
+
+27-fix_clang_stdint.diff
+declare_clear_cache.diff
+unwind-chain-inclusion.diff
+atomic_library_1.diff
+
+# Path updates
+python-clangpath.diff
+fix-clang-path-and-build.diff
+0048-Set-html_static_path-_static-everywhere.patch
+symbolizer-path.diff
+clang-tidy-run-bin.diff
+0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
+debug-jit-path.diff
+
+# commented because of bug 903709
+#force-gcc-header-obj.diff
+
+do-not-fail-on-unexpected-pass.diff
+disable-display-PASS-UNSUPPORTED-XFAIL.diff
+
+# llvm-config
+fix-llvm-config-obj-src-root.patch
+0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
+
+# Lib names
+0044-soname.diff
+lldb-soname.diff
+lldb-libname.diff
+openmp-soname.diff
+
+# Disable some tests
+silent-gold-test.diff
+silent-more-tests.diff
+silent-MCJIIT-tests.diff
+silent-gold-utils.diff
+silent-test-failing-codeverage.diff
+silent-amd-tet.diff
+silent-test-macho.diff
+silent-llvm-isel-fuzzer.diff
+remove-test-freezing.diff
+disable-llvm-symbolizer-test.diff
+disable-path-test-failing.diff
+disable-source-interleave.diff
+
+# Decrease the freq for the keep alive
+test-keep-alive.diff
+
+# scan-build
+scan-build-clang-path.diff
+install-scan-build-py.diff
+scan-view-fix-path.diff
+fix-scan-view-path.diff
+
+# lldb
+lldb/lldb-link-atomic-cmake.patch
+lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
+lldb/lldb-missing-install.diff
+lldb/lldb-disable-swig-error.diff
+
+# Fix arch issue
+disable-error-xray.diff
+
+# OpenMP
+openmp/openmp-check-execstack.diff
+openmp/openmp-mips-affinity.patch
+openmp/bootstrap-with-openmp-version-export-missing.diff
+
+# libcxx
+libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
+libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
+libcxx/libcxxabi-arm-ehabi-fix.patch
+libcxx/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch
+libcxx/libcxx-silent-test-libcxx.diff
+libcxx/libcxx-silent-failure-ppc64el.diff
+libcxx/libcxx-silent-failure-arm64.diff
+
+# Change default optims
+mips-fpxx-enable.diff
+26-set-correct-float-abi.diff
+clang-baseline-fix-i386.patch
+disable-sse2-old-x86.diff
+clang-arm-default-vfp3-on-armv7a.patch
+
+# For the bootstrap
+bootstrap-fix-include-next.diff
+clangd-atomic-cmake.patch
+
+# Fix docs
+remove-apple-clang-manpage.diff
+0049-Use-Debian-provided-MathJax-everywhere.patch
+
+# reproducible
+reproducible-pch.diff
+
+# Hurd port
+hurd/hurd-pathmax.diff
+hurd/hurd-EIEIO-undef.diff
+hurd/impl-path-hurd.diff
+hurd/D54677-hurd-path_max.diff
+
+# powerpcspe
+powerpcspe/D49754-powerpcspe-clang.diff
+powerpcspe/D54409-powerpcspe-register-spilling.diff
+powerpcspe/D54584-powerpcspe-double-parameter.diff
+
+# kfreebsd
+kfreebsd/clang_lib_Basic_Targets.diff
+kfreebsd/CMakeLists.txt.diff
+kfreebsd/compiler-rt_lib.diff
+kfreebsd/include_llvm_ADT_Triple.h.diff
+kfreebsd/kfreebsd-libcxx-threads-detection.diff
+kfreebsd/kfreebsd-openmp.diff
+kfreebsd/kfreebsd-threads-build.diff
+kfreebsd/kfreebsd-triple-clang.diff
+kfreebsd/kfreebsd-triple.diff
+kfreebsd/lib_Support.diff
+kfreebsd/lib_Target_X86.diff
+kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
+kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
+kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
+
+# patches for intel-opencl-clang
+OpenCL-Change-type-of-block-pointer-for-OpenCL.patch
+OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch
+OpenCL-Fix-assertion-due-to-blocks.patch
+ubuntu-eoan-distro.patch
+
+930008-arm.diff
+
+# Python 3
+0050-Remove-explicit-python-version-list.patch
diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff
new file mode 100644
index 0000000..5be5499
--- /dev/null
+++ b/debian/patches/silent-MCJIIT-tests.diff
@@ -0,0 +1,214 @@
+---
+ test/BugPoint/crash-narrowfunctiontest.ll                               |    1 -
+ test/BugPoint/remove_arguments_test.ll                                  |    1 -
+ test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll                     |    2 +-
+ test/ExecutionEngine/MCJIT/eh-lg-pic.ll                                 |    2 +-
+ test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll                     |    2 +-
+ test/ExecutionEngine/MCJIT/stubs-sm-pic.ll                              |    2 +-
+ test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll           |    2 +-
+ test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll                     |    2 +-
+ test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll                  |    2 +-
+ test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll                              |    2 +-
+ test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll                  |    2 +-
+ test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll |    2 +-
+ test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll           |    2 +-
+ test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll                           |    2 +-
+ test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll        |    2 +-
+ test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll                  |    2 +-
+ test/Feature/load_module.ll                                             |    1 -
+ 17 files changed, 14 insertions(+), 17 deletions(-)
+
+Index: llvm-toolchain-snapshot_8~svn348749/test/BugPoint/crash-narrowfunctiontest.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/BugPoint/crash-narrowfunctiontest.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/BugPoint/crash-narrowfunctiontest.ll
+@@ -2,7 +2,6 @@
+ ;
+ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
+ ; REQUIRES: loadable_module
+-; XFAIL: *
+ 
+ define i32 @foo() { ret i32 1 }
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/BugPoint/remove_arguments_test.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/BugPoint/remove_arguments_test.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/BugPoint/remove_arguments_test.ll
+@@ -1,7 +1,6 @@
+ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes
+ ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
+ ; REQUIRES: loadable_module
+-; XFAIL: *
+ 
+ ; Test to make sure that arguments are removed from the function if they are
+ ; unnecessary. And clean up any types that frees up too.
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips-, mipsel-, i686, i386
++; XFAIL: *
+ 
+ declare i32 @FB()
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+@@ -1,6 +1,6 @@
+ ; REQUIRES: cxx-shared-library
+ ; RUN: %lli -relocation-model=pic -code-model=large %s
+-; XFAIL: cygwin, windows-msvc, windows-gnu, mips-, mipsel-, i686, i386, aarch64, arm
++; XFAIL: *
+ declare i8* @__cxa_allocate_exception(i64)
+ declare void @__cxa_throw(i8*, i8*, i8*)
+ declare i32 @__gxx_personality_v0(...)
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips-, mipsel-, i686, i386
++; XFAIL: *
+ 
+ declare i32 @FB()
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
++; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm, x86_64
+ 
+ define i32 @main() nounwind {
+ entry:
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
+ 
+ @count = global i32 1, align 4
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -O0 -relocation-model=pic -code-model=small %s
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
+ 
+ @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
+ @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips-, mipsel-, i686, i386
++; XFAIL: *
+ 
+ declare i32 @FB()
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+@@ -1,6 +1,6 @@
+ ; REQUIRES: cxx-shared-library
+ ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s
+-; XFAIL: cygwin, windows-msvc, windows-gnu, mips-, mipsel-, i686, i386, aarch64, arm
++; XFAIL: *
+ declare i8* @__cxa_allocate_exception(i64)
+ declare void @__cxa_throw(i8*, i8*, i8*)
+ declare i32 @__gxx_personality_v0(...)
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips-, mipsel-, i686, i386
++; XFAIL: *
+ 
+ declare i32 @FB()
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+@@ -1,6 +1,6 @@
+ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
+ ; RUN:   -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, windows-gnu, windows-msvc
++; XFAIL: *
+ ; UNSUPPORTED: powerpc64-unknown-linux-gnu
+ ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+@@ -1,6 +1,6 @@
+ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
+ ; RUN:   -O0 -relocation-model=pic -code-model=small %s
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, windows-gnu, windows-msvc
++; XFAIL: *
+ ; UNSUPPORTED: powerpc64-unknown-linux-gnu
+ ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
++; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm, x86_64
+ 
+ define i32 @main() nounwind {
+ entry:
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
+ 
+ @count = global i32 1, align 4
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+@@ -1,5 +1,5 @@
+ ; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
+ 
+ @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
+ @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
+Index: llvm-toolchain-snapshot_8~svn348749/test/Feature/load_module.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/Feature/load_module.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/Feature/load_module.ll
+@@ -3,7 +3,6 @@
+ ; RUN:   -disable-output 2>&1 | grep Hello
+ ; REQUIRES: loadable_module
+ ; FIXME: On Cygming, it might fail without building LLVMHello manually.
+-; XFAIL: *
+ 
+ @junk = global i32 0
+ 
diff --git a/debian/patches/silent-amd-tet.diff b/debian/patches/silent-amd-tet.diff
new file mode 100644
index 0000000..d756561
--- /dev/null
+++ b/debian/patches/silent-amd-tet.diff
@@ -0,0 +1,11 @@
+Index: llvm-toolchain-snapshot_8~svn347135/test/MC/AMDGPU/hsa.s
+===================================================================
+--- llvm-toolchain-snapshot_8~svn347135.orig/test/MC/AMDGPU/hsa.s
++++ llvm-toolchain-snapshot_8~svn347135/test/MC/AMDGPU/hsa.s
+@@ -1,5 +1,6 @@
+ // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM
+ // RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF
++// XFAIL: *
+ 
+ // ELF: Section {
+ // ELF: Name: .text
diff --git a/debian/patches/silent-gold-test.diff b/debian/patches/silent-gold-test.diff
new file mode 100644
index 0000000..5cf60a2
--- /dev/null
+++ b/debian/patches/silent-gold-test.diff
@@ -0,0 +1,38 @@
+Description: fails on debian unstable amd64
+ Command Output (stderr):
+ --
+ /build/llvm-toolchain-snapshot-4.0~svn279916/test/tools/gold/X86/start-lib-common.ll:22:10: error: expected string not found in input
+ ; CHECK: @x = common global i32 0, align 8
+          ^
+ <stdin>:1:1: note: scanning from here
+ ; ModuleID = '/build/llvm-toolchain-snapshot-4.0~svn279916/build-llvm/test/tools/gold/X86/Output/start-lib-common.ll.tmp3.o'
+ ^
+ <stdin>:4:1: note: possible intended match here
+ @x = common global i32 0, align 4
+ ^
+
+
+Index: llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/start-lib-common.ll
+===================================================================
+--- llvm-toolchain-snapshot_7~svn323434.orig/test/tools/gold/X86/start-lib-common.ll
++++ llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/start-lib-common.ll
+@@ -9,6 +9,7 @@
+ ; RUN:    -shared %t1.o --start-lib %t2.o --end-lib -o %t3.o
+ ; RUN: llvm-dis %t3.o -o - | FileCheck %s
+ 
++; XFAIL: *
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ @x = common global i32 0, align 4
+ 
+Index: llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/comdat.ll
+===================================================================
+--- llvm-toolchain-snapshot_7~svn323434.orig/test/tools/gold/X86/comdat.ll
++++ llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/comdat.ll
+@@ -5,6 +5,7 @@
+ ; RUN:  -plugin-opt=save-temps
+ ; RUN: FileCheck --check-prefix=RES %s < %t3.o.resolution.txt
+ ; RUN: llvm-readobj -t %t3.o | FileCheck --check-prefix=OBJ %s
++; XFAIL: *
+ 
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
diff --git a/debian/patches/silent-gold-utils.diff b/debian/patches/silent-gold-utils.diff
new file mode 100644
index 0000000..26cdc2f
--- /dev/null
+++ b/debian/patches/silent-gold-utils.diff
@@ -0,0 +1,190 @@
+---
+ test/tools/gold/X86/common_thinlto.ll             |    1 +
+ test/tools/gold/X86/emit-llvm.ll                  |    2 ++
+ test/tools/gold/X86/parallel.ll                   |    1 +
+ test/tools/gold/X86/pr19901_thinlto.ll            |    1 +
+ test/tools/gold/X86/slp-vectorize.ll              |    1 +
+ test/tools/gold/X86/strip_names.ll                |    1 +
+ test/tools/gold/X86/thinlto.ll                    |    2 ++
+ test/tools/gold/X86/thinlto_archive.ll            |    1 +
+ test/tools/gold/X86/thinlto_internalize.ll        |    2 ++
+ test/tools/gold/X86/thinlto_linkonceresolution.ll |    2 ++
+ test/tools/gold/X86/thinlto_weak_resolution.ll    |    3 ++-
+ test/tools/gold/X86/type-merge2.ll                |    2 +-
+ test/tools/gold/X86/vectorize.ll                  |    1 +
+ test/tools/gold/X86/visibility.ll                 |    1 +
+ 14 files changed, 19 insertions(+), 2 deletions(-)
+
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/common_thinlto.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/common_thinlto.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/common_thinlto.ll
+@@ -17,6 +17,7 @@
+ 
+ ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM
+ ; NM: bar
++; XFAIL: *
+ 
+ source_filename = "common1.c"
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/emit-llvm.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/emit-llvm.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/emit-llvm.ll
+@@ -21,6 +21,8 @@
+ ; RUN: not test -a %t4.o
+ 
+ ; NM: T f3
++; XFAIL: *
++
+ 
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/parallel.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/parallel.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/parallel.ll
+@@ -5,6 +5,7 @@
+ ; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s
+ ; RUN: llvm-nm %t.o | FileCheck --check-prefix=CHECK0 %s
+ ; RUN: llvm-nm %t.o1 | FileCheck --check-prefix=CHECK1 %s
++; XFAIL: *
+ 
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/pr19901_thinlto.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/pr19901_thinlto.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/pr19901_thinlto.ll
+@@ -4,6 +4,7 @@
+ ; RUN:     --plugin-opt=thinlto \
+ ; RUN:     -shared -m elf_x86_64 -o %t.so %t2.o %t.o
+ ; RUN: llvm-readobj -t %t.so | FileCheck %s
++; XFAIL: i686, i386
+ 
+ ; CHECK:       Symbol {
+ ; CHECK:         Name: f
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/slp-vectorize.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/slp-vectorize.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/slp-vectorize.ll
+@@ -7,6 +7,7 @@
+ 
+ ; test that the vectorizer is run.
+ ; CHECK: fadd <4 x float>
++; XFAIL: *
+ 
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/strip_names.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/strip_names.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/strip_names.ll
+@@ -25,6 +25,7 @@
+ ; NONAME:  %2 = load i32, i32* @GlobalValueName
+ ; NONAME:  %3 = add i32 %0, %2
+ ; NONAME:  ret i32 %3
++; XFAIL: *
+ 
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto.ll
+@@ -141,6 +141,8 @@
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+ 
++; XFAIL: i686, i386
++
+ declare void @g(...)
+ 
+ define void @f() {
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_archive.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto_archive.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_archive.ll
+@@ -15,6 +15,7 @@
+ ; RUN:    --plugin-opt=jobs=1 \
+ ; RUN:    -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s
+ ; RUN: llvm-nm %t4 | FileCheck %s --check-prefix=NM
++; XFAIL: i686, i386
+ 
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_internalize.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto_internalize.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_internalize.ll
+@@ -14,6 +14,8 @@
+ ; h() should be internalized after promotion, and eliminated after inlining
+ ; CHECK-NOT: @h.llvm.
+ 
++; XFAIL: i686, i386
++
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+ define i32 @g() {
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_linkonceresolution.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_linkonceresolution.ll
+@@ -23,6 +23,8 @@
+ ; OPT-NOT: @f()
+ ; OPT2: define weak_odr hidden void @f()
+ 
++; XFAIL: i686, i386
++
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+ define i32 @g() {
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_weak_resolution.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto_weak_resolution.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_weak_resolution.ll
+@@ -9,6 +9,7 @@
+ ; RUN:     --plugin-opt=save-temps \
+ ; RUN:     -shared \
+ ; RUN:     -o %t3.o %t.o %t2.o
++; XFAIL: i686, i386
+ 
+ ; RUN: llvm-nm %t3.o | FileCheck %s
+ ; CHECK: weakfunc
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/type-merge2.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/type-merge2.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/type-merge2.ll
+@@ -6,6 +6,8 @@
+ ; RUN:    -shared %t.o %t2.o -o %t3.o
+ ; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s
+ 
++; XFAIL: *
++
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+ 
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/vectorize.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/vectorize.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/vectorize.ll
+@@ -7,6 +7,7 @@
+ 
+ ; test that the vectorizer is run.
+ ; CHECK: fadd <4 x float>
++; XFAIL: *
+ 
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-unknown-linux-gnu"
+Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/visibility.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/visibility.ll
++++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/visibility.ll
+@@ -16,6 +16,7 @@
+ ; CHECK-NEXT: Other [
+ ; CHECK-NEXT:   STV_PROTECTED
+ ; CHECK-NEXT: ]
++; XFAIL: *
+ 
+ ; IR: define dso_local void @foo
+ 
diff --git a/debian/patches/silent-llvm-isel-fuzzer.diff b/debian/patches/silent-llvm-isel-fuzzer.diff
new file mode 100644
index 0000000..538f67b
--- /dev/null
+++ b/debian/patches/silent-llvm-isel-fuzzer.diff
@@ -0,0 +1,24 @@
+Index: llvm-toolchain-snapshot_6.0~svn315736/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
+===================================================================
+--- llvm-toolchain-snapshot_6.0~svn315736.orig/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
++++ llvm-toolchain-snapshot_6.0~svn315736/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
+@@ -2,6 +2,7 @@
+ ; without copying the whole lib dir or polluting the build dir.
+ ; REQUIRES: static-libs
+ ; REQUIRES: aarch64-registered-target
++: XFAIL: *
+ 
+ ; RUN: echo > %t.input
+ 
+Index: llvm-toolchain-snapshot_6.0~svn315736/test/tools/llvm-isel-fuzzer/execname-options.ll
+===================================================================
+--- llvm-toolchain-snapshot_6.0~svn315736.orig/test/tools/llvm-isel-fuzzer/execname-options.ll
++++ llvm-toolchain-snapshot_6.0~svn315736/test/tools/llvm-isel-fuzzer/execname-options.ll
+@@ -1,6 +1,7 @@
+ ; If the binary looks up libraries using an rpath, we can't test this
+ ; without copying the whole lib dir or polluting the build dir.
+ ; REQUIRES: static-libs
++: XFAIL: *
+ 
+ ; RUN: echo > %t.input
+ 
diff --git a/debian/patches/silent-more-tests.diff b/debian/patches/silent-more-tests.diff
new file mode 100644
index 0000000..385bd0c
--- /dev/null
+++ b/debian/patches/silent-more-tests.diff
@@ -0,0 +1,60 @@
+# Comment the tests for the code coverage (fails otherwise)
+
+
+---
+ test/BugPoint/crash-narrowfunctiontest.ll |    1 +
+ test/BugPoint/metadata.ll                 |    3 ++-
+ test/BugPoint/remove_arguments_test.ll    |    1 +
+ test/Feature/load_module.ll               |    1 +
+ 4 files changed, 5 insertions(+), 1 deletion(-)
+
+Index: llvm-toolchain-snapshot_8~svn348749/test/BugPoint/crash-narrowfunctiontest.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/BugPoint/crash-narrowfunctiontest.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/BugPoint/crash-narrowfunctiontest.ll
+@@ -2,6 +2,7 @@
+ ;
+ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
+ ; REQUIRES: loadable_module
++; XFAIL: *
+ 
+ define i32 @foo() { ret i32 1 }
+ 
+Index: llvm-toolchain-snapshot_8~svn348749/test/BugPoint/metadata.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/BugPoint/metadata.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/BugPoint/metadata.ll
+@@ -7,7 +7,8 @@
+ ;
+ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t-notype -bugpoint-crashcalls -silence-passes -disable-namedmd-remove -disable-strip-debuginfo > /dev/null
+ ; RUN: llvm-dis %t-notype-reduced-simplified.bc -o - | FileCheck %s --check-prefix=NOTYPE
+-;
++; XFAIL: *
++
+ ; Bugpoint should keep the call's metadata attached to the call.
+ 
+ ; CHECK: call void @foo(), !dbg ![[LOC:[0-9]+]], !attach ![[CALL:[0-9]+]]
+Index: llvm-toolchain-snapshot_8~svn348749/test/BugPoint/remove_arguments_test.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/BugPoint/remove_arguments_test.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/BugPoint/remove_arguments_test.ll
+@@ -1,6 +1,7 @@
+ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes
+ ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
+ ; REQUIRES: loadable_module
++; XFAIL: *
+ 
+ ; Test to make sure that arguments are removed from the function if they are
+ ; unnecessary. And clean up any types that frees up too.
+Index: llvm-toolchain-snapshot_8~svn348749/test/Feature/load_module.ll
+===================================================================
+--- llvm-toolchain-snapshot_8~svn348749.orig/test/Feature/load_module.ll
++++ llvm-toolchain-snapshot_8~svn348749/test/Feature/load_module.ll
+@@ -3,6 +3,7 @@
+ ; RUN:   -disable-output 2>&1 | grep Hello
+ ; REQUIRES: loadable_module
+ ; FIXME: On Cygming, it might fail without building LLVMHello manually.
++; XFAIL: *
+ 
+ @junk = global i32 0
+ 
diff --git a/debian/patches/silent-test-failing-codeverage.diff b/debian/patches/silent-test-failing-codeverage.diff
new file mode 100644
index 0000000..0fadd89
--- /dev/null
+++ b/debian/patches/silent-test-failing-codeverage.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_7~svn335581/test/ThinLTO/X86/autoupgrade.ll
+===================================================================
+--- llvm-toolchain-snapshot_7~svn335581.orig/test/ThinLTO/X86/autoupgrade.ll
++++ llvm-toolchain-snapshot_7~svn335581/test/ThinLTO/X86/autoupgrade.ll
+@@ -19,6 +19,8 @@
+ ; SUMMARYNAMES: ^2 = gv: (name: "globalfunc2",
+ ; SUMMARYNAMES: ^3 = gv: (name: "globalfunc1"
+ 
++; XFAIL: *
++
+ target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+ target triple = "x86_64-apple-macosx10.11.0"
+ 
diff --git a/debian/patches/silent-test-macho.diff b/debian/patches/silent-test-macho.diff
new file mode 100644
index 0000000..569aea0
--- /dev/null
+++ b/debian/patches/silent-test-macho.diff
@@ -0,0 +1,14 @@
+Index: llvm-toolchain-snapshot_6.0~svn314668/test/Object/macho-invalid.test
+===================================================================
+--- llvm-toolchain-snapshot_6.0~svn314668.orig/test/Object/macho-invalid.test
++++ llvm-toolchain-snapshot_6.0~svn314668/test/Object/macho-invalid.test
+@@ -284,9 +284,6 @@ INVALID-DYLIB-WRONG-FILETYPE: macho-inva
+ RUN: not llvm-objdump -macho -private-headers %p/Inputs/macho-invalid-dylib-no-id  2>&1 | FileCheck -check-prefix INVALID-DYLIB-NO-ID %s
+ INVALID-DYLIB-NO-ID: macho-invalid-dylib-no-id': truncated or malformed object (no LC_ID_DYLIB load command in dynamic library filetype)
+ 
+-RUN: not llvm-objdump -macho -private-headers %p/Inputs/macho-invalid-dylib-cmdsize-past-eof 2>&1 | FileCheck -check-prefix INVALID-DYLIB-CMDSIZE %s
+-INVALID-DYLIB-CMDSIZE: macho-invalid-dylib-cmdsize-past-eof': truncated or malformed object (load command 0 extends past end of file)
+-
+ RUN: not llvm-objdump -macho -private-headers %p/Inputs/macho-invalid-uuid-more-than-one  2>&1 | FileCheck -check-prefix INVALID-UUID-MORE-THAN-ONE %s
+ INVALID-UUID-MORE-THAN-ONE: macho-invalid-uuid-more-than-one': truncated or malformed object (more than one LC_UUID command)
+ 
diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff
new file mode 100644
index 0000000..d431584
--- /dev/null
+++ b/debian/patches/symbolizer-path.diff
@@ -0,0 +1,24 @@
+Index: llvm-toolchain-7-7/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+===================================================================
+--- llvm-toolchain-7-7.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
++++ llvm-toolchain-7-7/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+@@ -26,6 +26,10 @@
+ #include "sanitizer_symbolizer_internal.h"
+ #include "sanitizer_symbolizer_libbacktrace.h"
+ #include "sanitizer_symbolizer_mac.h"
++#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR
++
++#define TOSTR2(X) #X
++#define TOSTR(X) TOSTR2(X)
+ 
+ #include <dlfcn.h>   // for dlsym()
+ #include <errno.h>
+@@ -481,7 +485,7 @@ static SymbolizerTool *ChooseExternalSym
+     return new(*allocator) AtosSymbolizer(found_path, allocator);
+   }
+ #endif  // SANITIZER_MAC
+-  if (const char *found_path = FindPathToBinary("llvm-symbolizer")) {
++  if (const char *found_path = "/usr/bin/llvm-symbolizer-" TOSTR(LLVM_VERSION_MAJOR)) {
+     VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
+     return new(*allocator) LLVMSymbolizer(found_path, allocator);
+   }
diff --git a/debian/patches/test-keep-alive.diff b/debian/patches/test-keep-alive.diff
new file mode 100644
index 0000000..f22c66f
--- /dev/null
+++ b/debian/patches/test-keep-alive.diff
@@ -0,0 +1,21 @@
+Index: llvm-toolchain-5.0-5.0.1~+rc1/utils/lit/lit/ProgressBar.py
+===================================================================
+--- llvm-toolchain-5.0-5.0.1~+rc1.orig/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-5.0-5.0.1~+rc1/utils/lit/lit/ProgressBar.py
+@@ -189,15 +189,7 @@ class SimpleProgressBar:
+             return
+ 
+         for i in range(self.atIndex, next):
+-            idx = i % 5
+-            if idx == 0:
+-                sys.stdout.write('%-2d' % (i*2))
+-            elif idx == 1:
+-                pass # Skip second char
+-            elif idx < 4:
+-                sys.stdout.write('.')
+-            else:
+-                sys.stdout.write(' ')
++            sys.stdout.write('%-2d ' % (i*2))
+         sys.stdout.flush()
+         self.atIndex = next
+ 
diff --git a/debian/patches/ubuntu-eoan-distro.patch b/debian/patches/ubuntu-eoan-distro.patch
new file mode 100644
index 0000000..1c44508
--- /dev/null
+++ b/debian/patches/ubuntu-eoan-distro.patch
@@ -0,0 +1,33 @@
+Description: Add uoan as supported architecture
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2019-04-21
+
+--- llvm-toolchain-8-8.orig/clang/include/clang/Driver/Distro.h
++++ llvm-toolchain-8-8/clang/include/clang/Driver/Distro.h
+@@ -64,6 +64,7 @@ public:
+     UbuntuBionic,
+     UbuntuCosmic,
+     UbuntuDisco,
++    UbuntuEoan,
+     UnknownDistro
+   };
+ 
+@@ -117,7 +118,7 @@ public:
+   }
+ 
+   bool IsUbuntu() const {
+-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuDisco;
++    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuEoan;
+   }
+ 
+   bool IsAlpineLinux() const {
+--- llvm-toolchain-8-8.orig/clang/lib/Driver/Distro.cpp
++++ llvm-toolchain-8-8/clang/lib/Driver/Distro.cpp
+@@ -52,6 +52,7 @@ static Distro::DistroType DetectDistro(l
+                       .Case("bionic", Distro::UbuntuBionic)
+                       .Case("cosmic", Distro::UbuntuCosmic)
+                       .Case("disco", Distro::UbuntuDisco)
++                      .Case("eoan", Distro::UbuntuEoan)
+                       .Default(Distro::UnknownDistro);
+     if (Version != Distro::UnknownDistro)
+       return Version;
diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff
new file mode 100644
index 0000000..5e44970
--- /dev/null
+++ b/debian/patches/unwind-chain-inclusion.diff
@@ -0,0 +1,43 @@
+# Without this patch, the first local include of unwind.h might, with the 
+# __has_include_next, try to include the one from the system.
+# It might be /usr/include/clang/3.4/include/unwind.h
+# Because of the #ifndef __CLANG_UNWIND_H, it might never include any declaration
+# from the system. 
+
+---
+ clang/lib/Headers/unwind.h |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Headers/unwind.h
+===================================================================
+--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Headers/unwind.h
++++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Headers/unwind.h
+@@ -23,9 +23,6 @@
+ 
+ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
+ 
+-#ifndef __CLANG_UNWIND_H
+-#define __CLANG_UNWIND_H
+-
+ #if defined(__APPLE__) && __has_include_next(<unwind.h>)
+ /* Darwin (from 11.x on) provide an unwind.h. If that's available,
+  * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
+@@ -53,6 +50,9 @@
+ # endif
+ #else
+ 
++#ifndef __CLANG_UNWIND_H
++#define __CLANG_UNWIND_H
++
+ #include <stdint.h>
+ 
+ #ifdef __cplusplus
+@@ -336,6 +336,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc
+ }
+ #endif
+ 
++#endif /* __CLANG_UNWIND_H */
++
+ #endif
+ 
+-#endif /* __CLANG_UNWIND_H */
author	Igor Pashev <pashev.igor@gmail.com>	2019-12-02 17:06:08 +0300
committer	Igor Pashev <pashev.igor@gmail.com>	2019-12-02 17:06:08 +0300
commit	18583eaa2c6fa769ce80605422fa10a60d353af7 (patch)
tree	4b6730afc2006e86ae8b91c8c4cf52b313b5c188 /debian/patches
download	llvm-toolchain-8-debian.tar.gz