* debian/patches/{23-strlcpy_strlcat_warning_removed.diff,

0003-Debian-version-info-and-bugreport.patch, atomic_library_[12].diff,
  python-clangpath.diff,removeduplicatedeclaration.diff,
  fix-clang-path-and-build.diff,mips-fpxx-enable.diff}: Refreshed.
* debian/patches/{silent-more-tests.diff,silent-MCJIIT-tests.diff}: Updated.
This commit is contained in:
Sylvestre Ledru 2016-10-27 17:03:56 +00:00
parent a405cb76c8
commit 16a4a5f667
11 changed files with 141 additions and 181 deletions

7
debian/changelog vendored
View File

@ -5,6 +5,13 @@ llvm-toolchain-snapshot (1:4.0~svn282142-1~exp1) experimental; urgency=medium
(Closes: #841309) (Closes: #841309)
* Fix the VCS-* fields * Fix the VCS-* fields
[ Kai Wasserbäch ]
* debian/patches/{23-strlcpy_strlcat_warning_removed.diff,
0003-Debian-version-info-and-bugreport.patch, atomic_library_[12].diff,
python-clangpath.diff,removeduplicatedeclaration.diff,
fix-clang-path-and-build.diff,mips-fpxx-enable.diff}: Refreshed.
* debian/patches/{silent-more-tests.diff,silent-MCJIIT-tests.diff}: Updated.
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 24 Oct 2016 10:45:07 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Mon, 24 Oct 2016 10:45:07 +0200
llvm-toolchain-snapshot (1:4.0~svn280796-1~exp1) experimental; urgency=medium llvm-toolchain-snapshot (1:4.0~svn280796-1~exp1) experimental; urgency=medium

View File

@ -4,7 +4,7 @@
--- a/lib/Support/CommandLine.cpp --- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp +++ b/lib/Support/CommandLine.cpp
@@ -2027,6 +2027,10 @@ public: @@ -2029,6 +2029,10 @@ public:
OS << " " << LLVM_VERSION_INFO; OS << " " << LLVM_VERSION_INFO;
#endif #endif
OS << "\n "; OS << "\n ";

View File

@ -20,7 +20,7 @@
BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
@@ -872,8 +872,8 @@ LIBBUILTIN(getcontext, "iK*", "fj", @@ -873,8 +873,8 @@ LIBBUILTIN(getcontext, "iK*", "fj",
LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES) LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES)
LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES) LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES)
// non-standard but very common // non-standard but very common
@ -33,7 +33,7 @@
// long double objc_msgSend_fpret(id self, SEL op, ...) // long double objc_msgSend_fpret(id self, SEL op, ...)
--- a/clang/lib/AST/Decl.cpp --- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp +++ b/clang/lib/AST/Decl.cpp
@@ -3401,13 +3401,13 @@ unsigned FunctionDecl::getMemoryFunction @@ -3454,13 +3454,13 @@ unsigned FunctionDecl::getMemoryFunction
case Builtin::BImemmove: case Builtin::BImemmove:
return Builtin::BImemmove; return Builtin::BImemmove;
@ -66,7 +66,7 @@
case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncat_chk:
case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___strncpy_chk:
case Builtin::BI__builtin___stpncpy_chk: case Builtin::BI__builtin___stpncpy_chk:
@@ -2437,9 +2437,10 @@ bool Sema::CheckFunctionCall(FunctionDec @@ -2552,9 +2552,10 @@ bool Sema::CheckFunctionCall(FunctionDec
return false; return false;
// Handle memory setting and copying functions. // Handle memory setting and copying functions.

View File

@ -5,7 +5,7 @@
--- a/clang/lib/Basic/Targets.cpp --- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp
@@ -4382,6 +4382,20 @@ protected: @@ -4391,6 +4391,20 @@ protected:
Builder.defineMacro("__ELF__"); Builder.defineMacro("__ELF__");
} }

View File

@ -5,7 +5,7 @@
--- a/clang/lib/Basic/Targets.cpp --- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp
@@ -4391,9 +4391,23 @@ protected: @@ -4400,9 +4400,23 @@ protected:
if (T.getOS() != llvm::Triple::Linux) if (T.getOS() != llvm::Triple::Linux)
return false; return false;
StringRef ArchName = T.getArchName(); StringRef ArchName = T.getArchName();

View File

