diff --git a/debian/changelog b/debian/changelog
index 60ad868a..2a9d87ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-llvm-toolchain-snapshot (1:3.8~svn242297-1~exp1) experimental; urgency=medium
+llvm-toolchain-3.7 (1:3.7~+rc2-1) unstable; urgency=medium
 
-  * New snapshot release (3.7 => 3.8)
+  * New snapshot release
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 15 Jul 2015 17:51:08 +0200
 
diff --git a/debian/control b/debian/control
index 1bbbfe1f..b3fe78fe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: llvm-toolchain-snapshot
+Source: llvm-toolchain-3.7
 Section: devel
 Priority: optional
 Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
     libjsoncpp-dev,
     lcov, procps, help2man, dh-ocaml, zlib1g-dev
 Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev,
- libllvm-3.8-ocaml-dev
+ libllvm-3.7-ocaml-dev
 Standards-Version: 3.9.6
 Homepage: http://www.llvm.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/
@@ -19,14 +19,14 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snap
 
 # ------------- clang -------------
 
-Package: clang-3.8
+Package: clang-3.7
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-common-3.8-dev (= ${binary:Version}),
- libclang1-3.8 (= ${binary:Version}), libc6-dev, binutils
+ libclang-common-3.7-dev (= ${binary:Version}),
+ libclang1-3.7 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
-Recommends: llvm-3.8-dev, python
-Suggests: gnustep, gnustep-devel, clang-3.8-doc
+Recommends: llvm-3.7-dev, python
+Suggests: gnustep, gnustep-devel, clang-3.7-doc
 Replaces: clang-3.1, clang-3.2, clang-3.3,
  clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt
 Breaks: clang-3.1, clang-3.2, clang-3.3,
@@ -39,7 +39,7 @@ Description: C, C++ and Objective-C compiler (LLVM based)
  Clang implements all of the ISO C++ 1998 and 2001 standards and also provides
  a partial support of C++1y.
 
-Package: clang-format-3.8
+Package: clang-format-3.7
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
 Replaces: clang-format-3.3
@@ -56,9 +56,9 @@ Description: Tool to format C/C++/Obj-C code
  .
  This package also provides vim and emacs plugins.
 
-Package: cpp11-migrate-3.8
+Package: cpp11-migrate-3.7
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.7
 Replaces: cpp11-migrate-3.3
 Breaks: cpp11-migrate-3.3
 Description: Tool to convert C++98 and C++03 code to C++11
@@ -71,9 +71,9 @@ Description: Tool to convert C++98 and C++03 code to C++11
  .
  This is a transitional dummy package. It can safely be removed.
 
-Package: clang-modernize-3.8
+Package: clang-modernize-3.7
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.7
 Replaces: cpp11-migrate-3.3, cpp11-migrate-3.4
 Breaks: cpp11-migrate-3.3, cpp11-migrate-3.4
 Description: Tool to convert C++98 and C++03 code to C++11
@@ -85,7 +85,7 @@ Description: Tool to convert C++98 and C++03 code to C++11
  the AST Matching library.
 
 
-Package: clang-3.8-doc
+Package: clang-3.7-doc
 Architecture: all
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -99,7 +99,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-3.8
+Package: libclang1-3.7
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}
 Pre-Depends: ${misc:Pre-Depends}
@@ -120,11 +120,11 @@ Description: C interface to the clang library
  locations with elements within the AST, and other facilities that support
  Clang-based development tools.
 
-Package: libclang1-3.8-dbg
+Package: libclang1-3.7-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.7
 Description: clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
  for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
@@ -135,11 +135,11 @@ Description: clang library
  .
  This package contains the debugging symbols.
 
-Package: libclang-3.8-dev
+Package: libclang-3.7-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang1-3.8 (= ${binary:Version}), libclang-common-3.8-dev (= ${binary:Version})
+ libclang1-3.7 (= ${binary:Version}), libclang-common-3.7-dev (= ${binary:Version})
 Description: clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
@@ -149,12 +149,12 @@ Description: clang library - Development package
  a partial support of C++1y.
  .
  This package contains the clang headers to develop extensions over
- libclang1-3.8.
+ libclang1-3.7.
 
-Package: libclang-common-3.8-dev
+Package: libclang-common-3.7-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version})
 Description: clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
@@ -167,7 +167,7 @@ Description: clang library - Common development package
  (profiling, etc).
 
 
