From a319f993ee356dec1905e6a5fe0e9883d1b916fa Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 20 Aug 2016 08:45:14 +0000
Subject: [PATCH] patches rebased

---
 debian/patches/silent-MCJIIT-tests.diff | 152 ++++++++++++------------
 debian/patches/silent-gold-utils.diff   |  95 +++++++--------
 2 files changed, 124 insertions(+), 123 deletions(-)

diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff
index 398275df..2f9dbd9f 100644
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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_4.0~svn279231/test/ExecutionEngine/MCJIT/cross-mo
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
@@ -20,10 +20,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/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_4.0~svn279231/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/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_4.0~svn279231/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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,43 +42,43 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/multi-mo
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
-+; XFAIL: *
+-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
++; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm, x86_64
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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, i686, i386
-+; XFAIL: *
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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, i686, i386
-+; XFAIL: mips-, mipsel-, aarch64, i686, i386, x86_64
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
  
  @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
  @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/crash-narrowfunctiontest.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/BugPoint/crash-narrowfunctiontest.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/BugPoint/crash-narrowfunctiontest.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/crash-narrowfunctiontest.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/BugPoint/crash-narrowfunctiontest.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
@@ -87,10 +87,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/crash-narrowfunctiont
  
  define i32 @foo() { ret i32 1 }
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/metadata.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/BugPoint/metadata.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/BugPoint/metadata.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/metadata.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/BugPoint/metadata.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/BugPoint/metadata.ll
 @@ -1,7 +1,6 @@
  ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes -disable-namedmd-remove > /dev/null
  ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
@@ -99,10 +99,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/metadata.ll
  
  ; Bugpoint should keep the call's metadata attached to the call.
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/remove_arguments_test.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/BugPoint/remove_arguments_test.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/BugPoint/remove_arguments_test.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/remove_arguments_test.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/BugPoint/remove_arguments_test.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
@@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/remove_arguments_test
  
  ; 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_4.0~svn279231/test/Feature/load_module.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/Feature/load_module.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/Feature/load_module.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/Feature/load_module.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/Feature/load_module.ll
 @@ -3,7 +3,6 @@
  ; RUN:   -disable-output 2>&1 | grep Hello
  ; REQUIRES: loadable_module
@@ -123,10 +123,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/test/Feature/load_module.ll
  
  @junk = global i32 0
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
@@ -134,10 +134,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/cross
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
@@ -145,10 +145,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/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_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
@@ -156,10 +156,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/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_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
@@ -167,60 +167,60 @@ Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/multi
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 @@ -1,6 +1,6 @@
  ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
  ; RUN:   -relocation-model=pic -code-model=small %s > /dev/null
--; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32
-+; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32, x86_64
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32, x86_64
  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 @@ -1,6 +1,6 @@
  ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
  ; RUN:   -O0 -relocation-model=pic -code-model=small %s
--; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32
-+; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32, x86_64
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32, x86_64
  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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
-+; XFAIL: mips-, mipsel-, i686, i386, aarch64, x86_64
+-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
++; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm, x86_64
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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, i686, i386
-+; XFAIL: mips-, mipsel-, aarch64, i686, i386, x86_64
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279231.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/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, i686, i386
-+; XFAIL: mips-, mipsel-, aarch64, i686, i386, x86_64
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
  
  @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
  @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
diff --git a/debian/patches/silent-gold-utils.diff b/debian/patches/silent-gold-utils.diff
index 16fae62a..44e76278 100644
--- a/debian/patches/silent-gold-utils.diff
+++ b/debian/patches/silent-gold-utils.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/pr19901_thinlto.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/pr19901_thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/pr19901_thinlto.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/pr19901_thinlto.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/pr19901_thinlto.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/pr19901_thinlto.ll
 @@ -4,6 +4,7 @@
  ; RUN:     --plugin-opt=thinlto \
  ; RUN:     -shared -m elf_x86_64 -o %t.so %t2.o %t.o
