rebase of all patches

2025-06-14 20:00:43 +00:00 · 2019-01-19 11:42:15 +01:00 · 2019-01-19 11:42:15 +01:00 · a3923dd800
commit a3923dd800
parent fed43a8a5a
31 changed files with 231 additions and 225 deletions
--- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
+++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
@ -13,10 +13,10 @@ Subject: Use Debian-provided MathJax everywhere.
 polly/docs/doxygen.cfg.in             | 2 +-
 8 files changed, 14 insertions(+), 5 deletions(-)

-Index: llvm-toolchain-snapshot_7~svn336327/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/conf.py
 ===================================================================
--- llvm-toolchain-snapshot_7~svn336327.orig/clang-tools-extra/docs/conf.py
-+++ llvm-toolchain-snapshot_7~svn336327/clang-tools-extra/docs/conf.py
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang-tools-extra/docs/conf.py
+++ llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/conf.py
@@ -123,6 +123,9 @@ html_theme = 'haiku'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_7~svn336327/clang-tools-extra/docs/conf.py
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 #html_last_updated_fmt = '%b %d, %Y'
-Index: llvm-toolchain-snapshot_7~svn336327/clang-tools-extra/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/doxygen.cfg.in
 ===================================================================
--- llvm-toolchain-snapshot_7~svn336327.orig/clang-tools-extra/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_7~svn336327/clang-tools-extra/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang-tools-extra/docs/doxygen.cfg.in
+++ llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/doxygen.cfg.in
@@ -1443,7 +1443,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # The default value is: http://cdn.mathjax.org/mathjax/latest.
 # This tag requires that the tag USE_MATHJAX is set to YES.
@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_7~svn336327/clang-tools-extra/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_7~svn336327/clang/docs/analyzer/conf.py
+Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/analyzer/conf.py
 ===================================================================
--- llvm-toolchain-snapshot_7~svn336327.orig/clang/docs/analyzer/conf.py
-+++ llvm-toolchain-snapshot_7~svn336327/clang/docs/analyzer/conf.py
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/docs/analyzer/conf.py
+++ llvm-toolchain-snapshot_9~svn351647/clang/docs/analyzer/conf.py
@@ -123,6 +123,9 @@ html_theme = 'haiku'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
@ -54,11 +54,11 @@ Index: llvm-toolchain-snapshot_7~svn336327/clang/docs/analyzer/conf.py
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 #html_last_updated_fmt = '%b %d, %Y'
-Index: llvm-toolchain-snapshot_7~svn336327/clang/docs/conf.py
+Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/conf.py
 ===================================================================
--- llvm-toolchain-snapshot_7~svn336327.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_7~svn336327/clang/docs/conf.py
-@@ -123,6 +123,9 @@ html_theme = 'haiku'
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/docs/conf.py
+++ llvm-toolchain-snapshot_9~svn351647/clang/docs/conf.py
+@@ -124,6 +124,9 @@ html_theme = 'haiku'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
@ -68,10 +68,10 @@ Index: llvm-toolchain-snapshot_7~svn336327/clang/docs/conf.py
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 #html_last_updated_fmt = '%b %d, %Y'
-Index: llvm-toolchain-snapshot_7~svn336327/clang/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/doxygen.cfg.in
 ===================================================================
--- llvm-toolchain-snapshot_7~svn336327.orig/clang/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_7~svn336327/clang/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/docs/doxygen.cfg.in
+++ llvm-toolchain-snapshot_9~svn351647/clang/docs/doxygen.cfg.in
@@ -1432,7 +1432,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # The default value is: http://cdn.mathjax.org/mathjax/latest.
 # This tag requires that the tag USE_MATHJAX is set to YES.
@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_7~svn336327/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_7~svn336327/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_9~svn351647/docs/doxygen.cfg.in
 ===================================================================
--- llvm-toolchain-snapshot_7~svn336327.orig/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_7~svn336327/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_9~svn351647.orig/docs/doxygen.cfg.in
+++ llvm-toolchain-snapshot_9~svn351647/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.
@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_7~svn336327/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_7~svn336327/polly/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_9~svn351647/polly/docs/doxygen.cfg.in
 ===================================================================
--- llvm-toolchain-snapshot_7~svn336327.orig/polly/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_7~svn336327/polly/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_9~svn351647.orig/polly/docs/doxygen.cfg.in
+++ llvm-toolchain-snapshot_9~svn351647/polly/docs/doxygen.cfg.in
@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # The default value is: http://cdn.mathjax.org/mathjax/latest.
 # This tag requires that the tag USE_MATHJAX is set to YES.
--- a/debian/patches/26-set-correct-float-abi.diff
+++ b/debian/patches/26-set-correct-float-abi.diff
@ -18,11 +18,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>

-Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/ARM.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
-+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Arch/ARM.cpp
-@@ -246,7 +246,7 @@ arm::FloatABI arm::getARMFloatABI(const
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+@@ -245,7 +245,7 @@ arm::FloatABI arm::getARMFloatABI(const
       case llvm::Triple::MuslEABI:
       case llvm::Triple::EABI:
         // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
--- a/debian/patches/D49754-powerpcspe-clang.diff
+++ b/debian/patches/D49754-powerpcspe-clang.diff
@ -3,11 +3,11 @@ Author: Justin Hibbits <jrh29@alumni.cwru.edu>
 Origin: https://reviews.llvm.org/D49754
 Last-Update: 2018-12-04

-Index: llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Driver/Options.td
+Index: llvm-toolchain-snapshot_9~svn351647/clang/include/clang/Driver/Options.td
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/include/clang/Driver/Options.td
-+++ llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Driver/Options.td
-@@ -2142,6 +2142,8 @@ def faltivec : Flag<["-"], "faltivec">,
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/include/clang/Driver/Options.td
+++ llvm-toolchain-snapshot_9~svn351647/clang/include/clang/Driver/Options.td
+@@ -2179,6 +2179,8 @@ def faltivec : Flag<["-"], "faltivec">,
 def fno_altivec : Flag<["-"], "fno-altivec">, Group<f_Group>, Flags<[DriverOption]>;
 def maltivec : Flag<["-"], "maltivec">, Group<m_ppc_Features_Group>;
 def mno_altivec : Flag<["-"], "mno-altivec">, Group<m_ppc_Features_Group>;
@ -16,11 +16,11 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Driver/Options.td
 def mvsx : Flag<["-"], "mvsx">, Group<m_ppc_Features_Group>;
 def mno_vsx : Flag<["-"], "mno-vsx">, Group<m_ppc_Features_Group>;
 def msecure_plt : Flag<["-"], "msecure-plt">, Group<m_ppc_Features_Group>;
-Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Basic/Targets/PPC.cpp
-+++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.cpp
-@@ -54,6 +54,8 @@ bool PPCTargetInfo::handleTargetFeatures
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Basic/Targets/PPC.cpp
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.cpp
+@@ -53,6 +53,8 @@ bool PPCTargetInfo::handleTargetFeatures
       HasFloat128 = true;
     } else if (Feature == "+power9-vector") {
       HasP9Vector = true;
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.cpp
     }
     // TODO: Finish this list and add an assert that we've handled them
     // all.
-@@ -161,6 +163,8 @@ void PPCTargetInfo::getTargetDefines(con
+@@ -160,6 +162,8 @@ void PPCTargetInfo::getTargetDefines(con
     Builder.defineMacro("__VEC__", "10206");
     Builder.defineMacro("__ALTIVEC__");
   }
@ -38,7 +38,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.cpp
   if (HasVSX)
     Builder.defineMacro("__VSX__");
   if (HasP8Vector)
-@@ -334,6 +338,7 @@ bool PPCTargetInfo::hasFeature(StringRef
+@@ -333,6 +337,7 @@ bool PPCTargetInfo::hasFeature(StringRef
       .Case("extdiv", HasExtDiv)
       .Case("float128", HasFloat128)
       .Case("power9-vector", HasP9Vector)
@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.cpp
       .Default(false);
 }
 
-@@ -443,16 +448,16 @@ ArrayRef<TargetInfo::AddlRegName> PPCTar
+@@ -442,16 +447,16 @@ ArrayRef<TargetInfo::AddlRegName> PPCTar
 }
 
 static constexpr llvm::StringLiteral ValidCPUNames[] = {
@ -73,11 +73,11 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.cpp
 };
 
 bool PPCTargetInfo::isValidCPUName(StringRef Name) const {
-Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.h
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.h
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Basic/Targets/PPC.h
-+++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.h
-@@ -45,7 +45,8 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetI
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Basic/Targets/PPC.h
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.h
+@@ -44,7 +44,8 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetI
     ArchDefinePwr8 = 1 << 12,
     ArchDefinePwr9 = 1 << 13,
     ArchDefineA2 = 1 << 14,
@ -87,7 +87,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.h
   } ArchDefineTypes;
 
 
-@@ -66,6 +67,7 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetI
+@@ -65,6 +66,7 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetI
   bool HasBPERMD = false;
   bool HasExtDiv = false;
   bool HasP9Vector = false;
@ -95,7 +95,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.h
 
 protected:
   std::string ABI;
-@@ -145,6 +147,8 @@ public:
+@@ -144,6 +146,8 @@ public:
                         ArchDefinePwr6x | ArchDefinePwr6 | ArchDefinePwr5x |
                         ArchDefinePwr5 | ArchDefinePwr4 | ArchDefinePpcgr |
                         ArchDefinePpcsq)
@ -104,10 +104,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/Targets/PPC.h
               .Default(ArchDefineNone);
     }
     return CPUKnown;
-Index: llvm-toolchain-snapshot_8~svn349138/clang/test/Driver/ppc-features.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/clang/test/Driver/ppc-features.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/test/Driver/ppc-features.cpp
-+++ llvm-toolchain-snapshot_8~svn349138/clang/test/Driver/ppc-features.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/test/Driver/ppc-features.cpp
+++ llvm-toolchain-snapshot_9~svn351647/clang/test/Driver/ppc-features.cpp
@@ -168,6 +168,9 @@
 // RUN: %clang -target powerpc64-unknown-linux-gnu %s -mno-invariant-function-descriptors -minvariant-function-descriptors -### -o %t.o 2>&1 | FileCheck -check-prefix=CHECK-INVFUNCDESC %s
 // CHECK-INVFUNCDESC: "-target-feature" "+invariant-function-descriptors"
@ -118,10 +118,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/test/Driver/ppc-features.cpp
 // Assembler features
 // RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o -no-integrated-as 2>&1 | FileCheck -check-prefix=CHECK_BE_AS_ARGS %s
 // CHECK_BE_AS_ARGS: "-mppc64"
-Index: llvm-toolchain-snapshot_8~svn349138/clang/test/Misc/target-invalid-cpu-note.c
+Index: llvm-toolchain-snapshot_9~svn351647/clang/test/Misc/target-invalid-cpu-note.c
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/test/Misc/target-invalid-cpu-note.c
-+++ llvm-toolchain-snapshot_8~svn349138/clang/test/Misc/target-invalid-cpu-note.c
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/test/Misc/target-invalid-cpu-note.c
+++ llvm-toolchain-snapshot_9~svn351647/clang/test/Misc/target-invalid-cpu-note.c
@@ -79,7 +79,7 @@
 // PPC: error: unknown target CPU 'not-a-cpu'
 // PPC: note: valid target CPU values are: generic, 440, 450, 601, 602, 603,
@ -131,10 +131,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/test/Misc/target-invalid-cpu-no
 // PPC-SAME: power5, pwr5, power5x, pwr5x, power6, pwr6, power6x, pwr6x, power7,
 // PPC-SAME: pwr7, power8, pwr8, power9, pwr9, powerpc, ppc, powerpc64, ppc64,
 // PPC-SAME: powerpc64le, ppc64le
-Index: llvm-toolchain-snapshot_8~svn349138/clang/test/Preprocessor/init.c
+Index: llvm-toolchain-snapshot_9~svn351647/clang/test/Preprocessor/init.c
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/test/Preprocessor/init.c
-+++ llvm-toolchain-snapshot_8~svn349138/clang/test/Preprocessor/init.c
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/test/Preprocessor/init.c
+++ llvm-toolchain-snapshot_9~svn351647/clang/test/Preprocessor/init.c
@@ -7016,6 +7016,10 @@
 //
 // PPC32-LINUX-NOT: _CALL_LINUX
