From 4974d111d4226e0588af40b5e6cd4d5099fa85d3 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Sun, 20 Oct 2019 13:52:30 +0200
Subject: [PATCH] rebase of the patch

---
 ...resolve-symlinks-in-LLVMConfig.cmake.patch |  6 +-
 ...03-Debian-version-info-and-bugreport.patch |  6 +-
 debian/patches/0044-soname.diff               |  6 +-
 ...e-Debian-provided-MathJax-everywhere.patch |  6 +-
 debian/patches/930008-arm.diff                |  6 +-
 .../clang-arm-default-vfp3-on-armv7a.patch    | 12 +--
 debian/patches/debug-jit-path.diff            |  6 +-
 debian/patches/declare_clear_cache.diff       |  6 +-
 .../patches/disable-llvm-symbolizer-test.diff |  8 +-
 debian/patches/disable-path-test-failing.diff |  6 +-
 .../do-not-fail-on-unexpected-pass.diff       |  6 +-
 .../fix-llvm-config-obj-src-root.patch        |  6 +-
 debian/patches/hurd-pathmax.diff              |  6 +-
 debian/patches/hurd/hurd-EIEIO-undef.diff     |  6 +-
 debian/patches/hurd/hurd-pathmax.diff         |  6 +-
 debian/patches/hurd/impl-path-hurd.diff       |  6 +-
 debian/patches/kfreebsd/CMakeLists.txt.diff   |  6 +-
 .../kfreebsd/include_llvm_ADT_Triple.h.diff   |  6 +-
 debian/patches/kfreebsd/kfreebsd-triple.diff  |  6 +-
 debian/patches/kfreebsd/lib_Support.diff      | 12 +--
 debian/patches/kfreebsd/lib_Target_X86.diff   | 12 +--
 .../tools_llvm-shlib_CMakeLists.txt.diff      |  6 +-
 debian/patches/silent-MCJIIT-tests.diff       | 90 +++++++++----------
 debian/patches/silent-amd-tet.diff            |  6 +-
 debian/patches/silent-gold-test.diff          | 16 ++--
 debian/patches/silent-gold-utils.diff         | 84 ++++++++---------
 debian/patches/silent-llvm-isel-fuzzer.diff   | 12 +--
 debian/patches/silent-more-tests.diff         | 12 +--
 .../silent-test-failing-codeverage.diff       |  6 +-
 debian/patches/silent-test-macho.diff         |  6 +-
 debian/patches/test-keep-alive.diff           |  6 +-
 31 files changed, 195 insertions(+), 195 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
index c9991c81..9daf1531 100644
--- a/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
+++ b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
@@ -12,10 +12,10 @@ Partially addresses PR37128
  cmake/modules/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_10~svn370025/cmake/modules/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/cmake/modules/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/cmake/modules/CMakeLists.txt