@@ -10,11 +10,11 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/pr19901_thinlto
  
  ; CHECK:       Symbol {
  ; CHECK:         Name: f
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/thinlto.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto.ll
-@@ -105,6 +105,8 @@
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto.ll
+@@ -115,6 +115,8 @@
  ; COMBINED-NEXT: <COMBINED_ENTRY abbrevid={{[0-9]+}} op0={{1|2}} op1={{-3706093650706652785|-5300342847281564238}}
  ; COMBINED-NEXT: </VALUE_SYMTAB
  
@@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto.ll
  declare void @g(...)
  
  define void @f() {
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_archive.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_archive.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/thinlto_archive.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_archive.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto_archive.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_archive.ll
 @@ -14,6 +14,7 @@
  ; RUN:    --plugin-opt=jobs=1 \
  ; RUN:    -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s
@@ -35,10 +35,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_archive
  
  ; CHECK-DAG: Import g
  declare void @g(...)
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_internalize.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_internalize.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/thinlto_internalize.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_internalize.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto_internalize.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_internalize.ll
 @@ -14,6 +14,8 @@
  ; h() should be internalized after promotion, and eliminated after inlining
  ; CHECK-NOT: @h.llvm.
@@ -48,10 +48,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_interna
  target triple = "x86_64-unknown-linux-gnu"
  define i32 @g() {
    call void @f()
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_linkonceresolution.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_linkonceresolution.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_linkonceresolution.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_linkonceresolution.ll
 @@ -23,6 +23,8 @@
  ; OPT-NOT: @f()
  ; OPT2: define weak_odr hidden void @f()
@@ -61,10 +61,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_linkonc
  target triple = "x86_64-unknown-linux-gnu"
  define i32 @g() {
    call void @f()
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_weak_resolution.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_weak_resolution.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/thinlto_weak_resolution.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_weak_resolution.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto_weak_resolution.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_weak_resolution.ll
 @@ -24,6 +24,7 @@
  ; OPT2-NOT: @
  
@@ -73,10 +73,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/thinlto_weak_re
  
  target triple = "x86_64-unknown-linux-gnu"
  
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/emit-llvm.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/emit-llvm.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/emit-llvm.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/emit-llvm.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/emit-llvm.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/emit-llvm.ll
 @@ -21,6 +21,8 @@
  ; RUN: not test -a %t4.o
  
@@ -86,10 +86,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/emit-llvm.ll
  
  target triple = "x86_64-unknown-linux-gnu"
  
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/parallel.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/parallel.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/parallel.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/parallel.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/parallel.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/parallel.ll
 @@ -5,6 +5,7 @@
  ; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s
  ; RUN: llvm-nm %t.o0 | FileCheck --check-prefix=CHECK0 %s
@@ -98,10 +98,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/parallel.ll
  
  target triple = "x86_64-unknown-linux-gnu"
  
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/slp-vectorize.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/slp-vectorize.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/slp-vectorize.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/slp-vectorize.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/slp-vectorize.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/slp-vectorize.ll
 @@ -7,6 +7,7 @@
  
  ; test that the vectorizer is run.
@@ -110,10 +110,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/slp-vectorize.l
  
  target triple = "x86_64-unknown-linux-gnu"
  
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/strip_names.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/strip_names.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/strip_names.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/strip_names.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/strip_names.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/strip_names.ll
 @@ -23,6 +23,7 @@
  ; NONAME:  %2 = load i32, i32* @GlobalValueName
  ; NONAME:  %3 = add i32 %0, %2
@@ -122,22 +122,23 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/strip_names.ll
  
  @GlobalValueName = global i32 0
  
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/type-merge2.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/type-merge2.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/type-merge2.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/type-merge2.ll
-@@ -4,6 +4,7 @@
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/type-merge2.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/type-merge2.ll
+@@ -4,7 +4,7 @@
  ; RUN:    --plugin-opt=save-temps \
  ; RUN:    -shared %t.o %t2.o -o %t3.o
- ; RUN: llvm-dis %t3.o.2.internalize.bc -o - | FileCheck %s
+ ; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s
+-
 +; XFAIL: *
- 
  %zed = type { i8 }
  define void @foo()  {
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/vectorize.ll
+   call void @bar(%zed* null)
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/vectorize.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/vectorize.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/vectorize.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/vectorize.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/vectorize.ll
 @@ -7,6 +7,7 @@
  
  ; test that the vectorizer is run.
@@ -146,10 +147,10 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/vectorize.ll
  
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/visibility.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/visibility.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/visibility.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/visibility.ll
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/visibility.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/visibility.ll
 @@ -15,6 +15,7 @@
  ; CHECK-NEXT: Other [
  ; CHECK-NEXT:   STV_PROTECTED
@@ -158,11 +159,11 @@ Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/visibility.ll
  
  ; IR: define void @foo
  
-Index: llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/common_thinlto.ll
+Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/common_thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn279045.orig/test/tools/gold/X86/common_thinlto.ll
-+++ llvm-toolchain-snapshot_4.0~svn279045/test/tools/gold/X86/common_thinlto.ll
-@@ -16,6 +16,7 @@
+--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/common_thinlto.ll
++++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/common_thinlto.ll
+@@ -17,6 +17,7 @@
  
  ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM
  ; NM: bar