@ -4,7 +4,7 @@
--- a/clang/lib/Driver/ToolChains.cpp --- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp
@@ -3402,6 +3402,8 @@ void Haiku::AddClangCXXStdlibIncludeArgs @@ -3447,6 +3447,8 @@ void Haiku::AddClangCXXStdlibIncludeArgs
DriverArgs.hasArg(options::OPT_nostdincxx)) DriverArgs.hasArg(options::OPT_nostdincxx))
return; return;

View File

@ -4,7 +4,7 @@
--- a/clang/lib/Driver/Tools.cpp --- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp
@@ -7549,11 +7549,6 @@ bool mips::isFP64ADefault(const llvm::Tr @@ -7616,11 +7616,6 @@ bool mips::isFP64ADefault(const llvm::Tr
bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName, bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
StringRef ABIName, mips::FloatABI FloatABI) { StringRef ABIName, mips::FloatABI FloatABI) {

View File

@ -4,7 +4,7 @@
--- a/clang/bindings/python/clang/cindex.py --- a/clang/bindings/python/clang/cindex.py
+++ b/clang/bindings/python/clang/cindex.py +++ b/clang/bindings/python/clang/cindex.py
@@ -3723,7 +3723,7 @@ class Config: @@ -3851,7 +3851,7 @@ class Config:
elif name == 'Windows': elif name == 'Windows':
file = 'libclang.dll' file = 'libclang.dll'
else: else:

View File

@ -4,7 +4,7 @@
--- a/clang/lib/Basic/Targets.cpp --- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp
@@ -4382,33 +4382,6 @@ protected: @@ -4391,33 +4391,6 @@ protected:
Builder.defineMacro("__ELF__"); Builder.defineMacro("__ELF__");
} }

View File