--- a/debian/patches/D54409-powerpcspe-register-spilling.diff
+++ b/debian/patches/D54409-powerpcspe-register-spilling.diff
@ -3,9 +3,11 @@ Author: Justin Hibbits <jrh29@alumni.cwru.edu>
 Origin: https://reviews.llvm.org/D54409
 Last-Update: 2018-12-05

--- llvm-toolchain-7-7.0.1~+rc2.orig/lib/Target/PowerPC/PPCRegisterInfo.cpp
-+++ llvm-toolchain-7-7.0.1~+rc2/lib/Target/PowerPC/PPCRegisterInfo.cpp
-@@ -844,6 +844,9 @@ static unsigned offsetMinAlign(const Mac
+Index: llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCRegisterInfo.cpp
+===================================================================
+--- llvm-toolchain-snapshot_9~svn351647.orig/lib/Target/PowerPC/PPCRegisterInfo.cpp
+++ llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCRegisterInfo.cpp
+@@ -846,6 +846,9 @@ static unsigned offsetMinAlign(const Mac
   case PPC::STXSD:
   case PPC::STXSSP:
     return 4;
@ -15,7 +17,7 @@ Last-Update: 2018-12-05
   case PPC::LXV:
   case PPC::STXV:
     return 16;
-@@ -960,7 +963,10 @@ PPCRegisterInfo::eliminateFrameIndex(Mac
+@@ -962,7 +965,10 @@ PPCRegisterInfo::eliminateFrameIndex(Mac
   // happen in invalid code.
   assert(OpC != PPC::DBG_VALUE &&
          "This should be handled in a target-independent way");
@ -27,8 +29,10 @@ Last-Update: 2018-12-05
                       ((Offset % offsetMinAlign(MI)) == 0)) ||
                      OpC == TargetOpcode::STACKMAP ||
                      OpC == TargetOpcode::PATCHPOINT)) {
--- llvm-toolchain-7-7.0.1~+rc2.orig/test/CodeGen/PowerPC/spe.ll
-+++ llvm-toolchain-7-7.0.1~+rc2/test/CodeGen/PowerPC/spe.ll
+Index: llvm-toolchain-snapshot_9~svn351647/test/CodeGen/PowerPC/spe.ll
+===================================================================
+--- llvm-toolchain-snapshot_9~svn351647.orig/test/CodeGen/PowerPC/spe.ll
+++ llvm-toolchain-snapshot_9~svn351647/test/CodeGen/PowerPC/spe.ll
@@ -525,18 +525,53 @@ entry:
 ; CHECK: #NO_APP
 }
--- a/debian/patches/D54584-powerpcspe-double-parameter.diff
+++ b/debian/patches/D54584-powerpcspe-double-parameter.diff
@ -3,11 +3,11 @@ Author: Justin Hibbits <jrh29@alumni.cwru.edu>
 Origin: https://reviews.llvm.org/D54583
 Last-Update: 2018-12-04

-Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCISelLowering.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCISelLowering.cpp
-+++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cpp
-@@ -385,8 +385,16 @@ PPCTargetLowering::PPCTargetLowering(con
+--- llvm-toolchain-snapshot_9~svn351647.orig/lib/Target/PowerPC/PPCISelLowering.cpp
+++ llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -384,8 +384,16 @@ PPCTargetLowering::PPCTargetLowering(con
   } else {
     setOperationAction(ISD::BITCAST, MVT::f32, Expand);
     setOperationAction(ISD::BITCAST, MVT::i32, Expand);
@ -25,7 +25,7 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cp
   }
 
   // We cannot sextinreg(i1).  Expand to shifts.
-@@ -1366,6 +1374,9 @@ const char *PPCTargetLowering::getTarget
+@@ -1365,6 +1373,9 @@ const char *PPCTargetLowering::getTarget
   case PPCISD::QVLFSb:          return "PPCISD::QVLFSb";
   case PPCISD::BUILD_FP128:     return "PPCISD::BUILD_FP128";
   case PPCISD::EXTSWSLI:        return "PPCISD::EXTSWSLI";
@ -35,7 +35,7 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cp
   }
   return nullptr;
 }
