diff -Nru llvm-toolchain-3.8-3.8.1/debian/changelog llvm-toolchain-3.8-3.8.1/debian/changelog
--- llvm-toolchain-3.8-3.8.1/debian/changelog	2016-10-25 08:53:49.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/changelog	2016-11-04 00:33:12.000000000 +0000
@@ -1,3 +1,24 @@
+llvm-toolchain-3.8 (1:3.8.1-13+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
+  * Pass armv6-* as triplet rather than arm-* to hopefully stop llvm toolchain 
+    assuming armv7. (didn't work, it appears that Debian isn't currently using
+    the autoconf based build).
+  * Cleanup .pyc files in clean target.
+  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
+    based build relies on config.guess which assumes you want to build for the
+    hardware you are running on).
+  * Remove -march=armv7-a in compiler-rt/cmake/config-ix.cmake
+  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
+    are broken on lower arm architectures.
+  [changes introduced in 1:3.8.1-12+rpi1 by Peter Michael Green]
+  * Disable testsuite, it seems to be crashing buildboxes.
+
+  [changes brought forward from 1:3.8.1-12+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Mon, 03 Oct 2016 22:58:38 +0000]
+  * Really disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Nov 2016 00:33:12 +0000
+
 llvm-toolchain-3.8 (1:3.8.1-13) unstable; urgency=medium
 
   * Fix a version issue with run-clang-tidy-3.8.py
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-3.8-doc.docs llvm-toolchain-3.8-3.8.1/debian/clang-3.8-doc.docs
--- llvm-toolchain-3.8-3.8.1/debian/clang-3.8-doc.docs	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-3.8-doc.docs	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+tools/clang/docs/_build/html/
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-3.8-examples.examples llvm-toolchain-3.8-3.8.1/debian/clang-3.8-examples.examples
--- llvm-toolchain-3.8-3.8.1/debian/clang-3.8-examples.examples	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-3.8-examples.examples	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+clang/examples/*
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-3.8.install llvm-toolchain-3.8-3.8.1/debian/clang-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/clang-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,40 @@
+usr/lib/llvm-3.8/bin/clang
+usr/lib/llvm-3.8/bin/clang++
+usr/lib/llvm-3.8/bin/clang-check
+usr/lib/llvm-3.8/bin/clang-apply-replacements
+usr/lib/llvm-3.8/bin/clang-query
+usr/lib/llvm-3.8/bin/clang-rename
+usr/lib/llvm-3.8/bin/sancov
+usr/lib/llvm-3.8/share/scan-view/
+usr/lib/llvm-3.8/share/scan-build/
+usr/lib/llvm-3.8/share/man/man1/scan-build.1
+usr/lib/llvm-3.8/libexec/ccc-analyzer
+usr/lib/llvm-3.8/libexec/c++-analyzer
+
+usr/lib/llvm-3.8/bin/scan-view
+usr/lib/llvm-3.8/bin/clang-cl
+
+usr/lib/llvm-3.8/bin/scan-build
+usr/lib/llvm-3.8/bin/modularize
+usr/lib/llvm-3.8/bin/c-index-test
+
+usr/bin/c-index-test-3.8
+
+tools/clang/tools/scan-build-3.8      usr/share/clang/
+tools/clang/tools/scan-view-3.8       usr/share/clang/
+#usr/share/man/man1/clang.1     usr/share/man/man1/
+usr/lib/llvm-3.8/share/clang/cmake/
+# todo: check if it is not be moved
+#usr/lib/llvm-3.8/lib/cmake/clang/*.cmake usr/share/llvm-3.8/cmake/
+
+usr/bin/clang-3.8
+usr/bin/clang++-3.8
+usr/bin/clang-check-3.8
+usr/bin/clang-apply-replacements-3.8
+usr/bin/clang-query-3.8
+usr/bin/clang-rename-3.8
+usr/bin/sancov-3.8
+usr/bin/clang-cl-3.8
+usr/bin/modularize-3.8
+usr/bin/scan-build-3.8
+usr/bin/scan-view-3.8
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-3.8.links llvm-toolchain-3.8-3.8.1/debian/clang-3.8.links
--- llvm-toolchain-3.8-3.8.1/debian/clang-3.8.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-3.8.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+usr/share/clang/scan-build-3.8/bin/scan-build  usr/bin/scan-build-3.8
+usr/share/clang/scan-view-3.8/bin/scan-view    usr/bin/scan-view-3.8
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-3.8.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/clang-3.8.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/clang-3.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-3.8.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,8 @@
+# I know but well...
+clang-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz
+clang-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz
+clang-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-3.8.1.gz
+clang-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-3.8.1.gz
+clang-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-3.8.1.gz
+clang-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-3.8.1.gz
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-3.8.manpages llvm-toolchain-3.8-3.8.1/debian/clang-3.8.manpages
--- llvm-toolchain-3.8-3.8.1/debian/clang-3.8.manpages	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-3.8.manpages	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,5 @@
+clang/docs/_build/man/clang-3.8.1
+clang/tools/scan-build/man/scan-build-3.8.1
+debian/man/clang-check-3.8.1
+debian/man/scan-view-3.8.1
+debian/man/clang-apply-replacements-3.8.1
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.install llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,10 @@
+clang/tools/clang-format/clang-format-3.8.py usr/share/vim/addons/syntax/
+clang/tools/clang-format/clang-format-diff-3.8 /usr/bin/
+usr/bin/clang-format-3.8
+usr/bin/git-clang-format-3.8
+usr/lib/llvm-3.8/bin/clang-format
+usr/lib/llvm-3.8/bin/git-clang-format
+usr/lib/llvm-3.8/share/clang/clang-format-diff.py usr/share/clang/clang-format-3.8/
+usr/lib/llvm-3.8/share/clang/clang-format.py usr/share/clang/clang-format-3.8/
+usr/lib/llvm-3.8/share/clang/clang-format.el usr/share/emacs/site-lisp/clang-format-3.8/
+usr/lib/llvm-3.8/share/clang/clang-format-sublime.py usr/share/clang/clang-format-3.8/
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,4 @@
+# I know but well...
+clang-format-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-diff-3.8.1.gz
+clang-format-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-3.8.1.gz
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.manpages llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.manpages
--- llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.manpages	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-format-3.8.manpages	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+debian/man/clang-format-diff-3.8.1
+debian/man/clang-format-3.8.1
+debian/man/git-clang-format-3.8.1
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.install llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,5 @@
+usr/lib/llvm-3.8/bin/clang-tidy
+usr/lib/llvm-3.8/share/clang/run-clang-tidy.py
+usr/lib/llvm-3.8/share/clang/clang-tidy-diff.py
+
+usr/bin/clang-tidy-3.8
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.links llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.links
--- llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+usr/lib/llvm-3.8/share/clang/run-clang-tidy.py usr/bin/run-clang-tidy-3.8.py
+usr/lib/llvm-3.8/share/clang/clang-tidy-diff.py usr/bin/clang-tidy-diff-3.8.py
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+# I know but well...
+clang-tidy-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-3.8.1.gz
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.manpages llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.manpages
--- llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.manpages	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/clang-tidy-3.8.manpages	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+debian/man/clang-tidy-3.8.1
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.install llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/llvm-3.8/lib/libclang-3.8.so.1 /usr/lib/arm-linux-gnueabihf/
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.links llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.links
--- llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+# as upstream
+usr/lib/arm-linux-gnueabihf/libclang-3.8.so.1 usr/lib/llvm-3.8/lib/libclang-3.8.so.1
+usr/lib/llvm-3.8/lib/libclang-3.8.so.1 usr/lib/llvm-3.8/lib/libclang.so.1
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,5 @@
+# I know and I am not planning to change that yet.
+libclang1-3.8: package-name-doesnt-match-sonames libclang1-3.8-1
+# Provided as transition
+libclang1-3.8: dev-pkg-without-shlib-symlink usr/lib/*/libclang-3.8.so.1 usr/lib/*/libclang.so
+libclang1-3.8: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.symbols llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.symbols
--- llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.symbols	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libclang1-3.8.symbols	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,323 @@
+libclang-3.8.so.1 libclang1-3.8 #MINVER#
+ clang_BlockCommandComment_getArgText@Base 3.2
+ clang_BlockCommandComment_getCommandName@Base 3.2
+ clang_BlockCommandComment_getNumArgs@Base 3.2
+ clang_BlockCommandComment_getParagraph@Base 3.2
+ clang_CXCursorSet_contains@Base 3.2
+ clang_CXCursorSet_insert@Base 3.2
+ clang_CXIndex_getGlobalOptions@Base 3.2
+ clang_CXIndex_setGlobalOptions@Base 3.2
+ clang_CXXField_isMutable@Base 3.8
+ clang_CXXMethod_isConst@Base 3.4
+ clang_CXXMethod_isPureVirtual@Base 3.4
+ clang_CXXMethod_isStatic@Base 3.2
+ clang_CXXMethod_isVirtual@Base 3.2
+ clang_Comment_getChild@Base 3.2
+ clang_Comment_getKind@Base 3.2
+ clang_Comment_getNumChildren@Base 3.2
+ clang_Comment_isWhitespace@Base 3.2
+ clang_CompilationDatabase_dispose@Base 3.2
+ clang_CompilationDatabase_fromDirectory@Base 3.2
+ clang_CompilationDatabase_getAllCompileCommands@Base 3.4
+ clang_CompilationDatabase_getCompileCommands@Base 3.2
+ clang_CompileCommand_getArg@Base 3.2
+ clang_CompileCommand_getDirectory@Base 3.2
+ clang_CompileCommand_getFilename@Base 3.8
+ clang_CompileCommand_getMappedSourceContent@Base 3.8
+ clang_CompileCommand_getMappedSourcePath@Base 3.8
+ clang_CompileCommand_getNumArgs@Base 3.2
+ clang_CompileCommands_dispose@Base 3.2
+ clang_CompileCommands_getCommand@Base 3.2
+ clang_CompileCommands_getSize@Base 3.2
+ clang_Cursor_getArgument@Base 3.2
+ clang_Cursor_getBriefCommentText@Base 3.2
+ clang_Cursor_getCXXManglings@Base 3.8
+ clang_Cursor_getCommentRange@Base 3.2
+ clang_Cursor_getMangling@Base 3.6
+ clang_Cursor_getModule@Base 3.2
+ clang_Cursor_getNumArguments@Base 3.2
+ clang_Cursor_getNumTemplateArguments@Base 3.6
+ clang_Cursor_getObjCDeclQualifiers@Base 3.4
+ clang_Cursor_getObjCPropertyAttributes@Base 3.4
+ clang_Cursor_getObjCSelectorIndex@Base 3.2
+ clang_Cursor_getOffsetOfField@Base 3.7
+ clang_Cursor_getParsedComment@Base 3.2
+ clang_Cursor_getRawCommentText@Base 3.2
+ clang_Cursor_getReceiverType@Base 3.2
+ clang_Cursor_getSpellingNameRange@Base 3.2
+ clang_Cursor_getStorageClass@Base 3.6
+ clang_Cursor_getTemplateArgumentKind@Base 3.6
+ clang_Cursor_getTemplateArgumentType@Base 3.6
+ clang_Cursor_getTemplateArgumentUnsignedValue@Base 3.6
+ clang_Cursor_getTemplateArgumentValue@Base 3.6
+ clang_Cursor_getTranslationUnit@Base 3.2
+ clang_Cursor_isAnonymous@Base 3.7
+ clang_Cursor_isBitField@Base 3.4
+ clang_Cursor_isDynamicCall@Base 3.2
+ clang_Cursor_isNull@Base 3.2
+ clang_Cursor_isObjCOptional@Base 3.4
+ clang_Cursor_isVariadic@Base 3.4
+ clang_File_isEqual@Base 3.6
+ clang_FullComment_getAsHTML@Base 3.2
+ clang_FullComment_getAsXML@Base 3.2
+ clang_HTMLStartTagComment_isSelfClosing@Base 3.2
+ clang_HTMLStartTag_getAttrName@Base 3.2
+ clang_HTMLStartTag_getAttrValue@Base 3.2
+ clang_HTMLStartTag_getNumAttrs@Base 3.2
+ clang_HTMLTagComment_getAsString@Base 3.2
+ clang_HTMLTagComment_getTagName@Base 3.2
+ clang_IndexAction_create@Base 3.2
+ clang_IndexAction_dispose@Base 3.2
+ clang_InlineCommandComment_getArgText@Base 3.2
+ clang_InlineCommandComment_getCommandName@Base 3.2
+ clang_InlineCommandComment_getNumArgs@Base 3.2
+ clang_InlineCommandComment_getRenderKind@Base 3.2
+ clang_InlineContentComment_hasTrailingNewline@Base 3.2
+ clang_Location_isFromMainFile@Base 3.4
+ clang_Location_isInSystemHeader@Base 3.4
+ clang_ModuleMapDescriptor_create@Base 3.6
+ clang_ModuleMapDescriptor_dispose@Base 3.6
+ clang_ModuleMapDescriptor_setFrameworkModuleName@Base 3.6
+ clang_ModuleMapDescriptor_setUmbrellaHeader@Base 3.6
+ clang_ModuleMapDescriptor_writeToBuffer@Base 3.6
+ clang_Module_getASTFile@Base 3.4
+ clang_Module_getFullName@Base 3.2
+ clang_Module_getName@Base 3.2
+ clang_Module_getNumTopLevelHeaders@Base 3.2
+ clang_Module_getParent@Base 3.2
+ clang_Module_getTopLevelHeader@Base 3.2
+ clang_Module_isSystem@Base 3.6
+ clang_ParamCommandComment_getDirection@Base 3.2
+ clang_ParamCommandComment_getParamIndex@Base 3.2
+ clang_ParamCommandComment_getParamName@Base 3.2
+ clang_ParamCommandComment_isDirectionExplicit@Base 3.2
+ clang_ParamCommandComment_isParamIndexValid@Base 3.2
+ clang_Range_isNull@Base 3.2
+ clang_TParamCommandComment_getDepth@Base 3.2
+ clang_TParamCommandComment_getIndex@Base 3.2
+ clang_TParamCommandComment_getParamName@Base 3.2
+ clang_TParamCommandComment_isParamPositionValid@Base 3.2
+ clang_TextComment_getText@Base 3.2
+ clang_Type_getAlignOf@Base 3.4
+ clang_Type_getCXXRefQualifier@Base 3.4
+ clang_Type_getClassType@Base 3.4
+ clang_Type_getNumTemplateArguments@Base 3.6
+ clang_Type_getOffsetOf@Base 3.4
+ clang_Type_getSizeOf@Base 3.4
+ clang_Type_getTemplateArgumentAsType@Base 3.6
+ clang_Type_visitFields@Base 3.7
+ clang_VerbatimBlockLineComment_getText@Base 3.2
+ clang_VerbatimLineComment_getText@Base 3.2
+ clang_VirtualFileOverlay_addFileMapping@Base 3.6
+ clang_VirtualFileOverlay_create@Base 3.6
+ clang_VirtualFileOverlay_dispose@Base 3.6
+ clang_VirtualFileOverlay_setCaseSensitivity@Base 3.6
+ clang_VirtualFileOverlay_writeToBuffer@Base 3.6
+ clang_annotateTokens@Base 3.2
+ clang_codeCompleteAt@Base 3.2
+ clang_codeCompleteGetContainerKind@Base 3.2
+ clang_codeCompleteGetContainerUSR@Base 3.2
+ clang_codeCompleteGetContexts@Base 3.2
+ clang_codeCompleteGetDiagnostic@Base 3.2
+ clang_codeCompleteGetNumDiagnostics@Base 3.2
+ clang_codeCompleteGetObjCSelector@Base 3.2
+ clang_constructUSR_ObjCCategory@Base 3.2
+ clang_constructUSR_ObjCClass@Base 3.2
+ clang_constructUSR_ObjCIvar@Base 3.2
+ clang_constructUSR_ObjCMethod@Base 3.2
+ clang_constructUSR_ObjCProperty@Base 3.2
+ clang_constructUSR_ObjCProtocol@Base 3.2
+ clang_createCXCursorSet@Base 3.2
+ clang_createIndex@Base 3.2
+ clang_createTranslationUnit2@Base 3.6
+ clang_createTranslationUnit@Base 3.2
+ clang_createTranslationUnitFromSourceFile@Base 3.2
+ clang_defaultCodeCompleteOptions@Base 3.2
+ clang_defaultDiagnosticDisplayOptions@Base 3.2
+ clang_defaultEditingTranslationUnitOptions@Base 3.2
+ clang_defaultReparseOptions@Base 3.2
+ clang_defaultSaveOptions@Base 3.2
+ clang_disposeCXCursorSet@Base 3.2
+ clang_disposeCXPlatformAvailability@Base 3.2
+ clang_disposeCXTUResourceUsage@Base 3.2
+ clang_disposeCodeCompleteResults@Base 3.2
+ clang_disposeDiagnostic@Base 3.2
+ clang_disposeDiagnosticSet@Base 3.2
+ clang_disposeIndex@Base 3.2
+ clang_disposeOverriddenCursors@Base 3.2
+ clang_disposeSourceRangeList@Base 3.6
+ clang_disposeString@Base 3.2
+ clang_disposeStringSet@Base 3.8
+ clang_disposeTokens@Base 3.2
+ clang_disposeTranslationUnit@Base 3.2
+ clang_enableStackTraces@Base 3.2
+ clang_equalCursors@Base 3.2
+ clang_equalLocations@Base 3.2
+ clang_equalRanges@Base 3.2
+ clang_equalTypes@Base 3.2
+ clang_executeOnThread@Base 3.2
+ clang_findIncludesInFile@Base 3.4
+ clang_findIncludesInFileWithBlock@Base 3.4
+ clang_findReferencesInFile@Base 3.2
+ clang_findReferencesInFileWithBlock@Base 3.2
+ clang_formatDiagnostic@Base 3.2
+ clang_free@Base 3.7
+ clang_getArgType@Base 3.2
+ clang_getArrayElementType@Base 3.2
+ clang_getArraySize@Base 3.2
+ clang_getBuildSessionTimestamp@Base 3.6
+ clang_getCString@Base 3.2
+ clang_getCXTUResourceUsage@Base 3.2
+ clang_getCXXAccessSpecifier@Base 3.2
+ clang_getCanonicalCursor@Base 3.2
+ clang_getCanonicalType@Base 3.2
+ clang_getChildDiagnostics@Base 3.2
+ clang_getClangVersion@Base 3.2
+ clang_getCompletionAnnotation@Base 3.2
+ clang_getCompletionAvailability@Base 3.2
+ clang_getCompletionBriefComment@Base 3.2
+ clang_getCompletionChunkCompletionString@Base 3.2
+ clang_getCompletionChunkKind@Base 3.2
+ clang_getCompletionChunkText@Base 3.2
+ clang_getCompletionNumAnnotations@Base 3.2
+ clang_getCompletionParent@Base 3.2
+ clang_getCompletionPriority@Base 3.2
+ clang_getCursor@Base 3.2
+ clang_getCursorAvailability@Base 3.2
+ clang_getCursorCompletionString@Base 3.2
+ clang_getCursorDefinition@Base 3.2
+ clang_getCursorDisplayName@Base 3.2
+ clang_getCursorExtent@Base 3.2
+ clang_getCursorKind@Base 3.2
+ clang_getCursorKindSpelling@Base 3.2
+ clang_getCursorLanguage@Base 3.2
+ clang_getCursorLexicalParent@Base 3.2
+ clang_getCursorLinkage@Base 3.2
+ clang_getCursorLocation@Base 3.2
+ clang_getCursorPlatformAvailability@Base 3.2
+ clang_getCursorReferenceNameRange@Base 3.2
+ clang_getCursorReferenced@Base 3.2
+ clang_getCursorResultType@Base 3.2
+ clang_getCursorSemanticParent@Base 3.2
+ clang_getCursorSpelling@Base 3.2
+ clang_getCursorType@Base 3.2
+ clang_getCursorUSR@Base 3.2
+ clang_getCursorVisibility@Base 3.8
+ clang_getDeclObjCTypeEncoding@Base 3.2
+ clang_getDefinitionSpellingAndExtent@Base 3.2
+ clang_getDiagnostic@Base 3.2
+ clang_getDiagnosticCategory@Base 3.2
+ clang_getDiagnosticCategoryName@Base 3.2
+ clang_getDiagnosticCategoryText@Base 3.2
+ clang_getDiagnosticFixIt@Base 3.2
+ clang_getDiagnosticInSet@Base 3.2
+ clang_getDiagnosticLocation@Base 3.2
+ clang_getDiagnosticNumFixIts@Base 3.2
+ clang_getDiagnosticNumRanges@Base 3.2
+ clang_getDiagnosticOption@Base 3.2
+ clang_getDiagnosticRange@Base 3.2
+ clang_getDiagnosticSetFromTU@Base 3.2
+ clang_getDiagnosticSeverity@Base 3.2
+ clang_getDiagnosticSpelling@Base 3.2
+ clang_getElementType@Base 3.2
+ clang_getEnumConstantDeclUnsignedValue@Base 3.2
+ clang_getEnumConstantDeclValue@Base 3.2
+ clang_getEnumDeclIntegerType@Base 3.2
+ clang_getExpansionLocation@Base 3.2
+ clang_getFieldDeclBitWidth@Base 3.4
+ clang_getFile@Base 3.2
+ clang_getFileLocation@Base 3.4
+ clang_getFileName@Base 3.2
+ clang_getFileTime@Base 3.2
+ clang_getFileUniqueID@Base 3.4
+ clang_getFunctionTypeCallingConv@Base 3.2
+ clang_getIBOutletCollectionType@Base 3.2
+ clang_getIncludedFile@Base 3.2
+ clang_getInclusions@Base 3.2
+ clang_getInstantiationLocation@Base 3.2
+ clang_getLocation@Base 3.2
+ clang_getLocationForOffset@Base 3.2
+ clang_getModuleForFile@Base 3.6
+ clang_getNullCursor@Base 3.2
+ clang_getNullLocation@Base 3.2
+ clang_getNullRange@Base 3.2
+ clang_getNumArgTypes@Base 3.2
+ clang_getNumCompletionChunks@Base 3.2
+ clang_getNumDiagnostics@Base 3.2
+ clang_getNumDiagnosticsInSet@Base 3.2
+ clang_getNumElements@Base 3.2
+ clang_getNumOverloadedDecls@Base 3.2
+ clang_getOverloadedDecl@Base 3.2
+ clang_getOverriddenCursors@Base 3.2
+ clang_getPointeeType@Base 3.2
+ clang_getPresumedLocation@Base 3.2
+ clang_getRange@Base 3.2
+ clang_getRangeEnd@Base 3.2
+ clang_getRangeStart@Base 3.2
+ clang_getRemappings@Base 3.2
+ clang_getRemappingsFromFileList@Base 3.2
+ clang_getResultType@Base 3.2
+ clang_getSkippedRanges@Base 3.6
+ clang_getSpecializedCursorTemplate@Base 3.2
+ clang_getSpellingLocation@Base 3.2
+ clang_getTUResourceUsageName@Base 3.2
+ clang_getTemplateCursorKind@Base 3.2
+ clang_getTokenExtent@Base 3.2
+ clang_getTokenKind@Base 3.2
+ clang_getTokenLocation@Base 3.2
+ clang_getTokenSpelling@Base 3.2
+ clang_getTranslationUnitCursor@Base 3.2
+ clang_getTranslationUnitSpelling@Base 3.2
+ clang_getTypeDeclaration@Base 3.2
+ clang_getTypeKindSpelling@Base 3.2
+ clang_getTypeSpelling@Base 3.4
+ clang_getTypedefDeclUnderlyingType@Base 3.2
+ clang_hashCursor@Base 3.2
+ clang_indexLoc_getCXSourceLocation@Base 3.2
+ clang_indexLoc_getFileLocation@Base 3.2
+ clang_indexSourceFile@Base 3.2
+ clang_indexSourceFileFullArgv@Base 3.8
+ clang_indexTranslationUnit@Base 3.2
+ clang_index_getCXXClassDeclInfo@Base 3.2
+ clang_index_getClientContainer@Base 3.2
+ clang_index_getClientEntity@Base 3.2
+ clang_index_getIBOutletCollectionAttrInfo@Base 3.2
+ clang_index_getObjCCategoryDeclInfo@Base 3.2
+ clang_index_getObjCContainerDeclInfo@Base 3.2
+ clang_index_getObjCInterfaceDeclInfo@Base 3.2
+ clang_index_getObjCPropertyDeclInfo@Base 3.2
+ clang_index_getObjCProtocolRefListInfo@Base 3.2
+ clang_index_isEntityObjCContainerKind@Base 3.2
+ clang_index_setClientContainer@Base 3.2
+ clang_index_setClientEntity@Base 3.2
+ clang_isAttribute@Base 3.2
+ clang_isConstQualifiedType@Base 3.2
+ clang_isCursorDefinition@Base 3.2
+ clang_isDeclaration@Base 3.2
+ clang_isExpression@Base 3.2
+ clang_isFileMultipleIncludeGuarded@Base 3.2
+ clang_isFunctionTypeVariadic@Base 3.2
+ clang_isInvalid@Base 3.2
+ clang_isPODType@Base 3.2
+ clang_isPreprocessing@Base 3.2
+ clang_isReference@Base 3.2
+ clang_isRestrictQualifiedType@Base 3.2
+ clang_isStatement@Base 3.2
+ clang_isTranslationUnit@Base 3.2
+ clang_isUnexposed@Base 3.2
+ clang_isVirtualBase@Base 3.2
+ clang_isVolatileQualifiedType@Base 3.2
+ clang_loadDiagnostics@Base 3.2
+ clang_parseTranslationUnit2@Base 3.6
+ clang_parseTranslationUnit2FullArgv@Base 3.8
+ clang_parseTranslationUnit@Base 3.2
+ clang_remap_dispose@Base 3.2
+ clang_remap_getFilenames@Base 3.2
+ clang_remap_getNumFiles@Base 3.2
+ clang_reparseTranslationUnit@Base 3.2
+ clang_saveTranslationUnit@Base 3.2
+ clang_sortCodeCompletionResults@Base 3.2
+ clang_toggleCrashRecovery@Base 3.2
+ clang_tokenize@Base 3.2
+ clang_visitChildren@Base 3.2
+ clang_visitChildrenWithBlock@Base 3.2
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libclang-3.8-dev.install llvm-toolchain-3.8-3.8.1/debian/libclang-3.8-dev.install
--- llvm-toolchain-3.8-3.8.1/debian/libclang-3.8-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libclang-3.8-dev.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,9 @@
+usr/lib/llvm-3.8/include/clang
+usr/lib/llvm-3.8/include/clang-c
+usr/lib/llvm-3.8/lib/libclang*a
+usr/lib/llvm-3.8/lib/libclang*so
+
+#usr/include/clang                  /usr/include/
+#usr/include/clang-c                /usr/include/
+#usr/lib/libclang.so                /usr/lib/
+#usr/lib/libclang*a                 /usr/lib/
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libclang-3.8-dev.links llvm-toolchain-3.8-3.8.1/debian/libclang-3.8-dev.links
--- llvm-toolchain-3.8-3.8.1/debian/libclang-3.8-dev.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libclang-3.8-dev.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+usr/lib/arm-linux-gnueabihf/libclang-3.8.so.1 usr/lib/arm-linux-gnueabihf/libclang-3.8.so
+usr/lib/arm-linux-gnueabihf/libclang-3.8.so.1 usr/lib/llvm-3.8/lib/libclang.so
+usr/lib/arm-linux-gnueabihf/libclang-3.8.so.1 usr/lib/llvm-3.8/lib/libclang-3.8.so
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libclang-common-3.8-dev.install llvm-toolchain-3.8-3.8.1/debian/libclang-common-3.8-dev.install
--- llvm-toolchain-3.8-3.8.1/debian/libclang-common-3.8-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libclang-common-3.8-dev.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,14 @@
+usr/lib/llvm-3.8/lib/clang/3.8.1/include
+
+usr/lib/llvm-3.8/lib/clang/3.8.1/lib
+usr/lib/llvm-3.8/lib/clang/3.8.1/*.txt
+
+#usr/lib/clang/3.8.1/lib             /usr/lib/clang/3.8/
+#usr/lib/clang/3.8.1/include/         /usr/include/clang/3.8/
+
+usr/lib/llvm-3.8/bin/clang-tblgen
+usr/lib/llvm-3.8/bin/yaml-bench
+
+usr/bin/clang-tblgen-3.8
+usr/bin/yaml-bench-3.8
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libclang-common-3.8-dev.links llvm-toolchain-3.8-3.8.1/debian/libclang-common-3.8-dev.links
--- llvm-toolchain-3.8-3.8.1/debian/libclang-common-3.8-dev.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libclang-common-3.8-dev.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,7 @@
+usr/lib/llvm-3.8/lib/clang/3.8.1/include usr/include/clang/3.8/include
+usr/lib/llvm-3.8/lib/clang/3.8.1/include usr/lib/clang/3.8/include
+usr/lib/llvm-3.8/lib/clang/3.8.1/lib usr/lib/clang/3.8/lib
+usr/lib/llvm-3.8/lib/clang/3.8.1/include usr/include/clang/3.8.1/include
+usr/lib/llvm-3.8/lib/clang/3.8.1/include usr/lib/clang/3.8.1/include
+usr/lib/llvm-3.8/lib/clang/3.8.1/lib usr/lib/clang/3.8.1/lib
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8-dev.install llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8-dev.install
--- llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8-dev.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,5 @@
+/usr/lib/llvm-3.8/include/lldb
+/usr/lib/llvm-3.8/lib/liblldb*a
+/usr/lib/llvm-3.8/lib/liblldb*so
+
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.install llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/llvm-3.8/lib/liblldb-3.8.so.1 /usr/lib/arm-linux-gnueabihf/
+usr/lib/llvm-3.8/lib/python2.7/site-packages/readline.so
diff -Nru llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.links llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.links
--- llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+usr/lib/arm-linux-gnueabihf/liblldb-3.8.so.1       usr/lib/arm-linux-gnueabihf/liblldb-3.8.so
+usr/lib/arm-linux-gnueabihf/liblldb-3.8.so.1       usr/lib/llvm-3.8/lib/liblldb.so.1
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/liblldb-3.8.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,5 @@
+# That is normal. The lib is not (yet?) shipped as a new package
+liblldb-3.8: package-name-doesnt-match-sonames liblldb-3.8-1
+# For now, override this warning. We might create a -dev at some point
+liblldb-3.8: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
+liblldb-3.8: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-3.8.so.1 usr/lib/*/liblldb-3.8.so
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.install llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/llvm-3.8/lib/libLLVM-3.8.so.1 /usr/lib/arm-linux-gnueabihf/
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.links llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.links
--- llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,4 @@
+# Should be uncommented for 3.8.1 and other
+# usr/lib/llvm-3.8/lib/libLLVM-3.8.so.1 /usr/lib/arm-linux-gnueabihf/libLLVM-3.8.so.1
+usr/lib/arm-linux-gnueabihf/libLLVM-3.8.so.1    /usr/lib/arm-linux-gnueabihf/libLLVM-3.8.so
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libllvm3.8.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+# That is normal. Upstream does not match the debian convention
+libllvm3.8: package-name-doesnt-match-sonames libLLVM-3.8-1
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.dirs llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.dirs
--- llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.dirs	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.dirs	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+/usr/lib/ocaml/META/
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.install llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.install
--- llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+#/usr/lib/ocaml/llvm-3.8	/usr/lib/ocaml/
+#usr/lib/llvm-3.8/docs/llvm/ocamldoc/html	usr/share/doc/libllvm-3.8-ocaml-dev/
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+# It is in the section ocaml which is fine.
+libllvm-3.8-ocaml-dev: wrong-section-according-to-package-name libllvm-3.8-ocaml-dev => libdevel
diff -Nru llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.META llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.META
--- llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.META	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/libllvm-3.8-ocaml-dev.META	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,63 @@
+description = "Low Level Virtual Machine bindings"
+version = "3.8"
+
+directory = "+llvm-3.8"
+
+archive(byte)   = "llvm.cma"
+archive(native) = "llvm.cmxa"
+linkopts = "-cclib -lstdc++ -cclib -lllvm"
+
+package "executionengine"
+(
+  requires = "llvm-3.8"
+  version = "3.8"
+  archive(native) = "llvm_executionengine.cmxa"
+  archive(byte)   = "llvm_executionengine.cma"
+  linkopts = "-cclib -lllvm_executionengine"
+)
+
+package "target"
+(
+  requires = "llvm-3.8"
+  version = "3.8"
+  archive(native) = "llvm_target.cmxa"
+  archive(byte)   = "llvm_target.cma"
+  linkopts = "-cclib -lllvm_target"
+)
+
+package "scalar_opts"
+(
+  requires = "llvm-3.8 llvm-3.8.target"
+  version = "3.8"
+  archive(native) = "llvm_scalar_opts.cmxa"
+  archive(byte)   = "llvm_scalar_opts.cma"
+  linkopts = "-cclib -lllvm_scalar_opts"
+)
+
+package "analysis"
+(
+  requires = "llvm-3.8"
+  version = "3.8"
+  archive(native) = "llvm_analysis.cmxa"
+  archive(byte)   = "llvm_analysis.cma"
+  linkopts = "-cclib -lllvm_analysis"
+)
+
+package "bitwriter"
+(
+  requires = "llvm-3.8"
+  version = "3.8"
+  archive(native) = "llvm_bitwriter.cmxa"
+  archive(byte)   = "llvm_bitwriter.cma"
+  linkopts = "-cclib -lllvm_bitwriter"
+)
+
+package "bitreader"
+(
+  requires = "llvm-3.8 llvm-3.8.bitwriter"
+  version = "3.8"
+  archive(native) = "llvm_bitreader.cmxa"
+  archive(byte)   = "llvm_bitreader.cma"
+  linkopts = "-cclib -lllvm_bitreader"
+)
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.install llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,9 @@
+usr/lib/llvm-3.8/bin/lldb*
+usr/lib/llvm-3.8/bin/lldb-mi*
+usr/lib/llvm-3.8/bin/lldb-server*
+usr/lib/llvm-3.8/bin/lldb-argdumper
+
+usr/bin/lldb-3.8*
+usr/bin/lldb-server-3.8*
+usr/bin/lldb-mi-3.8*
+usr/bin/lldb-argdumper-3.8
diff -Nru llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+lldb-3.8: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
+# Does not really matter
+lldb-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-3.8.1.gz
diff -Nru llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.manpages llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.manpages
--- llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.manpages	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.manpages	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+debian/man/lldb-3.8.1
+debian/man/lldb-mi-3.8.1
diff -Nru llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.postinst llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.postinst
--- llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.postinst	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/lldb-3.8.postinst	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]
+then
+        ldconfig
+fi
+
+#DEBHELPER#
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.dirs llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.dirs
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.dirs	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.dirs	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,5 @@
+/usr/lib/llvm-3.8/lib
+/usr/lib/llvm-3.8/build
+/usr/lib/llvm-3.8/include
+usr/share/doc/llvm-3.8-dev
+usr/share/emacs/site-lisp/llvm-3.8
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.install llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.install
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,31 @@
+usr/lib/llvm-3.8/lib/libLLVM*.a
+#usr/lib/llvm-3.8/lib/libllvm*.a
+usr/lib/llvm-3.8/lib/LLVM*.so
+usr/lib/llvm-3.8/lib/libLLVM.so
+usr/lib/llvm-3.8/lib/libLLVM-3.8.so
+usr/lib/llvm-3.8/lib/libLLVM-3.8.1.so
+usr/lib/llvm-3.8/lib/libLTO.*
+usr/lib/llvm-3.8/lib/BugpointPasses.so
+usr/lib/llvm-3.8/include/llvm/      usr/include/llvm-3.8/
+usr/lib/llvm-3.8/include/llvm-c/	usr/include/llvm-c-3.8/
+# Explicit debian/tmp since there are multiple declarations
+debian/tmp/usr/lib/llvm-3.8/share/llvm/cmake/*.cmake
+
+utils/vim/indent/llvm-3.8.vim		        usr/share/vim/addons/indent/
+
+utils/vim/syntax/llvm-3.8.vim		        usr/share/vim/addons/syntax/
+utils/vim/syntax/tablegen-3.8.vim		    usr/share/vim/addons/syntax/
+
+utils/vim/ftdetect/llvm-3.8.vim		        usr/share/vim/addons/ftdetect/
+utils/vim/ftdetect/tablegen-3.8.vim		    usr/share/vim/addons/ftdetect/
+
+utils/vim/ftplugin/llvm-3.8.vim		        usr/share/vim/addons/ftplugin/
+utils/vim/ftplugin/tablegen-3.8.vim		    usr/share/vim/addons/ftplugin/
+
+utils/vim/llvm-3.8-vimrc		            usr/share/vim/addons
+
+
+utils/emacs/emacs.el		    usr/share/emacs/site-lisp/llvm-3.8/
+utils/emacs/llvm-mode.el	    usr/share/emacs/site-lisp/llvm-3.8/
+utils/emacs/tablegen-mode.el	usr/share/emacs/site-lisp/llvm-3.8/
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.links llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.links
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-dev.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,18 @@
+usr/lib/arm-linux-gnueabihf/libLLVM-3.8.so.1       usr/lib/llvm-3.8/lib/libLLVM-3.8.so
+usr/lib/arm-linux-gnueabihf/libLLVM-3.8.so.1       usr/lib/llvm-3.8/lib/libLLVM-3.8.so.1
+usr/lib/arm-linux-gnueabihf/libLLVM-3.8.so.1       usr/lib/llvm-3.8/lib/libLLVM-3.8.1.so.1
+usr/lib/arm-linux-gnueabihf/libLLVM-3.8.so.1       usr/lib/llvm-3.8/lib/libLLVM-3.8.1.so
+usr/lib/arm-linux-gnueabihf/libLLVM-3.8.so.1       usr/lib/arm-linux-gnueabihf/libLLVM-3.8.1.so.1
+
+usr/include/llvm-c-3.8/llvm-c usr/lib/llvm-3.8/include/llvm-c
+usr/include/llvm-3.8/llvm usr/lib/llvm-3.8/include/llvm
+usr/include/llvm-c-3.8/llvm-c usr/lib/llvm-3.8/build/include/llvm-c
+usr/include/llvm-3.8/llvm usr/lib/llvm-3.8/build/include/llvm
+
+usr/lib/llvm-3.8/include/ usr/lib/llvm-3.8/build/include
+usr/lib/llvm-3.8/lib/     usr/lib/llvm-3.8/build/lib
+usr/lib/llvm-3.8/share/   usr/lib/llvm-3.8/build/share
+usr/lib/llvm-3.8/ usr/lib/llvm-3.8/build/Release
+usr/lib/llvm-3.8/ usr/lib/llvm-3.8/build/Debug+Asserts
+
+usr/lib/llvm-3.8/share/llvm/cmake usr/share/llvm-3.8/cmake
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.dirs llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.dirs
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.dirs	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.dirs	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+/usr/lib/llvm-3.8/bin
+usr/share/man/man1
+usr/share/doc/llvm-3.8
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-doc.dirs llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-doc.dirs
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-doc.dirs	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-doc.dirs	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+usr/share/doc/llvm-3.8-doc
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-doc.install llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-doc.install
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-doc.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-doc.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,6 @@
+docs/_build/html usr/share/doc/llvm-3.8-doc/
+#usr/lib/llvm-3.8/docs/llvm/html.tar.gz
+#usr/lib/llvm-3.8/docs/llvm/ocamldoc.tar.gz
+#usr/lib/llvm-3.8/docs/llvm/html/Dummy.html
+#usr/lib/llvm-3.8/docs/llvm/html/doxygen.css
+#usr/lib/llvm-3.8/docs/llvm/html/LibASTMatchersReference.html
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.dirs llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.dirs
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.dirs	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.dirs	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+usr/share/doc/llvm-3.8-examples
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.examples llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.examples
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.examples	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.examples	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+examples/*
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.links llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.links
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-examples.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+/usr/lib/llvm-3.8/build/Makefile.common	usr/share/doc/llvm-3.8-examples/Makefile.common
+/usr/lib/llvm-3.8/build/Makefile.config	usr/share/doc/llvm-3.8-examples/Makefile.config
+/usr/lib/llvm-3.8/build/Makefile.rules	usr/share/doc/llvm-3.8-examples/Makefile.rules
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.install llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,14 @@
+usr/lib/llvm-3.8/bin/llvm-*
+usr/lib/llvm-3.8/bin/opt*
+usr/lib/llvm-3.8/bin/bugpoint*
+usr/lib/llvm-3.8/bin/llc*
+usr/lib/llvm-3.8/bin/obj2yaml
+usr/lib/llvm-3.8/bin/yaml2obj
+usr/lib/llvm-3.8/bin/verify-uselistorder
+usr/bin/llvm-*
+usr/bin/opt*
+usr/bin/bugpoint*
+usr/bin/llc*
+usr/bin/obj2yaml-*
+usr/bin/yaml2obj-*
+usr/bin/verify-uselistorder-*
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.links llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.links
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+# AUTOGENERATED in debian/rules.d/binary.mk.
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,8 @@
+# I know but well...
+llvm-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-dwarfdump-3.8.1.gz
+llvm-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mc-3.8.1.gz
+llvm-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mcmarkup-3.8.1.gz
+llvm-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-objdump-3.8.1.gz
+llvm-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rtdyld-3.8.1.gz
+llvm-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-3.8.1.gz
+llvm-3.8: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-ranlib-3.8.1.gz
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.manpages llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.manpages
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.manpages	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8.manpages	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,9 @@
+docs/_build/man/*
+debian/man/llvm-dwarfdump-3.8.1
+debian/man/llvm-mc-3.8.1
+debian/man/llvm-mcmarkup-3.8.1
+debian/man/llvm-objdump-3.8.1
+debian/man/llvm-rtdyld-3.8.1
+debian/man/llvm-size-3.8.1
+debian/man/llvm-ranlib-3.8.1
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.binfmt llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.binfmt
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.binfmt	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.binfmt	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,3 @@
+package llvm-3.8-runtime
+interpreter /usr/bin/lli-3.8
+magic BC
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.install llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.install
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,6 @@
+usr/lib/llvm-3.8/bin/lli
+
+usr/bin/lli-3.8
+
+debian/llvm-3.8-runtime.binfmt                  usr/share/binfmts/
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.links llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.links
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+# AUTOGENERATED in debian/rules.d/binary.mk.
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.lintian-overrides llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.lintian-overrides
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.lintian-overrides	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+llvm-3.8-runtime: binary-without-manpage usr/bin/lli-child-target-3.8
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.manpages llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.manpages
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.manpages	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.manpages	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+debian/man/lli*
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.postinst llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.postinst
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.postinst	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.postinst	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = "configure"; then
+    if test -x /usr/sbin/update-binfmts; then
+        update-binfmts --import llvm-3.8-runtime.binfmt || true
+    fi
+fi
+
+#DEBHELPER#
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.prerm llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.prerm
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.prerm	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-runtime.prerm	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = "remove"; then
+    if test -x /usr/sbin/update-binfmts; then
+        update-binfmts --package llvm-3.8-runtime \
+            --remove llvm-3.8-runtime.binfmt /usr/bin/lli-3.8 || true
+        if test -f /var/lib/binfmts/llvm-3.8.binfmt; then
+            # Purge old file
+            update-binfmts --package llvm-3.8-runtime \
+                --remove llvm-3.8.binfmt /usr/bin/lli-3.8 || true
+        fi
+    fi
+fi
+
+#DEBHELPER#
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-tools.dirs llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-tools.dirs
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-tools.dirs	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-tools.dirs	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,2 @@
+/usr/lib/llvm-3.8/build/unittests
+/usr/lib/llvm-3.8/build/utils/lit/
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-tools.install llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-tools.install
--- llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-tools.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-3.8-tools.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,9 @@
+usr/lib/llvm-3.8/bin/count
+usr/lib/llvm-3.8/bin/FileCheck
+usr/lib/llvm-3.8/bin/not
+
+utils/lit/*             /usr/lib/llvm-3.8/build/utils/lit/
+
+usr/bin/count-3.8
+usr/bin/FileCheck-3.8
+usr/bin/not-3.8
diff -Nru llvm-toolchain-3.8-3.8.1/debian/patches/cmake-arm-version-hack.patch llvm-toolchain-3.8-3.8.1/debian/patches/cmake-arm-version-hack.patch
--- llvm-toolchain-3.8-3.8.1/debian/patches/cmake-arm-version-hack.patch	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/patches/cmake-arm-version-hack.patch	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,41 @@
+Description: Add a hack to the cmake based build to force armv6 
+     unfortunately the cmake based build relies on config.guess 
+     (and gives no way to override it) and config.guess assumes you want
+     to build for the hardware you are running on).
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: llvm-toolchain-3.8-3.8/cmake/modules/GetHostTriple.cmake
+===================================================================
+--- llvm-toolchain-3.8-3.8.orig/cmake/modules/GetHostTriple.cmake
++++ llvm-toolchain-3.8-3.8/cmake/modules/GetHostTriple.cmake
+@@ -15,7 +15,7 @@ function( get_host_triple var )
+       set( value "i686-pc-mingw32" )
+     endif()
+   else( MSVC )
+-    set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess)
++    set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess.hack)
+     execute_process(COMMAND sh ${config_guess}
+       RESULT_VARIABLE TT_RV
+       OUTPUT_VARIABLE TT_OUT
+Index: llvm-toolchain-3.8-3.8/autoconf/config.guess.hack
+===================================================================
+--- /dev/null
++++ llvm-toolchain-3.8-3.8/autoconf/config.guess.hack
+@@ -0,0 +1,2 @@
++#!/bin/bash -e
++$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/
+Index: llvm-toolchain-3.8-3.8/compiler-rt/cmake/config-ix.cmake
+===================================================================
+--- llvm-toolchain-3.8-3.8.orig/compiler-rt/cmake/config-ix.cmake
++++ llvm-toolchain-3.8-3.8/compiler-rt/cmake/config-ix.cmake
+@@ -220,8 +220,8 @@ elseif(NOT APPLE) # Supported archs for
+     test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu")
+     test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu" "-mabi=n64")
+   elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm")
+-    test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
+-    test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
++    test_target_arch(arm "" "" "-mfloat-abi=soft")
++    test_target_arch(armhf "" "" "-mfloat-abi=hard")
+   elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
+     test_target_arch(aarch32 "" "-march=armv8-a")
+   elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64")
diff -Nru llvm-toolchain-3.8-3.8.1/debian/patches/series llvm-toolchain-3.8-3.8.1/debian/patches/series
--- llvm-toolchain-3.8-3.8.1/debian/patches/series	2016-10-25 08:53:49.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/patches/series	2016-11-04 00:33:12.000000000 +0000
@@ -51,3 +51,4 @@
 clang-tidy-run-bin.diff
 
 silent-llvm-symbolizer.diff
+cmake-arm-version-hack.patch
diff -Nru llvm-toolchain-3.8-3.8.1/debian/python-clang-3.8.install llvm-toolchain-3.8-3.8.1/debian/python-clang-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/python-clang-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/python-clang-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+tools/clang/bindings/python/clang/ /usr/lib/python2.7/dist-packages/
diff -Nru llvm-toolchain-3.8-3.8.1/debian/python-lldb-3.8.install llvm-toolchain-3.8-3.8.1/debian/python-lldb-3.8.install
--- llvm-toolchain-3.8-3.8.1/debian/python-lldb-3.8.install	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/python-lldb-3.8.install	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/llvm-3.8/lib/python2.7/site-packages/lldb/
diff -Nru llvm-toolchain-3.8-3.8.1/debian/python-lldb-3.8.links llvm-toolchain-3.8-3.8.1/debian/python-lldb-3.8.links
--- llvm-toolchain-3.8-3.8.1/debian/python-lldb-3.8.links	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/python-lldb-3.8.links	2016-11-04 00:33:12.000000000 +0000
@@ -0,0 +1,6 @@
+usr/lib/arm-linux-gnueabihf/libLLVM-3.8.1.so.1 usr/lib/llvm-3.8/lib/python2.7/site-packages/lldb/libLLVM-3.8.1.so.1
+usr/lib/arm-linux-gnueabihf/libLLVM-3.8.1.so.1 usr/lib/llvm-3.8/lib/python2.7/site-packages/lldb/libLLVM-3.8.so.1
+usr/lib/arm-linux-gnueabihf/liblldb-3.8.so.1      usr/lib/llvm-3.8/lib/python2.7/site-packages/lldb/_lldb.so
+usr/lib/llvm-3.8/lib/python2.7/site-packages/lldb/ usr/lib/python2.7/dist-packages/lldb
+
+
diff -Nru llvm-toolchain-3.8-3.8.1/debian/rules llvm-toolchain-3.8-3.8.1/debian/rules
--- llvm-toolchain-3.8-3.8.1/debian/rules	2016-10-24 08:48:42.000000000 +0000
+++ llvm-toolchain-3.8-3.8.1/debian/rules	2016-11-04 00:33:12.000000000 +0000
@@ -32,7 +32,7 @@
 LDFLAGS_EXTRA =
 CXXFLAGS_EXTRA = -std=c++0x -gsplit-dwarf
 CONFIGURE_EXTRA =
-CMAKE_EXTRA =
+CMAKE_EXTRA = -DCOMPILER_RT_BUILD_BUILTINS=OFF
 
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) lt 4.7.2-10~ ; echo $$?),0)
 # Too old version of gcc. Force 4.9
@@ -45,6 +45,8 @@
 confargs := \
 	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
 
+confargs := $(shell echo $(confargs) | sed 's/arm-/armv6-/')
+
 ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH_BITS),64)
   confargs += --with-cxx-include-32bit-dir=32
 else
@@ -140,6 +142,10 @@
 
 
 preconfigure:
+	# add executable flag to script we added as part of triplet hack
+	# --plugwash
+	chmod 755 autoconf/config.guess.hack
+	
 	for f in debian/*.in; do \
 		f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
 		echo "$$f => $$f2"; \
@@ -479,74 +485,74 @@
 
 
 
-ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
-# List of the archs we know we have 100 % tests working
-ARCH_LLVM_TEST_OK := i386 amd64
-
-override_dh_auto_test:
-
-ifneq (${AUTOCONF_BUILD},yes)
-
-# LLVM tests (CMake)
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK)))
-	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm
-else
-	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm || true
-endif
-
-# Clang tests (CMake)
-	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-clang || true
-
-# LLDB tests (CMake)
-ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel))
-ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-lldb || true
-endif
-endif
+#ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
+## List of the archs we know we have 100 % tests working
+#ARCH_LLVM_TEST_OK := i386 amd64
+#
+#override_dh_auto_test:
+#
+#ifneq (${AUTOCONF_BUILD},yes)
+#
+## LLVM tests (CMake)
+#ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK)))
+#	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm
+#else
+#	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm || true
+#endif
+#
+## Clang tests (CMake)
+#	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-clang || true
+#
+## LLDB tests (CMake)
+#ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel))
+#ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
+#	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-lldb || true
+#endif
+#endif
 
 # Polly tests (CMake)
-ifeq (${POLLY_ENABLE},yes)
-	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-polly || true
-endif
-
-else # Autoconf build
-
-# LLVM tests
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK)))
-# Fail the build if the test fails
-	NJOBS="$(NJOBS)" LD_LIBRARY_PATH=$(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/ $(MAKE) -C $(TARGET_BUILD) check
-else
-	NJOBS="$(NJOBS)" LD_LIBRARY_PATH=$(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/ $(MAKE) -C $(TARGET_BUILD) check || true
-endif
-
-# clang tests
-# setup the env
-	cd $(TARGET_BUILD)/$(BUILD_DIR)/lib/ && ln -s libclang.so libclang.so.1 && ln -s libclang.so libclang-$(LLVM_VERSION).so.1
-	cd $(TARGET_BUILD)/ && $(MAKE) -C tools/clang/ test || true
-	rm -f $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang.so.1 $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang-$(LLVM_VERSION).so.1
-
-
-# lldb tests
-ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel))
-	if test "$(LLDB_ENABLE)" = yes; then \
-	cd $(TARGET_BUILD)/$(BUILD_DIR)/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi; \
-	if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then \
-		ln -s ../../../libLLVM-$(LLVM_VERSION_FULL).so libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT); \
-	fi; \
-	if test ! -h libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) -o ! -f _lldb.so; then \
-		ln -s ../../../libLLVM-$(LLVM_VERSION_FULL).so libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT); \
-	fi; \
-	fi
-
-	cd $(TARGET_BUILD)/$(BUILD_DIR)/lib && \
-	rm -f liblldb-$(LLVM_VERSION).so && \
-	ln -s liblldb.so liblldb-$(LLVM_VERSION).so
-
-	cd $(TARGET_BUILD)/ && $(MAKE) -C tools/lldb/test || true
-	if test -d $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/; then \
-		cat $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/*; \
-	fi
-endif
+#ifeq (${POLLY_ENABLE},yes)
+#	$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-polly || true
+#endif
+#
+#else # Autoconf build
+#
+## LLVM tests
+#ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK)))
+## Fail the build if the test fails
+#	NJOBS="$(NJOBS)" LD_LIBRARY_PATH=$(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/ $(MAKE) -C $(TARGET_BUILD) check
+#else
+#	NJOBS="$(NJOBS)" LD_LIBRARY_PATH=$(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/ $(MAKE) -C $(TARGET_BUILD) check || true
+#endif
+#
+## clang tests
+## setup the env
+#	cd $(TARGET_BUILD)/$(BUILD_DIR)/lib/ && ln -s libclang.so libclang.so.1 && ln -s libclang.so libclang-$(LLVM_VERSION).so.1
+#	cd $(TARGET_BUILD)/ && $(MAKE) -C tools/clang/ test || true
+#	rm -f $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang.so.1 $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang-$(LLVM_VERSION).so.1
+#
+#
+## lldb tests
+#ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel))
+#	if test "$(LLDB_ENABLE)" = yes; then \
+#	cd $(TARGET_BUILD)/$(BUILD_DIR)/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi; \
+#	if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then \
+#		ln -s ../../../libLLVM-$(LLVM_VERSION_FULL).so libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT); \
+#	fi; \
+#	if test ! -h libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) -o ! -f _lldb.so; then \
+#		ln -s ../../../libLLVM-$(LLVM_VERSION_FULL).so libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT); \
+#	fi; \
+#	fi
+#
+#	cd $(TARGET_BUILD)/$(BUILD_DIR)/lib && \
+#	rm -f liblldb-$(LLVM_VERSION).so && \
+#	ln -s liblldb.so liblldb-$(LLVM_VERSION).so
+#
+#	cd $(TARGET_BUILD)/ && $(MAKE) -C tools/lldb/test || true
+#	if test -d $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/; then \
+#		cat $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/*; \
+#	fi
+#endif
 
 # Managed by debian build system
 	rm -f $(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so $(TARGET_BUILD)/$(BUILD_DIR)/lib/liblldb-$(LLVM_VERSION).so
@@ -558,17 +564,19 @@
 
 # The compression of the code coverage report is done in the
 # hook B21GetCoverageResults on the server
-	if test "$(CODECOVERAGE)" = "yes"; then \
-		REPORT=reports/llvm-toolchain.info; \
-		mkdir -p reports/; \
-		lcov --directory $(TARGET_BUILD)/ --capture --ignore-errors source --output-file $$REPORT; \
-		lcov --remove $$REPORT "/usr*" -o $$REPORT; \
-		genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \
-	fi
-endif
-override_dh_auto_test:
-endif
+#	if test "$(CODECOVERAGE)" = "yes"; then \
+#		REPORT=reports/llvm-toolchain.info; \
+#		mkdir -p reports/; \
+#		lcov --directory $(TARGET_BUILD)/ --capture --ignore-errors source --output-file $$REPORT; \
+#		lcov --remove $$REPORT "/usr*" -o $$REPORT; \
+#		genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \
+#	fi
+#endif
+#override_dh_auto_test:
+#endif
 
+override_dh_auto_test:
+	echo testsuite disabled.
 
 override_dh_gencontrol:
 	dh_gencontrol -- $(control_vars)
@@ -589,6 +597,6 @@
 	rm -f $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim
 	rm -f $(CURDIR)/clang/tools/clang-format/clang-format-diff-$(LLVM_VERSION)
 	rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py
-
+	rm -f `find . -name '*.pyc'`
 
 .PHONY: override_dh_strip preconfigure