@ -1,84 +1,25 @@
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll ---
=================================================================== test/BugPoint/crash-narrowfunctiontest.ll | 1 -
--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll test/BugPoint/remove_arguments_test.ll | 1 -
+++ llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll | 2 +-
@@ -1,5 +1,5 @@ test/ExecutionEngine/MCJIT/eh-lg-pic.ll | 2 +-
; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll | 2 +-
-; XFAIL: mips-, mipsel-, i686, i386 test/ExecutionEngine/MCJIT/stubs-sm-pic.ll | 2 +-
+; XFAIL: * test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll | 2 +-
test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll | 2 +-
test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll | 2 +-
test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll | 2 +-
test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll | 2 +-
test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll | 2 +-
test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll | 2 +-
test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll | 2 +-
test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll | 2 +-
test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll | 2 +-
test/Feature/load_module.ll | 1 -
17 files changed, 14 insertions(+), 17 deletions(-)
declare i32 @FB() --- a/test/BugPoint/crash-narrowfunctiontest.ll
+++ b/test/BugPoint/crash-narrowfunctiontest.ll
Index: llvm-toolchain-snapshot_4.0~svn279363/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
+; XFAIL: *
declare i8* @__cxa_allocate_exception(i64)
declare void @__cxa_throw(i8*, i8*, i8*)
declare i32 @__gxx_personality_v0(...)
Index: llvm-toolchain-snapshot_4.0~svn279363/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
+; XFAIL: *
declare i8* @__cxa_allocate_exception(i64)
declare void @__cxa_throw(i8*, i8*, i8*)
declare i32 @__gxx_personality_v0(...)
Index: llvm-toolchain-snapshot_4.0~svn279363/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
+; XFAIL: *
declare i32 @FB()
Index: llvm-toolchain-snapshot_4.0~svn279363/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, arm
+; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm, x86_64
define i32 @main() nounwind {
entry:
Index: llvm-toolchain-snapshot_4.0~svn279363/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, arm, i686, i386
+; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, x86_64
@count = global i32 1, align 4
Index: llvm-toolchain-snapshot_4.0~svn279363/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, 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~svn279363/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 @@ @@ -2,7 +2,6 @@
; ;
; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
@ -87,22 +28,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/BugPoint/crash-narrowfunctiont
define i32 @foo() { ret i32 1 } define i32 @foo() { ret i32 1 }
Index: llvm-toolchain-snapshot_4.0~svn279363/test/BugPoint/metadata.ll --- a/test/BugPoint/remove_arguments_test.ll
=================================================================== +++ b/test/BugPoint/remove_arguments_test.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
; REQUIRES: loadable_module
-; XFAIL: *
; Bugpoint should keep the call's metadata attached to the call.
Index: llvm-toolchain-snapshot_4.0~svn279363/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 @@ @@ -1,7 +1,6 @@
; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes
; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
@ -111,22 +38,62 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/BugPoint/remove_arguments_test
; Test to make sure that arguments are removed from the function if they are ; Test to make sure that arguments are removed from the function if they are
; unnecessary. And clean up any types that frees up too. ; unnecessary. And clean up any types that frees up too.
Index: llvm-toolchain-snapshot_4.0~svn279363/test/Feature/load_module.ll --- a/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
=================================================================== +++ b/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/Feature/load_module.ll @@ -1,5 +1,5 @@
+++ llvm-toolchain-snapshot_4.0~svn279363/test/Feature/load_module.ll ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
@@ -3,7 +3,6 @@ -; XFAIL: mips-, mipsel-, i686, i386
; RUN: -disable-output 2>&1 | grep Hello +; XFAIL: *
; REQUIRES: loadable_module
; FIXME: On Cygming, it might fail without building LLVMHello manually.
-; XFAIL: *
@junk = global i32 0 declare i32 @FB()
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll --- a/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
=================================================================== +++ b/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
--- llvm-toolchain-snapshot_4.0~svn279363.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll @@ -1,5 +1,5 @@
+++ llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll ; RUN: %lli -relocation-model=pic -code-model=large %s
-; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm
+; XFAIL: *
declare i8* @__cxa_allocate_exception(i64)
declare void @__cxa_throw(i8*, i8*, i8*)
declare i32 @__gxx_personality_v0(...)
--- a/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+++ b/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
+; XFAIL: *
declare i32 @FB()
--- a/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+++ b/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, arm, x86_64
define i32 @main() nounwind {
entry:
--- a/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+++ b/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, arm, i686, i386, x86_64
@count = global i32 1, align 4
--- a/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+++ b/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: 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
--- a/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+++ b/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
@@ -1,5 +1,5 @@ @@ -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 ; 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 -; XFAIL: mips-, mipsel-, i686, i386
@ -134,10 +101,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/cross
declare i32 @FB() declare i32 @FB()
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll --- a/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
=================================================================== +++ b/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 @@ @@ -1,5 +1,5 @@
; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s
-; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm
@ -145,21 +110,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/eh-lg
declare i8* @__cxa_allocate_exception(i64) declare i8* @__cxa_allocate_exception(i64)
declare void @__cxa_throw(i8*, i8*, i8*) declare void @__cxa_throw(i8*, i8*, i8*)
declare i32 @__gxx_personality_v0(...) declare i32 @__gxx_personality_v0(...)
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll --- a/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
=================================================================== +++ b/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.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
+; XFAIL: *
declare i8* @__cxa_allocate_exception(i64)
declare void @__cxa_throw(i8*, i8*, i8*)
declare i32 @__gxx_personality_v0(...)
Index: llvm-toolchain-snapshot_4.0~svn279363/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 @@ @@ -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 ; 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 -; XFAIL: mips-, mipsel-, i686, i386
@ -167,10 +119,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/multi
declare i32 @FB() declare i32 @FB()
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll --- a/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
=================================================================== +++ b/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 @@ @@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; 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 ; RUN: -relocation-model=pic -code-model=small %s > /dev/null
@ -179,10 +129,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/remot
; UNSUPPORTED: powerpc64-unknown-linux-gnu ; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll --- a/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
=================================================================== +++ b/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 @@ @@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -O0 -relocation-model=pic -code-model=small %s ; RUN: -O0 -relocation-model=pic -code-model=small %s
@ -191,10 +139,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/remot
; UNSUPPORTED: powerpc64-unknown-linux-gnu ; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll --- a/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
=================================================================== +++ b/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 @@ @@ -1,5 +1,5 @@
; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s ; 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: mips-, mipsel-, i686, i386, aarch64, arm
@ -202,10 +148,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/stubs
define i32 @main() nounwind { define i32 @main() nounwind {
entry: entry:
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll --- a/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
=================================================================== +++ b/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 @@ @@ -1,5 +1,5 @@
; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@ -213,10 +157,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/test-
@count = global i32 1, align 4 @count = global i32 1, align 4
Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll --- a/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
=================================================================== +++ b/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 @@ @@ -1,5 +1,5 @@
; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s ; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@ -224,3 +166,13 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/ExecutionEngine/OrcMCJIT/test-
@.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @.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 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
--- a/test/Feature/load_module.ll
+++ b/test/Feature/load_module.ll
@@ -3,7 +3,6 @@
; RUN: -disable-output 2>&1 | grep Hello
; REQUIRES: loadable_module
; FIXME: On Cygming, it might fail without building LLVMHello manually.
-; XFAIL: *
@junk = global i32 0

View File

@ -1,10 +1,15 @@
# Comment the tests for the code coverage (fails otherwise) # Comment the tests for the code coverage (fails otherwise)
Index: llvm-toolchain-snapshot_4.0~svn277959/test/BugPoint/crash-narrowfunctiontest.ll ---
=================================================================== test/BugPoint/crash-narrowfunctiontest.ll | 1 +
--- llvm-toolchain-snapshot_4.0~svn277959.orig/test/BugPoint/crash-narrowfunctiontest.ll test/BugPoint/metadata.ll | 3 ++-
+++ llvm-toolchain-snapshot_4.0~svn277959/test/BugPoint/crash-narrowfunctiontest.ll test/BugPoint/remove_arguments_test.ll | 1 +
test/Feature/load_module.ll | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
--- a/test/BugPoint/crash-narrowfunctiontest.ll
+++ b/test/BugPoint/crash-narrowfunctiontest.ll
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
; ;
; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
@ -13,22 +18,20 @@ Index: llvm-toolchain-snapshot_4.0~svn277959/test/BugPoint/crash-narrowfunctiont
define i32 @foo() { ret i32 1 } define i32 @foo() { ret i32 1 }
Index: llvm-toolchain-snapshot_4.0~svn277959/test/BugPoint/metadata.ll --- a/test/BugPoint/metadata.ll
=================================================================== +++ b/test/BugPoint/metadata.ll
--- llvm-toolchain-snapshot_4.0~svn277959.orig/test/BugPoint/metadata.ll @@ -7,7 +7,8 @@
+++ llvm-toolchain-snapshot_4.0~svn277959/test/BugPoint/metadata.ll ;
@@ -1,6 +1,7 @@ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t-notype -bugpoint-crashcalls -silence-passes -disable-namedmd-remove -disable-strip-debuginfo > /dev/null
; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes -disable-namedmd-remove > /dev/null ; RUN: llvm-dis %t-notype-reduced-simplified.bc -o - | FileCheck %s --check-prefix=NOTYPE
; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s -;
; REQUIRES: loadable_module
+; XFAIL: * +; XFAIL: *
+
; Bugpoint should keep the call's metadata attached to the call. ; Bugpoint should keep the call's metadata attached to the call.
Index: llvm-toolchain-snapshot_4.0~svn277959/test/BugPoint/remove_arguments_test.ll ; CHECK: call void @foo(), !dbg ![[LOC:[0-9]+]], !attach ![[CALL:[0-9]+]]
=================================================================== --- a/test/BugPoint/remove_arguments_test.ll
--- llvm-toolchain-snapshot_4.0~svn277959.orig/test/BugPoint/remove_arguments_test.ll +++ b/test/BugPoint/remove_arguments_test.ll
+++ llvm-toolchain-snapshot_4.0~svn277959/test/BugPoint/remove_arguments_test.ll
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes
; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
@ -37,10 +40,8 @@ Index: llvm-toolchain-snapshot_4.0~svn277959/test/BugPoint/remove_arguments_test
; Test to make sure that arguments are removed from the function if they are ; Test to make sure that arguments are removed from the function if they are
; unnecessary. And clean up any types that frees up too. ; unnecessary. And clean up any types that frees up too.
Index: llvm-toolchain-snapshot_4.0~svn277959/test/Feature/load_module.ll --- a/test/Feature/load_module.ll
=================================================================== +++ b/test/Feature/load_module.ll
--- llvm-toolchain-snapshot_4.0~svn277959.orig/test/Feature/load_module.ll
+++ llvm-toolchain-snapshot_4.0~svn277959/test/Feature/load_module.ll
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
; RUN: -disable-output 2>&1 | grep Hello ; RUN: -disable-output 2>&1 | grep Hello
; REQUIRES: loadable_module ; REQUIRES: loadable_module