-Package: python-clang-3.8
+Package: python-clang-3.7
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
@@ -184,7 +184,7 @@ Description: Clang Python Bindings
  This binding package provides access to the Clang compiler and libraries.
 
 
-Package: clang-3.8-examples
+Package: clang-3.7-examples
 Architecture: any
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -200,7 +200,7 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm3.8
+Package: libllvm3.7
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -213,11 +213,11 @@ Description: Modular compiler and toolchain technologies, runtime library
  .
  This package contains the LLVM runtime library.
 
-Package: libllvm3.8-dbg
+Package: libllvm3.7-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Modular compiler and toolchain technologies, debugging libraries
@@ -227,11 +227,11 @@ Description: Modular compiler and toolchain technologies, debugging libraries
  .
  This package contains the LLVM runtime library debug symbols.
 
-Package: llvm-3.8
+Package: llvm-3.7
 Architecture: any
-Suggests: llvm-3.8-doc
-Depends: llvm-3.8-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: llvm-3.8-dev
+Suggests: llvm-3.7-doc
+Depends: llvm-3.7-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: llvm-3.7-dev
 Description: Modular compiler and toolchain technologies
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -258,7 +258,7 @@ Description: Modular compiler and toolchain technologies
  LLVM is the key component of the clang compiler and the gcc plugin called
  dragonegg.
 
-Package: llvm-3.8-runtime
+Package: llvm-3.7-runtime
 Architecture: any
 Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: llvm (<< 2.7-1)
@@ -279,10 +279,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter
  This package provides the minimal required to execute programs in LLVM
  format.
 
-Package: llvm-3.8-dev
+Package: llvm-3.7-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends},
- llvm-3.8 (= ${binary:Version}), libtinfo-dev
+ llvm-3.7 (= ${binary:Version}), libtinfo-dev
 Replaces: llvm (<< 2.2-3)
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
@@ -302,10 +302,10 @@ Description: Modular compiler and toolchain technologies, libraries and headers
 
 
 
-Package: llvm-3.8-tools
+Package: llvm-3.7-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python,
- llvm-3.8-dev (= ${binary:Version})
+ llvm-3.7-dev (= ${binary:Version})
 Description: Modular compiler and toolchain technologies, tools
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -322,11 +322,11 @@ Description: Modular compiler and toolchain technologies, tools
  This package provides tools for testing.
 
 
-Package: libllvm-3.8-ocaml-dev
+Package: libllvm-3.7-ocaml-dev
 Section: ocaml
 Architecture: any
-Suggests: llvm-3.8-doc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.8-dev (= ${binary:Version})
+Suggests: llvm-3.7-doc
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.7-dev (= ${binary:Version})
 Provides: ${ocaml:Provides}
 Description: Modular compiler and toolchain technologies, OCaml bindings
  LLVM is a collection of libraries and tools that make it easy to build
@@ -343,7 +343,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings
  .
  This package provides the OCaml bindings to develop applications using llvm.
 
-Package: llvm-3.8-doc
+Package: llvm-3.7-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
@@ -362,10 +362,10 @@ Description: Modular compiler and toolchain technologies, documentation
  .
  This package contains all documentation (extensive).
 
-Package: llvm-3.8-examples
+Package: llvm-3.7-examples
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, llvm-3.8-dev (>= ${source:Version}), llvm-3.8-dev (<< ${source:Version}+c~)
+Depends: ${misc:Depends}, llvm-3.7-dev (>= ${source:Version}), llvm-3.7-dev (<< ${source:Version}+c~)
 Description: Modular compiler and toolchain technologies, examples
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -385,10 +385,10 @@ Description: Modular compiler and toolchain technologies, examples
 
 # ------------- lldb -------------
 
-Package: lldb-3.8
+Package: lldb-3.7
 Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel
 # ia64 mips mipsel hurd ppc64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), python, llvm-3.8-dev, python-lldb-3.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version}), python, llvm-3.7-dev, python-lldb-3.7
 Conflicts: lldb-3.4, lldb-3.5
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
@@ -396,14 +396,14 @@ Description: Next generation, high-performance debugger
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-3.8
+Package: liblldb-3.7
 Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel
 # ia64 mips mipsel hurd ppc64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
