rebase of the patches

This commit is contained in:
Sylvestre Ledru 2017-06-30 06:40:20 +00:00
parent ae2614f277
commit f9051f1cb2
2 changed files with 8 additions and 8 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_5.0~svn305065/lldb/scripts/lldb.swig
Index: llvm-toolchain-snapshot_5.0~svn306792/lldb/scripts/lldb.swig
===================================================================
--- llvm-toolchain-snapshot_5.0~svn305065.orig/lldb/scripts/lldb.swig
+++ llvm-toolchain-snapshot_5.0~svn305065/lldb/scripts/lldb.swig
@@ -44,7 +44,7 @@ Older swig versions will simply ignore t
--- llvm-toolchain-snapshot_5.0~svn306792.orig/lldb/scripts/lldb.swig
+++ llvm-toolchain-snapshot_5.0~svn306792/lldb/scripts/lldb.swig
@@ -50,7 +50,7 @@ except ImportError:
%enddef
// These versions will not generate working python modules, so error out early.
#if SWIG_VERSION >= 0x030009 && SWIG_VERSION < 0x030011

View File

@ -1,10 +1,10 @@
Index: llvm-toolchain-snapshot_5.0~svn300485/test/ThinLTO/X86/autoupgrade.ll
Index: llvm-toolchain-snapshot_5.0~svn306792/test/ThinLTO/X86/autoupgrade.ll
===================================================================
--- llvm-toolchain-snapshot_5.0~svn300485.orig/test/ThinLTO/X86/autoupgrade.ll
+++ llvm-toolchain-snapshot_5.0~svn300485/test/ThinLTO/X86/autoupgrade.ll
--- llvm-toolchain-snapshot_5.0~svn306792.orig/test/ThinLTO/X86/autoupgrade.ll
+++ llvm-toolchain-snapshot_5.0~svn306792/test/ThinLTO/X86/autoupgrade.ll
@@ -12,6 +12,8 @@
; CHECK: <STRTAB_BLOCK
; CHECK-NEXT: blob data = 'mainglobalfunc1llvm.invariant.start.p0i8'
; CHECK-NEXT: blob data = 'mainglobalfunc1llvm.invariant.start.p0i8{{.*}}'
+; XFAIL: *
+