* Create a empty directory to make dh_install happy

(Closes: #752583) * Actually, silent-MCJIIT-tests.diff tests are still failing under i386
2025-06-14 04:22:54 +00:00 · 2014-06-24 22:28:37 +00:00 · 2014-06-24 22:28:37 +00:00 · 956d37d37e
commit 956d37d37e
parent 14198cb71c
4 changed files with 144 additions and 1 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,11 @@
+llvm-toolchain-3.4 (1:3.4.2-4) unstable; urgency=medium
+
+  * Create a empty directory to make dh_install happy
+    (Closes: #752583)
+  * Actually, silent-MCJIIT-tests.diff tests are still failing under i386
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 24 Jun 2014 15:26:51 -0700
+
 llvm-toolchain-3.4 (1:3.4.2-3) unstable; urgency=medium

  * Ship the compiler-rt static libraries in libclang-3.4-dev
@ -5,7 +13,7 @@ llvm-toolchain-3.4 (1:3.4.2-3) unstable; urgency=medium
   (Closes: #751943)
  * Fix FTBFS on powerpc and powerpcspe (Closes: #733890)
  * Broken library symlink fixed in lldb-3.4 (Closes: #715130)
-  * Fix --use-cc when no absolute path is provided. 
+  * Fix --use-cc when no absolute path is provided.
    Thanks to Aurelien Jacobs for testing (Closes: #748777)
  * depends-on-build-essential-package-without-using-version g++ fixed
  * Disable silent-MCJIIT-tests.diff. They now pass.
--- a/debian/patches/series
+++ b/debian/patches/series
@ -26,8 +26,10 @@ atomic_library_2.diff
 python-clangpath.diff
 removeduplicatedeclaration.diff
 silent-swig-warning.diff
+silent-MCJIIT-tests.diff
 include-target.diff
 debian-mips64-n32-multiarch.diff
+
 force-gcc-header-obj.diff
 do-not-fail-on-unexpected-pass.diff
 fix-an-issue-in-chroot-witout-proc.diff
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@ -0,0 +1,132 @@
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll	2013-11-28 18:25:58.131386256 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll	2013-11-28 18:30:05.135377370 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips, i686, i386, arm
+; XFAIL: *
+ 
+ declare i32 @FB()
+ 
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/eh-lg-pic.ll	2013-11-28 18:31:00.727375369 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -relocation-model=pic -code-model=large %s
+-; XFAIL: cygwin, win32, mingw, mips, powerpc64, 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-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/eh-sm-pic.ll	2013-11-28 18:31:57.735373316 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s
+-; XFAIL: cygwin, win32, mingw, mips, 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-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/hello-sm-pic.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/hello-sm-pic.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/hello-sm-pic.ll	2013-11-28 18:31:09.939375038 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips, i686, i386, darwin, aarch64, arm
+; XFAIL: *
+ 
+ @.LC0 = internal global [12 x i8] c"Hello World\00"		; <[12 x i8]*> [#uses=1]
+ 
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll	2013-11-28 18:25:58.131386256 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll	2013-11-28 18:31:13.595374906 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_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, arm
+; XFAIL: *
+ 
+ declare i32 @FB()
+ 
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll	2013-11-28 18:31:17.055374781 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips, i686, i386, arm
+; XFAIL: *
+ 
+ declare i32 @FB()
+ 
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll	2013-11-28 18:31:21.235374631 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_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 -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips, i686, i386, arm
+; XFAIL: *
+ 
+ declare i32 @FB()
+ 
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll	2013-11-28 18:31:27.899374389 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips, aarch64, arm, i686, i386
+; XFAIL: *
+ 
+ @count = global i32 1, align 4
+ 
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll	2013-11-28 18:31:31.347374266 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s
+-; XFAIL: mips, 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]* @.str, i32 0, i32 0), align 4
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll	2013-11-28 18:31:36.075374097 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+-; XFAIL: mips, i686, i386, aarch64, arm
+; XFAIL: *
+ 
+ define i32 @main() nounwind {
+ entry:
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll	2013-11-28 18:31:39.387373978 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s > /dev/null
+-; XFAIL: mips, aarch64, arm, i686, i386
+; XFAIL: *
+ 
+ @count = global i32 1, align 4
+ 
+Index: llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+===================================================================
+--- llvm-toolchain-3.4-3.4~+rc1.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll	2013-11-28 18:25:58.127386257 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll	2013-11-28 18:34:25.463368000 +0000
+@@ -1,5 +1,5 @@
+ ; RUN: %lli_mcjit -O0 -relocation-model=pic -code-model=small %s
+-; XFAIL: mips, 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]* @.str, i32 0, i32 0), align 4
--- a/debian/rules
+++ b/debian/rules
@ -282,6 +282,7 @@ override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/clang/$(LLVM_VERSION)/lib
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/lib/
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/clang_linux/
+	mkdir -p $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux/

 # Rename binaries
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin/