rebase of the patches

2025-06-11 07:35:54 +00:00 · 2015-06-01 10:16:07 +00:00 · 2015-06-01 10:16:07 +00:00 · 2b38f7016a
commit 2b38f7016a
parent 74daf1623d
2 changed files with 115 additions and 115 deletions
--- a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
+++ b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/test/dotest.py
+Index: llvm-toolchain-snapshot_3.7~svn238736/lldb/test/dotest.py
 ===================================================================
--- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/test/dotest.py	2014-01-30 21:19:22.000000000 +0100
-+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/test/dotest.py	2014-02-12 17:04:14.971889980 +0100
-@@ -1612,8 +1612,8 @@
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/lldb/test/dotest.py
+++ llvm-toolchain-snapshot_3.7~svn238736/lldb/test/dotest.py
+@@ -1671,8 +1671,8 @@ for ia in range(len(archs) if iterArchs
             def addSuccess(self, test):
                 global parsable
                 super(LLDBTestResult, self).addSuccess(test)
@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/test/dotest.py
 
             def addError(self, test, err):
                 global sdir_has_content
-@@ -1653,8 +1653,8 @@
+@@ -1712,8 +1712,8 @@ for ia in range(len(archs) if iterArchs
                 method = getattr(test, "markExpectedFailure", None)
                 if method:
                     method(err, bugnumber)
@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/test/dotest.py
 
             def addSkip(self, test, reason):
                 global sdir_has_content
-@@ -1664,8 +1664,8 @@
+@@ -1723,8 +1723,8 @@ for ia in range(len(archs) if iterArchs
                 method = getattr(test, "markSkippedTest", None)
                 if method:
                     method()
@ -35,11 +35,11 @@ Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/test/dotest.py
 
             def addUnexpectedSuccess(self, test, bugnumber):
                 global sdir_has_content
-Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/test/unittest2/runner.py
+Index: llvm-toolchain-snapshot_3.7~svn238736/lldb/test/unittest2/runner.py
 ===================================================================
--- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/test/unittest2/runner.py	2013-09-25 22:47:51.000000000 +0200
-+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/test/unittest2/runner.py	2014-02-12 17:04:14.971889980 +0100
-@@ -171,9 +171,9 @@
+--- llvm-toolchain-snapshot_3.7~svn238736.orig/lldb/test/unittest2/runner.py
+++ llvm-toolchain-snapshot_3.7~svn238736/lldb/test/unittest2/runner.py
+@@ -171,9 +171,9 @@ class TextTestRunner(unittest.TextTestRu
         if hasattr(result, 'separator2'):
             self.stream.writeln(result.separator2)
         run = result.testsRun
@ -50,5 +50,5 @@ Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/test/unittest2/runner.py
 +#                            (run, run != 1 and "s" or "", timeTaken))
 +#        self.stream.writeln()
         
-         expectedFails = unexpectedSuccesses = skipped = 0
+         expectedFails = unexpectedSuccesses = skipped = passed = failed = errored = 0
         try:
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@ -1,128 +1,128 @@
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386
+-; XFAIL: mips-, mipsel-, i686, i386
 +; XFAIL: *
 
 declare i32 @FB()
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, aarch64, arm, asan, msan
+-; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm, asan, msan
 +; XFAIL: *
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, darwin, aarch64, arm, asan, msan
+-; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, darwin, aarch64, arm, asan, msan
 +; XFAIL: *
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386
+-; XFAIL: mips-, mipsel-, i686, i386
 +; XFAIL: *
 
 declare i32 @FB()
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, aarch64, arm
+-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
 +; XFAIL: *
 
 define i32 @main() nounwind {
 entry:
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, aarch64, arm, i686, i386
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
 +; XFAIL: *
 
 @count = global i32 1, align 4
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, aarch64, arm, i686, i386
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
 +; 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-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, arm
-+; XFAIL: mips, i686, i386, arm, i586
+-; XFAIL: mips-, mipsel-, i686, i386, arm
+; XFAIL: *
 
 declare i32 @FB()
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, arm
-+; XFAIL: mips, i686, i386, arm, i586
+-; XFAIL: mips-, mipsel-, i686, i386, arm
+; XFAIL: *
 
 declare i32 @FB()
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, aarch64, arm, i686, i386
-+; XFAIL: mips, aarch64, arm, i686, i386, i586
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
+; XFAIL: *
 
 @count = global i32 1, align 4
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, aarch64, arm, i686, i386
-+; XFAIL: mips, aarch64, arm, i686, i386, i586
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
+; 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-snapshot_3.7~svn233794/test/BugPoint/crash-narrowfunctiontest.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/crash-narrowfunctiontest.ll
 ===================================================================
--- llvm-toolchain-snapshot_3.7~svn233794.orig/test/BugPoint/crash-narrowfunctiontest.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794/test/BugPoint/crash-narrowfunctiont
 
 define i32 @foo() { ret i32 1 }
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/test/BugPoint/metadata.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/metadata.ll
 ===================================================================
--- llvm-toolchain-snapshot_3.7~svn233794.orig/test/BugPoint/metadata.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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,10 +143,10 @@ Index: llvm-toolchain-snapshot_3.7~svn233794/test/BugPoint/metadata.ll
 
 ; Bugpoint should keep the call's metadata attached to the call.
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/test/BugPoint/remove_arguments_test.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/remove_arguments_test.ll
 ===================================================================
--- llvm-toolchain-snapshot_3.7~svn233794.orig/test/BugPoint/remove_arguments_test.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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
@ -155,10 +155,10 @@ Index: llvm-toolchain-snapshot_3.7~svn233794/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 that frees up too.
-Index: llvm-toolchain-snapshot_3.7~svn233794/test/Feature/load_module.ll
+Index: llvm-toolchain-snapshot_3.7~svn238736/test/Feature/load_module.ll
 ===================================================================
--- llvm-toolchain-snapshot_3.7~svn233794.orig/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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,123 +167,123 @@ Index: llvm-toolchain-snapshot_3.7~svn233794/test/Feature/load_module.ll
 
 @junk = global i32 0
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386
+-; XFAIL: mips-, mipsel-, i686, i386
 +; XFAIL: *
 
 declare i32 @FB()
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, aarch64, arm, asan, msan
+-; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm, asan, msan
 +; XFAIL: *
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, darwin, aarch64, arm, asan, msan
+-; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, darwin, aarch64, arm, asan, msan
 +; XFAIL: *
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386
+-; XFAIL: mips-, mipsel-, i686, i386
 +; XFAIL: *
 
 declare i32 @FB()
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, arm
+-; XFAIL: mips-, mipsel-, i686, i386, arm
 +; XFAIL: *
 
 declare i32 @FB()
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, arm
+-; XFAIL: mips-, mipsel-, i686, i386, arm
 +; XFAIL: *
 
 declare i32 @FB()
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, aarch64, arm, i686, i386
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
 +; XFAIL: *
 
 @count = global i32 1, align 4
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, aarch64, arm, i686, i386
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
 +; 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-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, i686, i386, aarch64, arm
+-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
 +; XFAIL: *
 
 define i32 @main() nounwind {
 entry:
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, aarch64, arm, i686, i386
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
 +; XFAIL: *
 
 @count = global i32 1, align 4
 
-Index: llvm-toolchain-snapshot_3.7~svn233794/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.7~svn233794.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_3.7~svn233794/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, aarch64, arm, i686, i386
+-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
 +; XFAIL: *
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1