diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff
index 61c91fec..398275df 100644
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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.9~svn267686/test/ExecutionEngine/MCJIT/cross-mo
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/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.9~svn267686/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/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.9~svn267686/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/test/ExecutionEngine/MCJIT/multi-mo
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -1,5 +1,5 @@
  ; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
--; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
+-; XFAIL: mips-, mipsel-, i686, i386, aarch64
 +; XFAIL: *
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -1,5 +1,5 @@
  ; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null
--; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
+-; XFAIL: mips-, mipsel-, aarch64, i686, i386
 +; XFAIL: *
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -1,5 +1,5 @@
  ; RUN: %lli -O0 -relocation-model=pic -code-model=small %s
--; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
-+; XFAIL: *
+-; XFAIL: mips-, mipsel-, aarch64, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, 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_3.9~svn267686/test/BugPoint/crash-narrowfunctiontest.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/crash-narrowfunctiontest.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/BugPoint/crash-narrowfunctiontest.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/test/BugPoint/crash-narrowfunctiont
  
  define i32 @foo() { ret i32 1 }
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/BugPoint/metadata.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/metadata.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/BugPoint/metadata.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/test/BugPoint/metadata.ll
  
  ; Bugpoint should keep the call's metadata attached to the call.
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/BugPoint/remove_arguments_test.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/BugPoint/remove_arguments_test.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/BugPoint/remove_arguments_test.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/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_3.9~svn267686/test/Feature/load_module.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/Feature/load_module.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -3,7 +3,6 @@
  ; RUN:   -disable-output 2>&1 | grep Hello
  ; REQUIRES: loadable_module
@@ -123,10 +123,10 @@ Index: llvm-toolchain-snapshot_3.9~svn267686/test/Feature/load_module.ll
  
  @junk = global i32 0
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/cross
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/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.9~svn267686/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/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.9~svn267686/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/multi
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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, arm, i686, i386, mingw32, win32
-+; XFAIL: *
+-; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32
++; XFAIL: mips-, mipsel-, aarch64, 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_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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, arm, i686, i386, mingw32, win32
-+; XFAIL: *
+-; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32
++; XFAIL: mips-, mipsel-, aarch64, 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_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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
-+; XFAIL: *
+-; XFAIL: mips-, mipsel-, i686, i386, aarch64
++; XFAIL: mips-, mipsel-, i686, i386, aarch64, x86_64
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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
-+; XFAIL: *
+-; XFAIL: mips-, mipsel-, aarch64, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, i686, i386, x86_64
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_3.9~svn267686/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_4.0~svn279231/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn267686.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.9~svn267686/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
 @@ -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
-+; XFAIL: *
+-; XFAIL: mips-, mipsel-, aarch64, i686, i386
++; XFAIL: mips-, mipsel-, aarch64, 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