-@@ -7886,6 +7897,15 @@ SDValue PPCTargetLowering::LowerBITCAST(
+@@ -7885,6 +7896,15 @@ SDValue PPCTargetLowering::LowerBITCAST(
   SDLoc dl(Op);
   SDValue Op0 = Op->getOperand(0);
 
@ -51,7 +51,7 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cp
   if (!EnableQuadPrecision ||
       (Op.getValueType() != MVT::f128 ) ||
       (Op0.getOpcode() != ISD::BUILD_PAIR) ||
-@@ -7897,6 +7917,26 @@ SDValue PPCTargetLowering::LowerBITCAST(
+@@ -7896,6 +7916,26 @@ SDValue PPCTargetLowering::LowerBITCAST(
                      Op0.getOperand(1));
 }
 
@ -78,7 +78,7 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cp
 // If this is a case we can't handle, return null and let the default
 // expansion code take care of it.  If we CAN select this case, and if it
 // selects to a single instruction, return Op.  Otherwise, if we can codegen
-@@ -9680,6 +9720,8 @@ SDValue PPCTargetLowering::LowerOperatio
+@@ -9679,6 +9719,8 @@ SDValue PPCTargetLowering::LowerOperatio
     return LowerBSWAP(Op, DAG);
   case ISD::ATOMIC_CMP_SWAP:
     return LowerATOMIC_CMP_SWAP(Op, DAG);
@ -87,11 +87,11 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.cp
   }
 }
 
-Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.h
+Index: llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCISelLowering.h
 ===================================================================
--- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCISelLowering.h
-+++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.h
-@@ -196,6 +196,15 @@ namespace llvm {
+--- llvm-toolchain-snapshot_9~svn351647.orig/lib/Target/PowerPC/PPCISelLowering.h
+++ llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCISelLowering.h
+@@ -195,6 +195,15 @@ namespace llvm {
       /// Direct move of 2 consective GPR to a VSX register.
       BUILD_FP128,
 
@ -107,7 +107,7 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.h
       /// Extract a subvector from signed integer vector and convert to FP.
       /// It is primarily used to convert a (widened) illegal integer vector
       /// type to a legal floating point vector type.
-@@ -1110,6 +1119,7 @@ namespace llvm {
+@@ -1109,6 +1118,7 @@ namespace llvm {
     SDValue lowerEH_SJLJ_SETJMP(SDValue Op, SelectionDAG &DAG) const;
     SDValue lowerEH_SJLJ_LONGJMP(SDValue Op, SelectionDAG &DAG) const;
     SDValue LowerBITCAST(SDValue Op, SelectionDAG &DAG) const;
@ -115,11 +115,11 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCISelLowering.h
 
     SDValue DAGCombineExtBoolTrunc(SDNode *N, DAGCombinerInfo &DCI) const;
     SDValue DAGCombineBuildVector(SDNode *N, DAGCombinerInfo &DCI) const;
-Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrInfo.td
+Index: llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCInstrInfo.td
 ===================================================================
--- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCInstrInfo.td
-+++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrInfo.td
-@@ -231,6 +231,22 @@ def PPCbuild_fp128: SDNode<"PPCISD::BUIL
+--- llvm-toolchain-snapshot_9~svn351647.orig/lib/Target/PowerPC/PPCInstrInfo.td
+++ llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCInstrInfo.td
+@@ -230,6 +230,22 @@ def PPCbuild_fp128: SDNode<"PPCISD::BUIL
                               SDTCisSameAs<1,2>]>,
                            []>;
 
@ -142,11 +142,11 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrInfo.td
 // These are target-independent nodes, but have target-specific formats.
 def callseq_start : SDNode<"ISD::CALLSEQ_START", SDT_PPCCallSeqStart,
                            [SDNPHasChain, SDNPOutGlue]>;
-Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrSPE.td
+Index: llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCInstrSPE.td
 ===================================================================
--- llvm-toolchain-snapshot_8~svn350421.orig/lib/Target/PowerPC/PPCInstrSPE.td
-+++ llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrSPE.td
-@@ -512,7 +512,7 @@ def EVLWWSPLATX    : EVXForm_1<792, (out
+--- llvm-toolchain-snapshot_9~svn351647.orig/lib/Target/PowerPC/PPCInstrSPE.td
+++ llvm-toolchain-snapshot_9~svn351647/lib/Target/PowerPC/PPCInstrSPE.td
+@@ -511,7 +511,7 @@ def EVLWWSPLATX    : EVXForm_1<792, (out
 
 def EVMERGEHI      : EVXForm_1<556, (outs sperc:$RT), (ins sperc:$RA, sperc:$RB),
                                "evmergehi $RT, $RA, $RB", IIC_VecGeneral, []>;
@ -155,7 +155,7 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrSPE.td
                                "evmergelo $RT, $RA, $RB", IIC_VecGeneral, []>;
 def EVMERGEHILO    : EVXForm_1<558, (outs sperc:$RT), (ins sperc:$RA, sperc:$RB),
                                "evmergehilo $RT, $RA, $RB", IIC_VecGeneral, []>;
-@@ -887,4 +887,15 @@ def : Pat<(f64 (selectcc i1:$lhs, i1:$rh
+@@ -886,4 +886,15 @@ def : Pat<(f64 (selectcc i1:$lhs, i1:$rh
           (SELECT_SPE (CRANDC $lhs, $rhs), $tval, $fval)>;
 def : Pat<(f64 (selectcc i1:$lhs, i1:$rhs, f64:$tval, f64:$fval, SETNE)),
           (SELECT_SPE (CRXOR $lhs, $rhs), $tval, $fval)>;
@ -171,10 +171,10 @@ Index: llvm-toolchain-snapshot_8~svn350421/lib/Target/PowerPC/PPCInstrSPE.td
 +          (i32 (EXTRACT_SUBREG $rA, sub_32))>;
 +
 }
-Index: llvm-toolchain-snapshot_8~svn350421/test/CodeGen/PowerPC/spe.ll
+Index: llvm-toolchain-snapshot_9~svn351647/test/CodeGen/PowerPC/spe.ll
 ===================================================================
--- llvm-toolchain-snapshot_8~svn350421.orig/test/CodeGen/PowerPC/spe.ll
-+++ llvm-toolchain-snapshot_8~svn350421/test/CodeGen/PowerPC/spe.ll
+--- llvm-toolchain-snapshot_9~svn351647.orig/test/CodeGen/PowerPC/spe.ll
+++ llvm-toolchain-snapshot_9~svn351647/test/CodeGen/PowerPC/spe.ll
@@ -472,10 +472,8 @@ entry:
 ; CHECK-LABEL: test_dselect
 ; CHECK: andi.
--- a/debian/patches/bootstrap-fix-include-next.diff
+++ b/debian/patches/bootstrap-fix-include-next.diff
@ -13,10 +13,10 @@ include search path, clang's header will call itself without any effect.
 Therefore, it will do include_next until the define from the libc is existing (ex: _INTTYPES_H)


-Index: llvm-toolchain-7-7/clang/lib/Headers/inttypes.h
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Headers/inttypes.h
 ===================================================================
--- llvm-toolchain-7-7.orig/clang/lib/Headers/inttypes.h
-+++ llvm-toolchain-7-7/clang/lib/Headers/inttypes.h
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Headers/inttypes.h
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Headers/inttypes.h
@@ -20,7 +20,7 @@
  *
 \*===----------------------------------------------------------------------===*/
@ -26,10 +26,10 @@ Index: llvm-toolchain-7-7/clang/lib/Headers/inttypes.h
 #define __CLANG_INTTYPES_H
 
 #if defined(_MSC_VER) && _MSC_VER < 1800
-Index: llvm-toolchain-7-7/clang/lib/Headers/limits.h
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Headers/limits.h
 ===================================================================
--- llvm-toolchain-7-7.orig/clang/lib/Headers/limits.h
-+++ llvm-toolchain-7-7/clang/lib/Headers/limits.h
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Headers/limits.h
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Headers/limits.h
@@ -22,7 +22,7 @@
  *
 \*===----------------------------------------------------------------------===*/
--- a/debian/patches/bootstrap-with-openmp-version-export-missing.diff
+++ b/debian/patches/bootstrap-with-openmp-version-export-missing.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-7-7/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_9~svn351647/openmp/runtime/src/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-7-7.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-7-7/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_9~svn351647.orig/openmp/runtime/src/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn351647/openmp/runtime/src/CMakeLists.txt
@@ -174,7 +174,8 @@ endif()
 
 # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
--- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
+++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn349138/include/llvm/Support/ARMTargetParser.def
+Index: llvm-toolchain-snapshot_9~svn351647/include/llvm/Support/ARMTargetParser.def
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/include/llvm/Support/ARMTargetParser.def
-+++ llvm-toolchain-snapshot_8~svn349138/include/llvm/Support/ARMTargetParser.def
-@@ -75,7 +75,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k
+--- llvm-toolchain-snapshot_9~svn351647.orig/include/llvm/Support/ARMTargetParser.def
+++ llvm-toolchain-snapshot_9~svn351647/include/llvm/Support/ARMTargetParser.def
+@@ -74,7 +74,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k
 ARM_ARCH("armv6-m", ARMV6M, "6-M", "v6m", ARMBuildAttrs::CPUArch::v6_M,
           FK_NONE, ARM::AEK_NONE)
 ARM_ARCH("armv7-a", ARMV7A, "7-A", "v7", ARMBuildAttrs::CPUArch::v7,
@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_8~svn349138/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_8~svn349138/lib/Target/ARM/ARM.td
+Index: llvm-toolchain-snapshot_9~svn351647/lib/Target/ARM/ARM.td
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/lib/Target/ARM/ARM.td
-+++ llvm-toolchain-snapshot_8~svn349138/lib/Target/ARM/ARM.td
-@@ -596,7 +596,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
+--- llvm-toolchain-snapshot_9~svn351647.orig/lib/Target/ARM/ARM.td
+++ llvm-toolchain-snapshot_9~svn351647/lib/Target/ARM/ARM.td
+@@ -595,7 +595,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
                                                        FeatureStrictAlign]>;
 
 def ARMv7a    : Architecture<"armv7-a",   "ARMv7a",   [HasV7Ops,
--- a/debian/patches/clang-baseline-fix-i386.patch
+++ b/debian/patches/clang-baseline-fix-i386.patch
@ -1,6 +1,8 @@
--- a/clang/lib/Driver/ToolChains/Arch/X86.cpp
-+++ b/clang/lib/Driver/ToolChains/Arch/X86.cpp
-@@ -105,8 +105,8 @@ const char *x86::getX86TargetCPU(const ArgList &Args,
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/X86.cpp
+===================================================================
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/X86.cpp
+@@ -100,8 +100,8 @@ const char *x86::getX86TargetCPU(const A
   case llvm::Triple::Haiku:
     return "i586";
   default:
--- a/debian/patches/clangd-atomic-cmake.patch
+++ b/debian/patches/clangd-atomic-cmake.patch
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn346586/clang-tools-extra/clangd/CMakeLists.txt
+Index: llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/clangd/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_8~svn346586.orig/clang-tools-extra/clangd/CMakeLists.txt
-+++ llvm-toolchain-snapshot_8~svn346586/clang-tools-extra/clangd/CMakeLists.txt
-@@ -7,6 +7,11 @@ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang-tools-extra/clangd/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/clangd/CMakeLists.txt
+@@ -20,6 +20,11 @@ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
   list(APPEND CLANGD_ATOMIC_LIB "atomic")
 endif()
 
--- a/debian/patches/disable-error-xray.diff
+++ b/debian/patches/disable-error-xray.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn347449/compiler-rt/lib/xray/xray_tsc.h
+Index: llvm-toolchain-snapshot_9~svn351647/compiler-rt/lib/xray/xray_tsc.h
 ===================================================================
--- llvm-toolchain-snapshot_8~svn347449.orig/compiler-rt/lib/xray/xray_tsc.h
-+++ llvm-toolchain-snapshot_8~svn347449/compiler-rt/lib/xray/xray_tsc.h
-@@ -83,8 +83,6 @@ inline uint64_t getTSCFrequency() XRAY_N
+--- llvm-toolchain-snapshot_9~svn351647.orig/compiler-rt/lib/xray/xray_tsc.h
+++ llvm-toolchain-snapshot_9~svn351647/compiler-rt/lib/xray/xray_tsc.h
+@@ -82,8 +82,6 @@ inline uint64_t getTSCFrequency() XRAY_N
 
 } // namespace __xray
 
--- a/debian/patches/disable-sse2-old-x86.diff
+++ b/debian/patches/disable-sse2-old-x86.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Basic/X86Target.def
+Index: llvm-toolchain-snapshot_9~svn351647/clang/include/clang/Basic/X86Target.def
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/include/clang/Basic/X86Target.def
-+++ llvm-toolchain-snapshot_8~svn349138/clang/include/clang/Basic/X86Target.def
-@@ -302,7 +302,7 @@ CPU_SPECIFIC("pentium_mmx", 'D', "+mmx")
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/include/clang/Basic/X86Target.def
+++ llvm-toolchain-snapshot_9~svn351647/clang/include/clang/Basic/X86Target.def
+@@ -301,7 +301,7 @@ CPU_SPECIFIC("pentium_mmx", 'D', "+mmx")
 CPU_SPECIFIC("pentium_ii", 'E', "+cmov,+mmx")
 CPU_SPECIFIC("pentium_iii", 'H', "+cmov,+mmx,+sse")
 CPU_SPECIFIC("pentium_iii_no_xmm_regs", 'H',"+cmov,+sse")
--- a/debian/patches/hurd-EIEIO-undef.diff
+++ b/debian/patches/hurd-EIEIO-undef.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn339515/utils/TableGen/CodeEmitterGen.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/utils/TableGen/CodeEmitterGen.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn339515.orig/utils/TableGen/CodeEmitterGen.cpp
-+++ llvm-toolchain-snapshot_8~svn339515/utils/TableGen/CodeEmitterGen.cpp
-@@ -239,6 +239,9 @@ void CodeEmitterGen::run(raw_ostream &o)
+--- llvm-toolchain-snapshot_9~svn351647.orig/utils/TableGen/CodeEmitterGen.cpp
+++ llvm-toolchain-snapshot_9~svn351647/utils/TableGen/CodeEmitterGen.cpp
+@@ -238,6 +238,9 @@ void CodeEmitterGen::run(raw_ostream &o)
   ArrayRef<const CodeGenInstruction*> NumberedInstructions =
     Target.getInstructionsByEnumValue();
 
--- a/debian/patches/hurd-pathmax.diff
+++ b/debian/patches/hurd-pathmax.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/FileManager.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Basic/FileManager.cpp
-+++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/FileManager.cpp
-@@ -528,6 +528,12 @@ void FileManager::invalidateCache(const
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Basic/FileManager.cpp
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/FileManager.cpp
+@@ -495,6 +495,12 @@ void FileManager::invalidateCache(const
   UniqueRealFiles.erase(Entry->getUniqueID());
 }
 
@ -15,11 +15,11 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Basic/FileManager.cpp
 void FileManager::GetUniqueIDMapping(
                    SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
   UIDToFiles.clear();
-Index: llvm-toolchain-snapshot_8~svn349138/lldb/include/lldb/lldb-defines.h
+Index: llvm-toolchain-snapshot_9~svn351647/lldb/include/lldb/lldb-defines.h
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/lldb/include/lldb/lldb-defines.h
-+++ llvm-toolchain-snapshot_8~svn349138/lldb/include/lldb/lldb-defines.h
-@@ -28,6 +28,11 @@
+--- llvm-toolchain-snapshot_9~svn351647.orig/lldb/include/lldb/lldb-defines.h
+++ llvm-toolchain-snapshot_9~svn351647/lldb/include/lldb/lldb-defines.h
+@@ -27,6 +27,11 @@
 #define INT32_MAX 2147483647
 #endif
 
@ -31,11 +31,11 @@ Index: llvm-toolchain-snapshot_8~svn349138/lldb/include/lldb/lldb-defines.h
 #if !defined(UINT32_MAX)
 #define UINT32_MAX 4294967295U
 #endif
-Index: llvm-toolchain-snapshot_8~svn349138/tools/dsymutil/DwarfLinker.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/tools/dsymutil/DwarfLinker.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/tools/dsymutil/DwarfLinker.cpp
-+++ llvm-toolchain-snapshot_8~svn349138/tools/dsymutil/DwarfLinker.cpp
-@@ -101,6 +101,11 @@
+--- llvm-toolchain-snapshot_9~svn351647.orig/tools/dsymutil/DwarfLinker.cpp
+++ llvm-toolchain-snapshot_9~svn351647/tools/dsymutil/DwarfLinker.cpp
+@@ -100,6 +100,11 @@
 #include <utility>
 #include <vector>
 
@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/tools/dsymutil/DwarfLinker.cpp
 namespace llvm {
 namespace dsymutil {
 
-Index: llvm-toolchain-snapshot_8~svn349138/polly/lib/External/ppcg/cuda_common.c
+Index: llvm-toolchain-snapshot_9~svn351647/polly/lib/External/ppcg/cuda_common.c
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/polly/lib/External/ppcg/cuda_common.c
-+++ llvm-toolchain-snapshot_8~svn349138/polly/lib/External/ppcg/cuda_common.c
+--- llvm-toolchain-snapshot_9~svn351647.orig/polly/lib/External/ppcg/cuda_common.c
+++ llvm-toolchain-snapshot_9~svn351647/polly/lib/External/ppcg/cuda_common.c
@@ -15,6 +15,11 @@
 #include "cuda_common.h"
 #include "ppcg.h"
@ -63,11 +63,11 @@ Index: llvm-toolchain-snapshot_8~svn349138/polly/lib/External/ppcg/cuda_common.c
 /* Open the host .cu file and the kernel .hu and .cu files for writing.
  * Add the necessary includes.
  */
-Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Frontend/ModuleDependencyCollector.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Frontend/ModuleDependencyCollector.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Frontend/ModuleDependencyCollector.cpp
-+++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Frontend/ModuleDependencyCollector.cpp
-@@ -99,6 +99,11 @@ struct ModuleDependencyMMCallbacks : pub
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Frontend/ModuleDependencyCollector.cpp
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Frontend/ModuleDependencyCollector.cpp
+@@ -98,6 +98,11 @@ struct ModuleDependencyMMCallbacks : pub
 
 }
 
--- a/debian/patches/impl-path-hurd.diff
+++ b/debian/patches/impl-path-hurd.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn348749/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-snapshot_9~svn351647/lib/Support/Unix/Path.inc
 ===================================================================
--- llvm-toolchain-snapshot_8~svn348749.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_8~svn348749/lib/Support/Unix/Path.inc
-@@ -177,7 +177,7 @@ std::string getMainExecutable(const char
+--- llvm-toolchain-snapshot_9~svn351647.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot_9~svn351647/lib/Support/Unix/Path.inc
+@@ -176,7 +176,7 @@ std::string getMainExecutable(const char
 
   if (getprogpath(exe_path, argv0) != NULL)
     return exe_path;
--- a/debian/patches/libcxx-silent-failure-arm64.diff
+++ b/debian/patches/libcxx-silent-failure-arm64.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_8~svn350611/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn350611.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
-+++ llvm-toolchain-snapshot_8~svn350611/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 //
@ -10,10 +10,10 @@ Index: llvm-toolchain-snapshot_8~svn350611/libcxx/test/std/thread/thread.conditi
 
 // FLAKY_TEST
 
-Index: llvm-toolchain-snapshot_8~svn350611/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn350611.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
-+++ llvm-toolchain-snapshot_8~svn350611/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
@@ -9,6 +9,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
--- a/debian/patches/libcxx-silent-failure-ppc64el.diff
+++ b/debian/patches/libcxx-silent-failure-ppc64el.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
@@ -14,7 +14,7 @@
 //
 // GCC currently fails because it needs -fabi-version=6 to fix mangling of
--- a/debian/patches/libcxx-silent-test-libcxx.diff
+++ b/debian/patches/libcxx-silent-test-libcxx.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
@@ -12,6 +12,8 @@
 // template<class RealType, size_t bits, class URNG>
 //     RealType generate_canonical(URNG& g);
@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/numerics/rand/rand.ut
 #include <random>
 #include <cassert>
 
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/re/re.traits/isctype.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/re/re.traits/isctype.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/re/re.traits/isctype.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/re/re.traits/isctype.pass.cpp
@@ -16,6 +16,7 @@
 // TODO(EricWF): This test takes 40+ minutes to build with Clang 3.8 under ASAN or MSAN.
 // UNSUPPORTED: asan, msan
@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/re/re.traits/isctype.
 
 #include <regex>
 #include <cassert>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxxabi/test/catch_multi_level_pointer.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxxabi/test/catch_multi_level_pointer.pass.cpp
@@ -9,6 +9,8 @@
 
 // UNSUPPORTED: libcxxabi-no-exceptions
@ -36,10 +36,10 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/catch_multi_level_poin
 #include <cassert>
 #include <cstdlib>
 #include <iostream>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
@@ -16,6 +16,8 @@
 
 // template <class T, class... Args> void construct(T* p, Args&&... args);
--- a/debian/patches/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch
+++ b/debian/patches/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch
@ -8,10 +8,10 @@ libcxx tests default to -O0 compilation so these test need to be marked failing
 on arm to allow installing packages. Use cases is so borderline failure that it
 shouldn't prevent building the package. (64bit atomics in 32bit mode)

-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 //
@ -20,10 +20,10 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types
 //  ... assertion fails line 34
 
 // <atomic>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 //
@ -32,10 +32,10 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types
 //  ... assertion fails line 38
 
 // <atomic>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 //
@ -44,10 +44,10 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types
 //  ... assertion fails line 34
 
 // <atomic>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 //
--- a/debian/patches/libcxx-test-fix-lockfree-test-for-i386.patch
+++ b/debian/patches/libcxx-test-fix-lockfree-test-for-i386.patch
@ -10,10 +10,10 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi

 Bug: https://llvm.org/bugs/show_bug.cgi?id=19355

-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
@@ -20,6 +20,14 @@
 # error Feature test macro missing.
 #endif
--- a/debian/patches/libcxxabi-arm-ehabi-fix.patch
+++ b/debian/patches/libcxxabi-arm-ehabi-fix.patch
@ -7,10 +7,10 @@ sure their ABI stays in sync.

 No known upstream bug about this.

-Index: llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxxabi/src/cxa_exception.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn344157.orig/libcxxabi/src/cxa_exception.cpp
-+++ llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.cpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxxabi/src/cxa_exception.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxxabi/src/cxa_exception.cpp
@@ -277,15 +277,16 @@ __cxa_throw(void *thrown_object, std::ty
 
 #ifdef __USING_SJLJ_EXCEPTIONS__
@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.cpp
 #endif
         // Some sort of unwinding error.  Note that terminate is a handler.
         __cxa_begin_catch(&dep_exception_header->unwindHeader);
-Index: llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.hpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxxabi/src/cxa_exception.hpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn344157.orig/libcxxabi/src/cxa_exception.hpp
-+++ llvm-toolchain-snapshot_8~svn344157/libcxxabi/src/cxa_exception.hpp
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxxabi/src/cxa_exception.hpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxxabi/src/cxa_exception.hpp
@@ -28,6 +28,45 @@ uint64_t __getExceptionClass  (const _Un
 void     __setExceptionClass  (      _Unwind_Exception*, uint64_t);
 bool     __isOurExceptionClass(const _Unwind_Exception*);
--- a/debian/patches/libcxxabi-test-don-t-fail-extended-long-double.patch
+++ b/debian/patches/libcxxabi-test-don-t-fail-extended-long-double.patch
@ -2,11 +2,11 @@ Powerpc has extended double that doesn't match x86 coding. Power format would
 need special tests to verify correctness but for now it is enough to prevent
 incorrect test from running.

-Index: llvm-toolchain-snapshot_8~svn342269/libcxxabi/test/test_demangle.pass.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/libcxxabi/test/test_demangle.pass.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/libcxxabi/test/test_demangle.pass.cpp
-+++ llvm-toolchain-snapshot_8~svn342269/libcxxabi/test/test_demangle.pass.cpp
-@@ -29797,7 +29797,7 @@ const char* invalid_cases[] =
+--- llvm-toolchain-snapshot_9~svn351647.orig/libcxxabi/test/test_demangle.pass.cpp
+++ llvm-toolchain-snapshot_9~svn351647/libcxxabi/test/test_demangle.pass.cpp
+@@ -29803,7 +29803,7 @@ const char* invalid_cases[] =
     "NSoERj5E=Y1[uM:ga",
     "Aon_PmKVPDk7?fg4XP5smMUL6;<WsI_mgbf23cCgsHbT<l8EE\0uVRkNOoXDrgdA4[8IU>Vl<>IL8ayHpiVDDDXTY;^o9;i",
     "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_",
--- a/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch
+++ b/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch
@ -12,11 +12,11 @@ which could then break something else.

 This probably should have upstream bug but I couldn't find any existing report.

-Index: llvm-toolchain-snapshot_9~svn349669/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 ===================================================================
--- llvm-toolchain-snapshot_9~svn349669.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-+++ llvm-toolchain-snapshot_9~svn349669/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-@@ -33,13 +33,14 @@
+--- llvm-toolchain-snapshot_9~svn351647.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_9~svn351647/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+@@ -32,13 +32,14 @@
 #include "lldb/Utility/StreamString.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/ScopedPrinter.h"
--- a/debian/patches/lldb-disable-swig-error.diff
+++ b/debian/patches/lldb-disable-swig-error.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_5.0~svn306792/lldb/scripts/lldb.swig
+Index: llvm-toolchain-snapshot_9~svn351647/lldb/scripts/lldb.swig
 ===================================================================
--- llvm-toolchain-snapshot_5.0~svn306792.orig/lldb/scripts/lldb.swig
-+++ llvm-toolchain-snapshot_5.0~svn306792/lldb/scripts/lldb.swig
+--- llvm-toolchain-snapshot_9~svn351647.orig/lldb/scripts/lldb.swig
+++ llvm-toolchain-snapshot_9~svn351647/lldb/scripts/lldb.swig
@@ -50,7 +50,7 @@ except ImportError:
 %enddef
 // These versions will not generate working python modules, so error out early.
--- a/debian/patches/lldb-link-atomic-cmake.patch
+++ b/debian/patches/lldb-link-atomic-cmake.patch
@ -6,10 +6,10 @@ Last-Update: 2016-07-27
 lldb/cmake/LLDBDependencies.cmake |    6 ++++++
 1 file changed, 6 insertions(+)

-Index: llvm-toolchain-snapshot_8~svn349138/lldb/source/Utility/CMakeLists.txt
+Index: llvm-toolchain-snapshot_9~svn351647/lldb/source/Utility/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/lldb/source/Utility/CMakeLists.txt
-+++ llvm-toolchain-snapshot_8~svn349138/lldb/source/Utility/CMakeLists.txt
+--- llvm-toolchain-snapshot_9~svn351647.orig/lldb/source/Utility/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn351647/lldb/source/Utility/CMakeLists.txt
@@ -32,6 +32,14 @@ endif()
 
 list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
--- a/debian/patches/lldb-missing-install.diff
+++ b/debian/patches/lldb-missing-install.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn342269/lldb/tools/argdumper/CMakeLists.txt
+Index: llvm-toolchain-snapshot_9~svn351647/lldb/tools/argdumper/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/lldb/tools/argdumper/CMakeLists.txt
-+++ llvm-toolchain-snapshot_8~svn342269/lldb/tools/argdumper/CMakeLists.txt
-@@ -4,3 +4,7 @@ add_lldb_tool(lldb-argdumper INCLUDE_IN_
+--- llvm-toolchain-snapshot_9~svn351647.orig/lldb/tools/argdumper/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn351647/lldb/tools/argdumper/CMakeLists.txt
+@@ -4,3 +4,7 @@ add_lldb_tool(lldb-argdumper
   LINK_LIBS
     lldbUtility
   )
@ -10,11 +10,11 @@ Index: llvm-toolchain-snapshot_8~svn342269/lldb/tools/argdumper/CMakeLists.txt
 +install(TARGETS lldb-argdumper
 +  RUNTIME DESTINATION bin)
 +
-Index: llvm-toolchain-snapshot_8~svn342269/lldb/tools/lldb-server/CMakeLists.txt
+Index: llvm-toolchain-snapshot_9~svn351647/lldb/tools/lldb-server/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/lldb/tools/lldb-server/CMakeLists.txt
-+++ llvm-toolchain-snapshot_8~svn342269/lldb/tools/lldb-server/CMakeLists.txt
-@@ -64,3 +64,7 @@ add_lldb_tool(lldb-server INCLUDE_IN_SUI
+--- llvm-toolchain-snapshot_9~svn351647.orig/lldb/tools/lldb-server/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn351647/lldb/tools/lldb-server/CMakeLists.txt
+@@ -64,3 +64,7 @@ add_lldb_tool(lldb-server
 )
 
 target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})
--- a/debian/patches/mips-fpxx-enable.diff
+++ b/debian/patches/mips-fpxx-enable.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/Mips.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
-+++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Driver/ToolChains/Arch/Mips.cpp
-@@ -457,10 +457,10 @@ bool mips::isFP64ADefault(const llvm::Tr
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+@@ -456,10 +456,10 @@ bool mips::isFP64ADefault(const llvm::Tr
 
 bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
                          StringRef ABIName, mips::FloatABI FloatABI) {
--- a/debian/patches/openmp-check-execstack.diff
+++ b/debian/patches/openmp-check-execstack.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_7~svn335949/openmp/runtime/tools/check-execstack.pl
+Index: llvm-toolchain-snapshot_9~svn351647/openmp/runtime/tools/check-execstack.pl
 ===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/openmp/runtime/tools/check-execstack.pl
-+++ llvm-toolchain-snapshot_7~svn335949/openmp/runtime/tools/check-execstack.pl
+--- llvm-toolchain-snapshot_9~svn351647.orig/openmp/runtime/tools/check-execstack.pl
+++ llvm-toolchain-snapshot_9~svn351647/openmp/runtime/tools/check-execstack.pl
@@ -46,7 +46,8 @@ sub execstack($) {
     #    GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4
     # Linux* OS Intel(R) 64:
--- a/debian/patches/openmp-mips-affinity.patch
+++ b/debian/patches/openmp-mips-affinity.patch
@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_8~svn342269/openmp/runtime/src/kmp_affinity.h
+Index: llvm-toolchain-snapshot_9~svn351647/openmp/runtime/src/kmp_affinity.h
 ===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/openmp/runtime/src/kmp_affinity.h
-+++ llvm-toolchain-snapshot_8~svn342269/openmp/runtime/src/kmp_affinity.h
+--- llvm-toolchain-snapshot_9~svn351647.orig/openmp/runtime/src/kmp_affinity.h
+++ llvm-toolchain-snapshot_9~svn351647/openmp/runtime/src/kmp_affinity.h
@@ -211,28 +211,29 @@ public:
 #elif __NR_sched_getaffinity != 223
 #error Wrong code for getaffinity system call.
--- a/debian/patches/remove-apple-clang-manpage.diff
+++ b/debian/patches/remove-apple-clang-manpage.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-7-7/clang/docs/CommandGuide/clang.rst
+Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/CommandGuide/clang.rst
 ===================================================================
--- llvm-toolchain-7-7.orig/clang/docs/CommandGuide/clang.rst
-+++ llvm-toolchain-7-7/clang/docs/CommandGuide/clang.rst
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/docs/CommandGuide/clang.rst
+++ llvm-toolchain-snapshot_9~svn351647/clang/docs/CommandGuide/clang.rst
@@ -310,20 +310,10 @@ Clang fully supports cross compilation a
 Depending on how your version of Clang is configured, it may have support for a
 number of cross compilers, or may only support a native target.
--- a/debian/patches/reproducible-pch.diff
+++ b/debian/patches/reproducible-pch.diff
@ -4,11 +4,11 @@ Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
 Bug-Debian: https://bugs.debian.org/877359
 Forwarded: no

-Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Serialization/ASTWriter.cpp
+Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Serialization/ASTWriter.cpp
 ===================================================================
--- llvm-toolchain-snapshot_8~svn349138.orig/clang/lib/Serialization/ASTWriter.cpp
-+++ llvm-toolchain-snapshot_8~svn349138/clang/lib/Serialization/ASTWriter.cpp
-@@ -4279,9 +4279,13 @@ void ASTWriter::WriteOpenCLExtensionType
+--- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Serialization/ASTWriter.cpp
+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Serialization/ASTWriter.cpp
+@@ -4278,9 +4278,13 @@ void ASTWriter::WriteOpenCLExtensionType
     return;
 
   RecordData Record;
@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_8~svn349138/clang/lib/Serialization/ASTWriter.cpp
     Record.push_back(I.second.size());
     for (auto Ext : I.second)
       AddString(Ext, Record);
-@@ -4294,8 +4298,12 @@ void ASTWriter::WriteOpenCLExtensionDecl
+@@ -4293,8 +4297,12 @@ void ASTWriter::WriteOpenCLExtensionDecl
     return;
 
   RecordData Record;