-+++ llvm-toolchain-snapshot_10~svn370025/cmake/modules/CMakeLists.txt
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/cmake/modules/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/llvm/cmake/modules/CMakeLists.txt
 @@ -88,10 +88,10 @@ file(COPY .
  # Generate LLVMConfig.cmake for the install tree.
  set(LLVM_CONFIG_CODE "
diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch
index 23f3edb6..0ba77311 100644
--- a/debian/patches/0003-Debian-version-info-and-bugreport.patch
+++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch
@@ -2,10 +2,10 @@
  lib/Support/CommandLine.cpp |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/CommandLine.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/CommandLine.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/CommandLine.cpp
-+++ llvm-toolchain-snapshot_10~svn370025/lib/Support/CommandLine.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/lib/Support/CommandLine.cpp
++++ llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/CommandLine.cpp
 @@ -2378,6 +2378,10 @@ public:
      OS << " " << LLVM_VERSION_INFO;
  #endif
diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
index cc4e5c59..b118e54b 100644
--- a/debian/patches/0044-soname.diff
+++ b/debian/patches/0044-soname.diff
@@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_10~svn371290/clang/tools/libclang/CMakeLists.txt
    OUTPUT_NAME ${output_name}
    ${SOURCES}
  
-Index: llvm-toolchain-snapshot_10~svn371290/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn371290/llvm/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_10~svn371290.orig/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_10~svn371290/tools/llvm-shlib/CMakeLists.txt
+--- llvm-toolchain-snapshot_10~svn371290.orig/llvm/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn371290/llvm/tools/llvm-shlib/CMakeLists.txt
 @@ -44,6 +44,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
    endif()
    add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
index f8b575c8..96102b76 100644
--- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
+++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
@@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_9~svn363555/clang/docs/doxygen.cfg.in
  
  # 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-snapshot_9~svn363555/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_9~svn363555/llvm/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_9~svn363555.orig/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_9~svn363555/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_9~svn363555.orig/llvm/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_9~svn363555/llvm/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.
diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff
index 9408815e..bfa61e22 100644
--- a/debian/patches/930008-arm.diff
+++ b/debian/patches/930008-arm.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/Triple.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/Triple.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/Triple.cpp
-+++ llvm-toolchain-snapshot_10~svn370025/lib/Support/Triple.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/lib/Support/Triple.cpp
++++ llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/Triple.cpp
 @@ -1646,7 +1646,7 @@ StringRef Triple::getARMCPUForArch(Strin
      case llvm::Triple::EABIHF:
      case llvm::Triple::GNUEABIHF:
diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
index 4f675a83..61c54b92 100644
--- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
+++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370025/include/llvm/Support/ARMTargetParser.def
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/include/llvm/Support/ARMTargetParser.def
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/include/llvm/Support/ARMTargetParser.def
-+++ llvm-toolchain-snapshot_10~svn370025/include/llvm/Support/ARMTargetParser.def
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/include/llvm/Support/ARMTargetParser.def
++++ llvm-toolchain-snapshot_10~svn370025/llvm/include/llvm/Support/ARMTargetParser.def
 @@ -76,7 +76,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k
  ARM_ARCH("armv6-m", ARMV6M, "6-M", "v6m", ARMBuildAttrs::CPUArch::v6_M,
            FK_NONE, ARM::AEK_NONE)
@@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_10~svn370025/include/llvm/Support/ARMTargetParser
  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_10~svn370025/lib/Target/ARM/ARM.td
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/lib/Target/ARM/ARM.td
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/lib/Target/ARM/ARM.td
-+++ llvm-toolchain-snapshot_10~svn370025/lib/Target/ARM/ARM.td
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/lib/Target/ARM/ARM.td
++++ llvm-toolchain-snapshot_10~svn370025/llvm/lib/Target/ARM/ARM.td
 @@ -663,7 +663,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
                                                         FeatureStrictAlign]>;
  
diff --git a/debian/patches/debug-jit-path.diff b/debian/patches/debug-jit-path.diff
index 2610b4a4..b3e92d42 100644
--- a/debian/patches/debug-jit-path.diff
+++ b/debian/patches/debug-jit-path.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370025/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
-+++ llvm-toolchain-snapshot_10~svn370025/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
++++ llvm-toolchain-snapshot_10~svn370025/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
 @@ -300,8 +300,8 @@ bool PerfJITEventListener::InitDebugging
    // search for location to dump data to
    if (const char *BaseDir = getenv("JITDUMPDIR"))
diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff
index 3fcf8856..c881b8f9 100644
--- a/debian/patches/declare_clear_cache.diff
+++ b/debian/patches/declare_clear_cache.diff
@@ -2,10 +2,10 @@
  lib/Support/Unix/Memory.inc |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/Unix/Memory.inc
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/Unix/Memory.inc
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/Unix/Memory.inc
-+++ llvm-toolchain-snapshot_10~svn370025/lib/Support/Unix/Memory.inc
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/lib/Support/Unix/Memory.inc
++++ llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/Unix/Memory.inc
 @@ -256,7 +256,7 @@ void Memory::InvalidateInstructionCache(
    // FIXME: Can we safely always call this for __GNUC__ everywhere?
    const char *Start = static_cast<const char *>(Addr);
diff --git a/debian/patches/disable-llvm-symbolizer-test.diff b/debian/patches/disable-llvm-symbolizer-test.diff
index d157d5c8..5bb7ba2d 100644
--- a/debian/patches/disable-llvm-symbolizer-test.diff
+++ b/debian/patches/disable-llvm-symbolizer-test.diff
@@ -1,5 +1,5 @@
 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
+ /tmp/buildd/llvm-toolchain-snapshot-4.0~svn279801/llvm/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
@@ -11,10 +11,10 @@ Description: Silent a test failing on yakkety amd64
 Author: Sylvestre <sylvestre@debian.org>
 Last-Update: 2016-08-26
 
-Index: llvm-toolchain-snapshot_9~svn352786/test/tools/llvm-symbolizer/print_context.c
+Index: llvm-toolchain-snapshot_9~svn352786/llvm/test/tools/llvm-symbolizer/print_context.c
 ===================================================================
---- llvm-toolchain-snapshot_9~svn352786.orig/test/tools/llvm-symbolizer/print_context.c
-+++ llvm-toolchain-snapshot_9~svn352786/test/tools/llvm-symbolizer/print_context.c
+--- llvm-toolchain-snapshot_9~svn352786.orig/llvm/test/tools/llvm-symbolizer/print_context.c
++++ llvm-toolchain-snapshot_9~svn352786/llvm/test/tools/llvm-symbolizer/print_context.c
 @@ -18,6 +18,7 @@ int main() {
  // 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
index 3b9f20e3..1c2f9f0c 100644
--- a/debian/patches/disable-path-test-failing.diff
+++ b/debian/patches/disable-path-test-failing.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370025/unittests/Support/Path.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/unittests/Support/Path.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/unittests/Support/Path.cpp
-+++ llvm-toolchain-snapshot_10~svn370025/unittests/Support/Path.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/unittests/Support/Path.cpp
++++ llvm-toolchain-snapshot_10~svn370025/llvm/unittests/Support/Path.cpp
 @@ -447,7 +447,7 @@ protected:
      sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
    }
diff --git a/debian/patches/do-not-fail-on-unexpected-pass.diff b/debian/patches/do-not-fail-on-unexpected-pass.diff
index cc83b792..198e398c 100644
--- a/debian/patches/do-not-fail-on-unexpected-pass.diff
+++ b/debian/patches/do-not-fail-on-unexpected-pass.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_8~svn342269/utils/lit/lit/Test.py
+Index: llvm-toolchain-snapshot_8~svn342269/llvm/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
+--- llvm-toolchain-snapshot_8~svn342269.orig/llvm/utils/lit/lit/Test.py
++++ llvm-toolchain-snapshot_8~svn342269/llvm/utils/lit/lit/Test.py
 @@ -32,7 +32,7 @@ PASS        = ResultCode('PASS', False)
  FLAKYPASS   = ResultCode('FLAKYPASS', False)
  XFAIL       = ResultCode('XFAIL', False)
diff --git a/debian/patches/fix-llvm-config-obj-src-root.patch b/debian/patches/fix-llvm-config-obj-src-root.patch
index e2ee85a5..b262aa66 100644
--- a/debian/patches/fix-llvm-config-obj-src-root.patch
+++ b/debian/patches/fix-llvm-config-obj-src-root.patch
@@ -2,10 +2,10 @@
  tools/llvm-config/llvm-config.cpp |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_10~svn370025/tools/llvm-config/llvm-config.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/tools/llvm-config/llvm-config.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/tools/llvm-config/llvm-config.cpp
-+++ llvm-toolchain-snapshot_10~svn370025/tools/llvm-config/llvm-config.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/tools/llvm-config/llvm-config.cpp
++++ llvm-toolchain-snapshot_10~svn370025/llvm/tools/llvm-config/llvm-config.cpp
 @@ -560,9 +560,9 @@ int main(int argc, char **argv) {
        } else if (Arg == "--shared-mode") {
          PrintSharedMode = true;
diff --git a/debian/patches/hurd-pathmax.diff b/debian/patches/hurd-pathmax.diff
index e42d4e84..a6938bcd 100644
--- a/debian/patches/hurd-pathmax.diff
+++ b/debian/patches/hurd-pathmax.diff
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_9~svn352610/lldb/include/lldb/lldb-defines.h
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_9~svn352610/tools/dsymutil/DwarfLinker.cpp
+Index: llvm-toolchain-snapshot_9~svn352610/llvm/tools/dsymutil/DwarfLinker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn352610.orig/tools/dsymutil/DwarfLinker.cpp
-+++ llvm-toolchain-snapshot_9~svn352610/tools/dsymutil/DwarfLinker.cpp
+--- llvm-toolchain-snapshot_9~svn352610.orig/llvm/tools/dsymutil/DwarfLinker.cpp
++++ llvm-toolchain-snapshot_9~svn352610/llvm/tools/dsymutil/DwarfLinker.cpp
 @@ -100,6 +100,11 @@
  #include <utility>
  #include <vector>
diff --git a/debian/patches/hurd/hurd-EIEIO-undef.diff b/debian/patches/hurd/hurd-EIEIO-undef.diff
index cb7e160c..80509f0f 100644
--- a/debian/patches/hurd/hurd-EIEIO-undef.diff
+++ b/debian/patches/hurd/hurd-EIEIO-undef.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn372737/utils/TableGen/CodeEmitterGen.cpp
+Index: llvm-toolchain-snapshot_10~svn372737/llvm/utils/TableGen/CodeEmitterGen.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn372737.orig/utils/TableGen/CodeEmitterGen.cpp
-+++ llvm-toolchain-snapshot_10~svn372737/utils/TableGen/CodeEmitterGen.cpp
+--- llvm-toolchain-snapshot_10~svn372737.orig/llvm/utils/TableGen/CodeEmitterGen.cpp
++++ llvm-toolchain-snapshot_10~svn372737/llvm/utils/TableGen/CodeEmitterGen.cpp
 @@ -395,6 +395,9 @@ void CodeEmitterGen::run(raw_ostream &o)
    ArrayRef<const CodeGenInstruction*> NumberedInstructions =
      Target.getInstructionsByEnumValue();
diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff
index 7d421cda..a4eb6e82 100644
--- a/debian/patches/hurd/hurd-pathmax.diff
+++ b/debian/patches/hurd/hurd-pathmax.diff
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_10~svn370407/lldb/include/lldb/lldb-defines.h
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_10~svn370407/tools/dsymutil/DwarfLinker.cpp
+Index: llvm-toolchain-snapshot_10~svn370407/llvm/tools/dsymutil/DwarfLinker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370407.orig/tools/dsymutil/DwarfLinker.cpp
-+++ llvm-toolchain-snapshot_10~svn370407/tools/dsymutil/DwarfLinker.cpp
+--- llvm-toolchain-snapshot_10~svn370407.orig/llvm/tools/dsymutil/DwarfLinker.cpp
++++ llvm-toolchain-snapshot_10~svn370407/llvm/tools/dsymutil/DwarfLinker.cpp
 @@ -100,6 +100,11 @@
  #include <utility>
  #include <vector>
diff --git a/debian/patches/hurd/impl-path-hurd.diff b/debian/patches/hurd/impl-path-hurd.diff
index 9353d47e..9158266c 100644
--- a/debian/patches/hurd/impl-path-hurd.diff
+++ b/debian/patches/hurd/impl-path-hurd.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn368304/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-snapshot_10~svn368304/llvm/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_10~svn368304.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_10~svn368304/lib/Support/Unix/Path.inc
+--- llvm-toolchain-snapshot_10~svn368304.orig/llvm/lib/Support/Unix/Path.inc
++++ llvm-toolchain-snapshot_10~svn368304/llvm/lib/Support/Unix/Path.inc
 @@ -203,7 +203,7 @@ std::string getMainExecutable(const char
    // If we don't have procfs mounted, fall back to argv[0]
    if (getprogpath(exe_path, argv0) != NULL)
diff --git a/debian/patches/kfreebsd/CMakeLists.txt.diff b/debian/patches/kfreebsd/CMakeLists.txt.diff
index fb03a080..645b6a62 100644
--- a/debian/patches/kfreebsd/CMakeLists.txt.diff
+++ b/debian/patches/kfreebsd/CMakeLists.txt.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370025/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/CMakeLists.txt
-+++ llvm-toolchain-snapshot_10~svn370025/CMakeLists.txt
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/llvm/CMakeLists.txt
 @@ -866,7 +866,7 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
  # (this is a variable that CrossCompile sets on recursive invocations)
  endif()
diff --git a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
index aa33e42c..48e7be81 100644
--- a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
+++ b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370025/include/llvm/ADT/Triple.h
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/include/llvm/ADT/Triple.h
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/include/llvm/ADT/Triple.h
-+++ llvm-toolchain-snapshot_10~svn370025/include/llvm/ADT/Triple.h
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/include/llvm/ADT/Triple.h
++++ llvm-toolchain-snapshot_10~svn370025/llvm/include/llvm/ADT/Triple.h
 @@ -161,7 +161,7 @@ public:
      FreeBSD,
      Fuchsia,
diff --git a/debian/patches/kfreebsd/kfreebsd-triple.diff b/debian/patches/kfreebsd/kfreebsd-triple.diff
index 3b8d55aa..33c12b3d 100644
--- a/debian/patches/kfreebsd/kfreebsd-triple.diff
+++ b/debian/patches/kfreebsd/kfreebsd-triple.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn358740/unittests/ADT/TripleTest.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/llvm/unittests/ADT/TripleTest.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/unittests/ADT/TripleTest.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/unittests/ADT/TripleTest.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/llvm/unittests/ADT/TripleTest.cpp
++++ llvm-toolchain-snapshot_9~svn358740/llvm/unittests/ADT/TripleTest.cpp
 @@ -98,6 +98,18 @@ TEST(TripleTest, ParsedIDs) {
    EXPECT_EQ(Triple::Hurd, T.getOS());
    EXPECT_EQ(Triple::GNU, T.getEnvironment());
diff --git a/debian/patches/kfreebsd/lib_Support.diff b/debian/patches/kfreebsd/lib_Support.diff
index 895bc874..470724be 100644
--- a/debian/patches/kfreebsd/lib_Support.diff
+++ b/debian/patches/kfreebsd/lib_Support.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/Triple.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/Triple.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/Triple.cpp
-+++ llvm-toolchain-snapshot_10~svn370025/lib/Support/Triple.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/lib/Support/Triple.cpp
++++ llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/Triple.cpp
 @@ -183,7 +183,7 @@ StringRef Triple::getOSTypeName(OSType K
    case FreeBSD: return "freebsd";
    case Fuchsia: return "fuchsia";
@@ -20,10 +20,10 @@ Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/Triple.cpp
      .StartsWith("linux", Triple::Linux)
      .StartsWith("lv2", Triple::Lv2)
      .StartsWith("macos", Triple::MacOSX)
-Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_10~svn370025/lib/Support/Unix/Path.inc
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/lib/Support/Unix/Path.inc
++++ llvm-toolchain-snapshot_10~svn370025/llvm/lib/Support/Unix/Path.inc
 @@ -62,7 +62,7 @@
  #define FSTATVFS fstatvfs
  #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
diff --git a/debian/patches/kfreebsd/lib_Target_X86.diff b/debian/patches/kfreebsd/lib_Target_X86.diff
index 4f426a60..757e1acf 100644
--- a/debian/patches/kfreebsd/lib_Target_X86.diff
+++ b/debian/patches/kfreebsd/lib_Target_X86.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn375090/lib/Target/X86/X86Subtarget.cpp
+Index: llvm-toolchain-snapshot_10~svn375090/llvm/lib/Target/X86/X86Subtarget.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn375090.orig/lib/Target/X86/X86Subtarget.cpp
-+++ llvm-toolchain-snapshot_10~svn375090/lib/Target/X86/X86Subtarget.cpp
+--- llvm-toolchain-snapshot_10~svn375090.orig/llvm/lib/Target/X86/X86Subtarget.cpp
++++ llvm-toolchain-snapshot_10~svn375090/llvm/lib/Target/X86/X86Subtarget.cpp
 @@ -290,7 +290,7 @@ void X86Subtarget::initSubtargetFeatures
    if (StackAlignOverride)
      stackAlignment = *StackAlignOverride;
@@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_10~svn375090/lib/Target/X86/X86Subtarget.cpp
      stackAlignment = Align(16);
  
    // Some CPUs have more overhead for gather. The specified overhead is relative
-Index: llvm-toolchain-snapshot_10~svn375090/lib/Target/X86/X86Subtarget.h
+Index: llvm-toolchain-snapshot_10~svn375090/llvm/lib/Target/X86/X86Subtarget.h
 ===================================================================
---- llvm-toolchain-snapshot_10~svn375090.orig/lib/Target/X86/X86Subtarget.h
-+++ llvm-toolchain-snapshot_10~svn375090/lib/Target/X86/X86Subtarget.h
+--- llvm-toolchain-snapshot_10~svn375090.orig/llvm/lib/Target/X86/X86Subtarget.h
++++ llvm-toolchain-snapshot_10~svn375090/llvm/lib/Target/X86/X86Subtarget.h
 @@ -764,7 +764,7 @@ public:
    bool isTargetMachO() const { return TargetTriple.isOSBinFormatMachO(); }
  
diff --git a/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff b/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
index e5000645..24a86b3a 100644
--- a/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
+++ b/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370025/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/llvm/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_10~svn370025/tools/llvm-shlib/CMakeLists.txt
+--- llvm-toolchain-snapshot_10~svn370025.orig/llvm/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/llvm/tools/llvm-shlib/CMakeLists.txt
 @@ -49,6 +49,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
    list(REMOVE_DUPLICATES LIB_NAMES)
    if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff
index 6bb63cb8..b6b67481 100644
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@@ -18,10 +18,10 @@
  test/Feature/load_module.ll                                             |    1 -
  17 files changed, 14 insertions(+), 17 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -29,10 +29,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/cross-modu
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 @@ -1,6 +1,6 @@
  ; REQUIRES: cxx-shared-library
  ; RUN: %lli -relocation-model=pic -code-model=large %s
@@ -41,10 +41,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/eh-lg-pic.
  declare i8* @__cxa_allocate_exception(i64)
  declare void @__cxa_throw(i8*, i8*, i8*)
  declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -52,10 +52,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/multi-modu
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -63,10 +63,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/stubs-sm-p
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -74,10 +74,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/test-globa
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -85,10 +85,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/MCJIT/test-ptr-r
  
  @.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_9~svn360997/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -96,10 +96,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/cross-m
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -108,10 +108,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/eh-lg-p
  declare i8* @__cxa_allocate_exception(i64)
  declare void @__cxa_throw(i8*, i8*, i8*)
  declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -119,10 +119,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/multi-m
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -131,10 +131,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/remote/
  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
  
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -143,10 +143,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/remote/
  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
  
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -154,10 +154,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/stubs-s
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -165,10 +165,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/test-gl
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -176,10 +176,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/ExecutionEngine/OrcMCJIT/test-pt
  
  @.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_9~svn360997/test/Feature/load_module.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/Feature/load_module.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/Feature/load_module.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/Feature/load_module.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/test/Feature/load_module.ll
 @@ -3,7 +3,6 @@
  ; RUN:   -disable-output 2>&1 | grep Hello
  ; REQUIRES: plugins
diff --git a/debian/patches/silent-amd-tet.diff b/debian/patches/silent-amd-tet.diff
index 4c297862..324647d7 100644
--- a/debian/patches/silent-amd-tet.diff
+++ b/debian/patches/silent-amd-tet.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn359674/test/MC/AMDGPU/hsa.s
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/MC/AMDGPU/hsa.s
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/MC/AMDGPU/hsa.s
-+++ llvm-toolchain-snapshot_9~svn359674/test/MC/AMDGPU/hsa.s
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/MC/AMDGPU/hsa.s
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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
diff --git a/debian/patches/silent-gold-test.diff b/debian/patches/silent-gold-test.diff
index 28561597..054f62a8 100644
--- a/debian/patches/silent-gold-test.diff
+++ b/debian/patches/silent-gold-test.diff
@@ -1,21 +1,21 @@
 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
+ /build/llvm-toolchain-snapshot-4.0~svn279916/llvm/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'
+ ; ModuleID = '/build/llvm-toolchain-snapshot-4.0~svn279916/build-llvm/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_9~svn359674/test/tools/gold/X86/start-lib-common.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/start-lib-common.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/start-lib-common.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/start-lib-common.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/start-lib-common.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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
@@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/start-lib-common.
  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_9~svn359674/test/tools/gold/X86/comdat.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/comdat.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/comdat.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/comdat.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/comdat.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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
diff --git a/debian/patches/silent-gold-utils.diff b/debian/patches/silent-gold-utils.diff
index 1cdcb769..c2b335e8 100644
--- a/debian/patches/silent-gold-utils.diff
+++ b/debian/patches/silent-gold-utils.diff
@@ -15,10 +15,10 @@
  test/tools/gold/X86/visibility.ll                 |    1 +
  14 files changed, 19 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/common_thinlto.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/common_thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/common_thinlto.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/common_thinlto.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/common_thinlto.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/common_thinlto.ll
 @@ -17,6 +17,7 @@
  
  ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM
@@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/common_thinlto.ll
  
  source_filename = "common1.c"
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/emit-llvm.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/emit-llvm.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/emit-llvm.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/emit-llvm.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/emit-llvm.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/emit-llvm.ll
 @@ -21,6 +21,8 @@
  ; RUN: not test -a %t4.o
  
@@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/emit-llvm.ll
  
  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_9~svn359674/test/tools/gold/X86/parallel.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/parallel.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/parallel.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/parallel.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/parallel.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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
@@ -52,10 +52,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/parallel.ll
  
  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_9~svn359674/test/tools/gold/X86/pr19901_thinlto.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/pr19901_thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/pr19901_thinlto.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/pr19901_thinlto.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/pr19901_thinlto.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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
@@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/pr19901_thinlto.l
  
  ; CHECK:       Symbol {
  ; CHECK:         Name: f
-Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/slp-vectorize.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/slp-vectorize.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/slp-vectorize.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/slp-vectorize.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/slp-vectorize.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/slp-vectorize.ll
 @@ -7,6 +7,7 @@
  
  ; test that the vectorizer is run.
@@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/slp-vectorize.ll
  
  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_9~svn359674/test/tools/gold/X86/strip_names.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/strip_names.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/strip_names.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/strip_names.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/strip_names.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/strip_names.ll
 @@ -25,6 +25,7 @@
  ; NONAME:  %2 = load i32, i32* @GlobalValueName
  ; NONAME:  %3 = add i32 %0, %2
@@ -88,10 +88,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/strip_names.ll
  
  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_9~svn359674/test/tools/gold/X86/thinlto.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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"
@@ -101,10 +101,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto.ll
  declare void @g(...)
  
  define void @f() {
-Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_archive.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_archive.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto_archive.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_archive.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto_archive.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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
@@ -113,10 +113,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_archive.l
  
  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_9~svn359674/test/tools/gold/X86/thinlto_internalize.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_internalize.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto_internalize.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_internalize.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto_internalize.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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.
@@ -126,10 +126,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_internali
  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_9~svn359674/test/tools/gold/X86/thinlto_linkonceresolution.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_linkonceresolution.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
 @@ -23,6 +23,8 @@
  ; OPT-NOT: @f()
  ; OPT2: define weak_odr hidden void @f()
@@ -139,10 +139,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_linkoncer
  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_9~svn359674/test/tools/gold/X86/thinlto_weak_resolution.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto_weak_resolution.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_weak_resolution.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
 @@ -9,6 +9,7 @@
  ; RUN:     --plugin-opt=save-temps \
  ; RUN:     -shared \
@@ -151,10 +151,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_weak_reso
  
  ; RUN: llvm-nm %t3.o | FileCheck %s
  ; CHECK: weakfunc
-Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/type-merge2.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/type-merge2.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/type-merge2.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/type-merge2.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/type-merge2.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/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
@@ -164,10 +164,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/type-merge2.ll
  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_9~svn359674/test/tools/gold/X86/vectorize.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/vectorize.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/vectorize.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/vectorize.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/vectorize.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/vectorize.ll
 @@ -7,6 +7,7 @@
  
  ; test that the vectorizer is run.
@@ -176,10 +176,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/vectorize.ll
  
  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_9~svn359674/test/tools/gold/X86/visibility.ll
+Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/visibility.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/visibility.ll
-+++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/visibility.ll
+--- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/visibility.ll
++++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/visibility.ll
 @@ -16,6 +16,7 @@
  ; CHECK-NEXT: Other [
  ; CHECK-NEXT:   STV_PROTECTED
diff --git a/debian/patches/silent-llvm-isel-fuzzer.diff b/debian/patches/silent-llvm-isel-fuzzer.diff
index 287f73cc..e3335312 100644
--- a/debian/patches/silent-llvm-isel-fuzzer.diff
+++ b/debian/patches/silent-llvm-isel-fuzzer.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn360686/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
+Index: llvm-toolchain-snapshot_9~svn360686/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360686.orig/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
-+++ llvm-toolchain-snapshot_9~svn360686/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
+--- llvm-toolchain-snapshot_9~svn360686.orig/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
++++ llvm-toolchain-snapshot_9~svn360686/llvm/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
@@ -10,10 +10,10 @@ Index: llvm-toolchain-snapshot_9~svn360686/test/tools/llvm-isel-fuzzer/aarch64-e
  
  ; The above also applies if the binary is built with libc++.
  ; UNSUPPORTED: libcxx-used
-Index: llvm-toolchain-snapshot_9~svn360686/test/tools/llvm-isel-fuzzer/execname-options.ll
+Index: llvm-toolchain-snapshot_9~svn360686/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360686.orig/test/tools/llvm-isel-fuzzer/execname-options.ll
-+++ llvm-toolchain-snapshot_9~svn360686/test/tools/llvm-isel-fuzzer/execname-options.ll
+--- llvm-toolchain-snapshot_9~svn360686.orig/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll
++++ llvm-toolchain-snapshot_9~svn360686/llvm/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.
diff --git a/debian/patches/silent-more-tests.diff b/debian/patches/silent-more-tests.diff
index bfa2698c..be9279e3 100644
--- a/debian/patches/silent-more-tests.diff
+++ b/debian/patches/silent-more-tests.diff
@@ -8,10 +8,10 @@
  test/Feature/load_module.ll               |    1 +
  4 files changed, 5 insertions(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_9~svn360997/test/BugPoint/metadata.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/BugPoint/metadata.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/BugPoint/metadata.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/BugPoint/metadata.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/BugPoint/metadata.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/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
@@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/test/BugPoint/metadata.ll
  ; 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_9~svn360997/test/Feature/load_module.ll
+Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/Feature/load_module.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_9~svn360997/test/Feature/load_module.ll
+--- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/Feature/load_module.ll
++++ llvm-toolchain-snapshot_9~svn360997/llvm/test/Feature/load_module.ll
 @@ -3,6 +3,7 @@
  ; RUN:   -disable-output 2>&1 | grep Hello
  ; REQUIRES: plugins
diff --git a/debian/patches/silent-test-failing-codeverage.diff b/debian/patches/silent-test-failing-codeverage.diff
index e091fae8..6b759ee3 100644
--- a/debian/patches/silent-test-failing-codeverage.diff
+++ b/debian/patches/silent-test-failing-codeverage.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn370107/test/ThinLTO/X86/autoupgrade.ll
+Index: llvm-toolchain-snapshot_10~svn370107/llvm/test/ThinLTO/X86/autoupgrade.ll
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370107.orig/test/ThinLTO/X86/autoupgrade.ll
-+++ llvm-toolchain-snapshot_10~svn370107/test/ThinLTO/X86/autoupgrade.ll
+--- llvm-toolchain-snapshot_10~svn370107.orig/llvm/test/ThinLTO/X86/autoupgrade.ll
++++ llvm-toolchain-snapshot_10~svn370107/llvm/test/ThinLTO/X86/autoupgrade.ll
 @@ -3,6 +3,8 @@
  ; RUN: opt -module-summary %s -o %t.bc
  ; RUN: llvm-lto -thinlto-action=thinlink -o %t3.bc %t.bc %p/Inputs/autoupgrade.bc
diff --git a/debian/patches/silent-test-macho.diff b/debian/patches/silent-test-macho.diff
index 7b5d5d64..f7667550 100644
--- a/debian/patches/silent-test-macho.diff
+++ b/debian/patches/silent-test-macho.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn360558/test/Object/macho-invalid.test
+Index: llvm-toolchain-snapshot_9~svn360558/llvm/test/Object/macho-invalid.test
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360558.orig/test/Object/macho-invalid.test
-+++ llvm-toolchain-snapshot_9~svn360558/test/Object/macho-invalid.test
+--- llvm-toolchain-snapshot_9~svn360558.orig/llvm/test/Object/macho-invalid.test
++++ llvm-toolchain-snapshot_9~svn360558/llvm/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)
diff --git a/debian/patches/test-keep-alive.diff b/debian/patches/test-keep-alive.diff
index 8225f36e..727bdff5 100644
--- a/debian/patches/test-keep-alive.diff
+++ b/debian/patches/test-keep-alive.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn374603/utils/lit/lit/ProgressBar.py
+Index: llvm-toolchain-snapshot_10~svn374603/llvm/utils/lit/lit/ProgressBar.py
 ===================================================================
---- llvm-toolchain-snapshot_10~svn374603.orig/utils/lit/lit/ProgressBar.py
-+++ llvm-toolchain-snapshot_10~svn374603/utils/lit/lit/ProgressBar.py
+--- llvm-toolchain-snapshot_10~svn374603.orig/llvm/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-snapshot_10~svn374603/llvm/utils/lit/lit/ProgressBar.py
 @@ -189,15 +189,7 @@ class SimpleProgressBar:
              return