proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-10 06:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cherry pick upstream change r242372 (should be in 3.7.1) to fix

Browse Source 
a build failure with rust beta
This commit is contained in:
Sylvestre Ledru 2015-11-01 15:01:51 +00:00
parent 5f3970a86f
commit 43c30651ee
3 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-3.7 (1:3.7-5) unstable; urgency=medium
* Cherry pick upstream change r242372 (should be in 3.7.1) to fix
a build failure with rust beta
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 01 Nov 2015 16:01:08 +0100
llvm-toolchain-3.7 (1:3.7-4) unstable; urgency=medium
* Add a Break/Replaces clang-3.7 (<< 1:3.7-3) from clang-tidy-3.7

60
debian/patches/rust-patch-242372.diff vendored Normal file
View File

@ -0,0 +1,60 @@
Index: include/llvm-c/Core.h
===================================================================
--- include/llvm-c/Core.h (révision 242371)
+++ include/llvm-c/Core.h (révision 242372)
@@ -2675,7 +2675,8 @@
LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch,
const char *Name);
LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
- unsigned NumClauses, const char *Name);
+ LLVMValueRef PersFn, unsigned NumClauses,
+ const char *Name);
LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn);
LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef);
Index: bindings/go/llvm/ir.go
===================================================================
--- bindings/go/llvm/ir.go (révision 242371)
+++ bindings/go/llvm/ir.go (révision 242372)
@@ -1731,7 +1731,7 @@
func (b Builder) CreateLandingPad(t Type, nclauses int, name string) (l Value) {
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
- l.C = C.LLVMBuildLandingPad(b.C, t.C, C.unsigned(nclauses), cname)
+ l.C = C.LLVMBuildLandingPad(b.C, t.C, nil, C.unsigned(nclauses), cname)
return l
}
Index: bindings/ocaml/llvm/llvm_ocaml.c
===================================================================
--- bindings/ocaml/llvm/llvm_ocaml.c (révision 242371)
+++ bindings/ocaml/llvm/llvm_ocaml.c (révision 242372)
@@ -1745,7 +1745,7 @@
CAMLprim LLVMValueRef llvm_build_landingpad(LLVMTypeRef Ty, LLVMValueRef PersFn,
value NumClauses, value Name,
value B) {
- return LLVMBuildLandingPad(Builder_val(B), Ty, Int_val(NumClauses),
+ return LLVMBuildLandingPad(Builder_val(B), Ty, PersFn, Int_val(NumClauses),
String_val(Name));
}
Index: lib/IR/Core.cpp
===================================================================
--- lib/IR/Core.cpp (révision 242371)
+++ lib/IR/Core.cpp (révision 242372)
@@ -2257,7 +2257,14 @@
}
LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
- unsigned NumClauses, const char *Name) {
+ LLVMValueRef PersFn, unsigned NumClauses,
+ const char *Name) {
+ // The personality used to live on the landingpad instruction, but now it
+ // lives on the parent function. For compatibility, take the provided
+ // personality and put it on the parent function.
+ if (PersFn)
+ unwrap(B)->GetInsertBlock()->getParent()->setPersonalityFn(
+ cast<Function>(unwrap(PersFn)));
return wrap(unwrap(B)->CreateLandingPad(unwrap(Ty), NumClauses, Name));
}

1
debian/patches/series vendored
View File

@ -44,3 +44,4 @@ bug783205.patch
fix-cmake-config-prefix.diff
kfreebsd-build-fix.patch
ubuntu-precise-compiler-rt.diff
rust-patch-242372.diff