rebase of the patch

2025-06-10 06:53:50 +00:00 · 2016-02-03 15:20:09 +00:00 · 2016-02-03 15:20:09 +00:00 · c59c8e7c6c
commit c59c8e7c6c
parent b7c907c689
1 changed files with 70 additions and 70 deletions
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/cross-module-sm-pi
 
 declare i32 @FB()
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/multi-module-sm-pi
 
 declare i32 @FB()
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
 
 define i32 @main() nounwind {
 entry:
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/test-global-init-n
 
 @count = global i32 1, align 4
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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,34 +75,34 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-
 
 @.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-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
@@ -1,6 +1,6 @@
 ; RUN: %lli -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, win32
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
 +; XFAIL: *
 
 @count = global i32 1, align 4
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
@@ -1,6 +1,6 @@
 ; RUN: %lli -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, win32
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
 +; XFAIL: *
 
 @.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-3.8_3.8~+rc1/test/BugPoint/crash-narrowfunctiontest.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/BugPoint/crash-narrowfunctiontest.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/BugPoint/crash-narrowfunctiontest.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/crash-narrowfunctiontest.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/BugPoint/crash-narrowfunctiontest.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -111,10 +111,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/crash-narrowfunctiontest.ll
 
 define i32 @foo() { ret i32 1 }
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/metadata.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/BugPoint/metadata.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/BugPoint/metadata.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/metadata.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/BugPoint/metadata.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -123,10 +123,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/metadata.ll
 
 ; Bugpoint should keep the call's metadata attached to the call.
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/remove_arguments_test.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/BugPoint/remove_arguments_test.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/BugPoint/remove_arguments_test.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/remove_arguments_test.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/BugPoint/remove_arguments_test.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -135,10 +135,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/remove_arguments_test.ll
 
 ; 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-3.8_3.8~+rc1/test/Feature/load_module.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/Feature/load_module.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/Feature/load_module.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/Feature/load_module.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/Feature/load_module.ll
+++ llvm-toolchain-3.8_3.8~+rc2/test/Feature/load_module.ll
@@ -3,7 +3,6 @@
 ; RUN:   -disable-output 2>&1 | grep Hello
 ; REQUIRES: loadable_module
@ -147,10 +147,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/Feature/load_module.ll
 
 @junk = global i32 0
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -158,10 +158,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/cross-module-sm
 
 declare i32 @FB()
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -169,10 +169,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -180,10 +180,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -191,34 +191,34 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/multi-module-sm
 
 declare i32 @FB()
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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, win32
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
 +; XFAIL: *
 
 @count = global i32 1, align 4
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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, win32
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
 +; XFAIL: *
 
 @.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-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -226,10 +226,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
 
 define i32 @main() nounwind {
 entry:
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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
@ -237,10 +237,10 @@ Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/test-global-ini
 
 @count = global i32 1, align 4
 
-Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-3.8_3.8~+rc2/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-3.8_3.8~+rc2.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-3.8_3.8~+rc2/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