-Replaces: lldb-3.8 (<= 1:3.8~svn215195-2)
-Breaks: lldb-3.8 (<< 1:3.8~svn215195-2)
+Replaces: lldb-3.7 (<= 1:3.7~svn215195-2)
+Breaks: lldb-3.7 (<< 1:3.7~svn215195-2)
 Description: Next generation, high-performance debugger, library
  LLDB is a next generation, high-performance debugger. It is built as a set of
  reusable components which highly leverage existing libraries in the larger LLVM
@@ -412,7 +412,7 @@ Description: Next generation, high-performance debugger, library
  This package contains the LLDB runtime library.
 
 
-Package: python-lldb-3.8
+Package: python-lldb-3.7
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
@@ -426,13 +426,13 @@ Description: Next generation, high-performance debugger, python lib
  This binding package provides access to lldb.
 
 
-Package: liblldb-3.8-dev
+Package: liblldb-3.7-dev
 Section: libdevel
 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel
 # ia64 mips mipsel hurd ppc64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.8 (= ${binary:Version})
-Replaces: lldb-3.8-dev (<= 1:3.8~svn215195-2)
-Breaks: lldb-3.8-dev (<< 1:3.8~svn215195-2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.7 (= ${binary:Version})
+Replaces: lldb-3.7-dev (<= 1:3.7~svn215195-2)
+Breaks: lldb-3.7-dev (<< 1:3.7~svn215195-2)
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger - Header files
  LLDB is a next generation, high-performance debugger. It is built as a set of
@@ -442,9 +442,9 @@ Description: Next generation, high-performance debugger - Header files
  This package provides the header files to build extension over lldb.
 
 
-Package: lldb-3.8-dev
-Depends: liblldb-3.8-dev, ${misc:Depends}
+Package: lldb-3.7-dev
+Depends: liblldb-3.7-dev, ${misc:Depends}
 Architecture: all
 Section: oldlibs
-Description: transitional dummy package to liblldb-3.8-dev
+Description: transitional dummy package to liblldb-3.7-dev
  This is a transitional dummy package. It can safely be removed.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 1c03550f..49f66f2f 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -14,8 +14,8 @@ set -e
 # sh 3.4/debian/orig-tar.sh RELEASE_34 rc1
 
 SVN_BASE_URL=http://llvm.org/svn/llvm-project/
-MAJOR_VERSION=3.8
-CURRENT_VERSION=3.8 # Should be changed to 3.5.1 later
+MAJOR_VERSION=3.7
+CURRENT_VERSION=3.7 # Should be changed to 3.5.1 later
 
 if test -n "$1"; then
 # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/
diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff
index ae899064..256cf709 100644
--- a/debian/patches/atomic_library_1.diff
+++ b/debian/patches/atomic_library_1.diff
@@ -1,9 +1,9 @@
-Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp
+Index: llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/lib/Basic/Targets.cpp
-+++ llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp
-@@ -4325,6 +4325,20 @@ class ARMTargetInfo : public TargetInfo
-     }
+--- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/lib/Basic/Targets.cpp	2014-03-29 12:14:58.543982773 +0100
++++ llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp	2014-03-29 12:14:58.543982773 +0100
+@@ -3843,6 +3843,20 @@
+     // FIXME: Override "preferred align" for double and long long.
    }
  
 +  static bool shouldUseInlineAtomic(const llvm::Triple &T) {
@@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp
  public:
    ARMTargetInfo(const llvm::Triple &Triple, bool IsBigEndian)
        : TargetInfo(Triple), CPU("arm1136j-s"), FPMath(FP_Default),
-Index: llvm-toolchain-snapshot_3.8~svn242701/clang/test/CodeGen/linux-arm-atomic.c
+Index: llvm-toolchain-snapshot_3.5~svn205090/clang/test/CodeGen/linux-arm-atomic.c
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/test/CodeGen/linux-arm-atomic.c
-+++ llvm-toolchain-snapshot_3.8~svn242701/clang/test/CodeGen/linux-arm-atomic.c
+--- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/test/CodeGen/linux-arm-atomic.c	2014-03-29 12:14:58.543982773 +0100
++++ llvm-toolchain-snapshot_3.5~svn205090/clang/test/CodeGen/linux-arm-atomic.c	2014-03-29 12:14:58.543982773 +0100
 @@ -1,5 +1,15 @@
  // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
  // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
diff --git a/debian/patches/removeduplicatedeclaration.diff b/debian/patches/removeduplicatedeclaration.diff
index 19c733ef..b66d3df7 100644
--- a/debian/patches/removeduplicatedeclaration.diff
+++ b/debian/patches/removeduplicatedeclaration.diff
@@ -1,9 +1,9 @@
-Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp
+Index: llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/lib/Basic/Targets.cpp
-+++ llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp
-@@ -4325,33 +4325,6 @@ class ARMTargetInfo : public TargetInfo
-     }
+--- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/lib/Basic/Targets.cpp	2014-03-29 12:15:16.884486206 +0100
++++ llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp	2014-03-29 12:15:16.884486206 +0100
+@@ -3843,33 +3843,6 @@
+     // FIXME: Override "preferred align" for double and long long.
    }
  
 -  static bool shouldUseInlineAtomic(const llvm::Triple &T) {
diff --git a/debian/patches/series b/debian/patches/series
index d7771d5e..6f9e37f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,7 +34,7 @@ follow-parallel-var.diff
 hurd-EIEIO-undef.diff
 silent-MCJIIT-tests.diff
 lldb-libname.diff
-strip-svn.diff
+#strip-svn.diff
 lit-lang.diff
 compiler-rt-i586.diff
 clang-analyzer-force-version.diff
diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff
index bd0e0bb1..1b0d3172 100644
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -9,10 +9,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/cross-mo
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -relocation-model=pic -code-model=large %s
 -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm, asan, msan
@@ -20,10 +20,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-lg-pi
  declare i8* @__cxa_allocate_exception(i64)
  declare void @__cxa_throw(i8*, i8*, i8*)
  declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -relocation-model=pic -code-model=small %s
 -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, darwin, aarch64, arm, asan, msan
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-sm-pi
  declare i8* @__cxa_allocate_exception(i64)
  declare void @__cxa_throw(i8*, i8*, i8*)
  declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -42,10 +42,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/multi-mo
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -53,10 +53,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/stubs-sm
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-glo
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -75,10 +75,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-ptr
  
  @.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_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, i686, i386, arm
@@ -86,10 +86,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/c
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/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 -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, i686, i386, arm
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/m
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@@ -108,10 +108,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/t
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -remote-mcjit -O0 -relocation-model=pic -code-model=small %s
 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@@ -119,10 +119,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/t
  
  @.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_3.8~svn243372/test/BugPoint/crash-narrowfunctiontest.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/crash-narrowfunctiontest.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/crash-narrowfunctiontest.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiontest.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/BugPoint/crash-narrowfunctiontest.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/crash-narrowfunctiontest.ll
 @@ -2,7 +2,6 @@
  ;
  ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
@@ -131,10 +131,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiont
  
  define i32 @foo() { ret i32 1 }
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/metadata.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/metadata.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/BugPoint/metadata.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/metadata.ll
 @@ -1,7 +1,6 @@
  ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
  ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
@@ -143,22 +143,22 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll
  
  ; Bugpoint should keep the call's metadata attached to the call.
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/remove_arguments_test.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/remove_arguments_test.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/remove_arguments_test.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/remove_arguments_test.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/BugPoint/remove_arguments_test.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/remove_arguments_test.ll
 @@ -1,7 +1,6 @@
  ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes
  ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
  ; REQUIRES: loadable_module
 -; XFAIL: *
  
- ; Test to make sure that arguments are removed from the function if they are
- ; unnecessary. And clean up any types that frees up too.
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll
+ ; Test to make sure that arguments are removed from the function if they are 
+ ; unnecessary. And clean up any types that that frees up too.
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/Feature/load_module.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/Feature/load_module.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/Feature/load_module.ll
 @@ -3,7 +3,6 @@
  ; RUN:   -disable-output 2>&1 | grep Hello
  ; REQUIRES: loadable_module
@@ -167,10 +167,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll
  
  @junk = global i32 0
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -178,10 +178,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/cross
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s
 -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm, asan, msan
@@ -189,10 +189,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-lg
  declare i8* @__cxa_allocate_exception(i64)
  declare void @__cxa_throw(i8*, i8*, i8*)
  declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s
 -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, darwin, aarch64, arm, asan, msan
@@ -200,10 +200,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-sm
  declare i8* @__cxa_allocate_exception(i64)
  declare void @__cxa_throw(i8*, i8*, i8*)
  declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -211,10 +211,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/multi
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, i686, i386, arm
@@ -222,10 +222,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remot
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/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 -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, i686, i386, arm
@@ -233,10 +233,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remot
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@@ -244,10 +244,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remot
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s
 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@@ -255,10 +255,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remot
  
  @.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_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -266,10 +266,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/stubs
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
@@ -277,10 +277,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_3.7~svn238736/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
diff --git a/debian/patches/silent-more-tests.diff b/debian/patches/silent-more-tests.diff
index 8194ae7a..bc078e4e 100644
--- a/debian/patches/silent-more-tests.diff
+++ b/debian/patches/silent-more-tests.diff
@@ -1,10 +1,10 @@
 # Comment the tests for the code coverage (fails otherwise)
 
 
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiontest.ll
+Index: llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/crash-narrowfunctiontest.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/crash-narrowfunctiontest.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiontest.ll
+--- llvm-toolchain-snapshot_3.5~svn197156.orig/test/BugPoint/crash-narrowfunctiontest.ll	2013-08-05 01:55:24.000000000 +0200
++++ llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/crash-narrowfunctiontest.ll	2013-12-12 23:06:31.454513279 +0100
 @@ -2,6 +2,7 @@
  ;
  ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
@@ -13,10 +13,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiont
  
  define i32 @foo() { ret i32 1 }
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll
+Index: llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/metadata.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/metadata.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll
+--- llvm-toolchain-snapshot_3.5~svn197156.orig/test/BugPoint/metadata.ll	2013-11-23 02:16:29.000000000 +0100
++++ llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/metadata.ll	2013-12-12 23:07:09.050514482 +0100
 @@ -1,6 +1,7 @@
  ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
  ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
@@ -25,22 +25,22 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll
  
  ; Bugpoint should keep the call's metadata attached to the call.
  
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/remove_arguments_test.ll
+Index: llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/remove_arguments_test.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/remove_arguments_test.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/remove_arguments_test.ll
+--- llvm-toolchain-snapshot_3.5~svn197156.orig/test/BugPoint/remove_arguments_test.ll	2013-08-05 01:55:24.000000000 +0200
++++ llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/remove_arguments_test.ll	2013-12-12 23:07:24.362514972 +0100
 @@ -1,6 +1,7 @@
  ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes
  ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
  ; REQUIRES: loadable_module
 +; XFAIL: *
  
- ; Test to make sure that arguments are removed from the function if they are
- ; unnecessary. And clean up any types that frees up too.
-Index: llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll
+ ; Test to make sure that arguments are removed from the function if they are 
+ ; unnecessary. And clean up any types that that frees up too.
+Index: llvm-toolchain-snapshot_3.5~svn197156/test/Feature/load_module.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll
+--- llvm-toolchain-snapshot_3.5~svn197156.orig/test/Feature/load_module.ll	2013-08-05 01:55:24.000000000 +0200
++++ llvm-toolchain-snapshot_3.5~svn197156/test/Feature/load_module.ll	2013-12-12 23:07:44.114515604 +0100
 @@ -3,6 +3,7 @@
  ; RUN:   -disable-output 2>&1 | grep Hello
  ; REQUIRES: loadable_module
diff --git a/debian/patches/strip-svn.diff b/debian/patches/strip-svn.diff
index 614f63aa..972e7056 100644
--- a/debian/patches/strip-svn.diff
+++ b/debian/patches/strip-svn.diff
@@ -1,29 +1,40 @@
-Index: llvm-toolchain-snapshot_3.7~svn242297/autoconf/configure.ac
+Index: llvm-toolchain-snapshot_3.7~svn226019/autoconf/configure.ac
 ===================================================================
---- llvm-toolchain-snapshot_3.7~svn242297.orig/autoconf/configure.ac
-+++ llvm-toolchain-snapshot_3.7~svn242297/autoconf/configure.ac
+--- llvm-toolchain-snapshot_3.7~svn226019.orig/autoconf/configure.ac
++++ llvm-toolchain-snapshot_3.7~svn226019/autoconf/configure.ac
 @@ -32,12 +32,12 @@ dnl===----------------------------------
  dnl Initialize autoconf and define the package name, version number and
  dnl address for reporting bugs.
  
--AC_INIT([LLVM],[3.8.0svn],[http://llvm.org/bugs/])
-+AC_INIT([LLVM],[3.8.0],[http://llvm.org/bugs/])
+-AC_INIT([LLVM],[3.7.0svn],[http://llvm.org/bugs/])
++AC_INIT([LLVM],[3.7.0],[http://llvm.org/bugs/])
  
  LLVM_VERSION_MAJOR=3
- LLVM_VERSION_MINOR=8
+ LLVM_VERSION_MINOR=7
  LLVM_VERSION_PATCH=0
 -LLVM_VERSION_SUFFIX=svn
 +LLVM_VERSION_SUFFIX=
  
  AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API])
  AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API])
-Index: llvm-toolchain-snapshot_3.7~svn242297/configure
+Index: llvm-toolchain-snapshot_3.7~svn226019/configure
 ===================================================================
---- llvm-toolchain-snapshot_3.7~svn242297.orig/configure
-+++ llvm-toolchain-snapshot_3.7~svn242297/configure
-@@ -1956,7 +1956,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+--- llvm-toolchain-snapshot_3.7~svn226019.orig/configure
++++ llvm-toolchain-snapshot_3.7~svn226019/configure
+@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
+ # Identity of this package.
+ PACKAGE_NAME='LLVM'
+ PACKAGE_TARNAME='llvm'
+-PACKAGE_VERSION='3.7.0svn'
+-PACKAGE_STRING='LLVM 3.7.0svn'
++PACKAGE_VERSION='3.7.0'
++PACKAGE_STRING='LLVM 3.7.0'
+ PACKAGE_BUGREPORT='http://llvm.org/bugs/'
+ 
+ ac_unique_file="lib/IR/Module.cpp"
+@@ -1923,7 +1923,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  LLVM_VERSION_MAJOR=3
- LLVM_VERSION_MINOR=8
+ LLVM_VERSION_MINOR=7
  LLVM_VERSION_PATCH=0
 -LLVM_VERSION_SUFFIX=svn
 +LLVM_VERSION_SUFFIX=
diff --git a/debian/patches/use-deb-json.diff b/debian/patches/use-deb-json.diff
index 8c30935e..a065058a 100644
--- a/debian/patches/use-deb-json.diff
+++ b/debian/patches/use-deb-json.diff
@@ -1,21 +1,21 @@
-Index: llvm-toolchain-snapshot_3.8~svn243372/polly/lib/Makefile
+Index: llvm-toolchain-snapshot_3.7~svn237539/polly/lib/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.8~svn243372.orig/polly/lib/Makefile
-+++ llvm-toolchain-snapshot_3.8~svn243372/polly/lib/Makefile
+--- llvm-toolchain-snapshot_3.7~svn237539.orig/polly/lib/Makefile
++++ llvm-toolchain-snapshot_3.7~svn237539/polly/lib/Makefile
 @@ -26,9 +26,9 @@ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
                     CodeGen/IslNodeBuilder.cpp \
                     CodeGen/CodeGeneration.cpp
  
 -POLLY_JSON_FILES= JSON/json_reader.cpp \
--                  JSON/json_value.cpp \
--                  JSON/json_writer.cpp
-+#POLLY_JSON_FILES= JSON/json_reader.cpp \
-+#                  JSON/json_value.cpp \
-+#                  JSON/json_writer.cpp
+-		  JSON/json_value.cpp \
+-		  JSON/json_writer.cpp
++# POLLY_JSON_FILES= JSON/json_reader.cpp \
++# 		  JSON/json_value.cpp \
++# 		  JSON/json_writer.cpp
  
  ISL_FILES= External/isl/basis_reduction_tab.c \
             External/isl/isl_aff.c \
-@@ -142,4 +142,5 @@ SOURCES= Polly.cpp \
+@@ -144,4 +144,5 @@ SOURCES= Polly.cpp \
  #
  include $(LEVEL)/Makefile.common
  
diff --git a/debian/rules b/debian/rules
index b9bb46e9..6d270935 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ TARGET_BUILD	:= build-llvm
 DEB_INST		:= $(CURDIR)/debian/tmp/
 #GCC_VERSION     := 4.8
 GCC_VERSION     := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+|[0-9]+).*$$,\2,p')
-LLVM_VERSION	:= 3.8
+LLVM_VERSION	:= 3.7
 LLVM_VERSION_FULL := $(LLVM_VERSION).0
 SONAME_EXT      := 1
 # Manage the case when the version is 1:3.5~svn213052-1~exp1 or 1:3.4.2-1