diff options
| author | tnn <tnn@pkgsrc.org> | 2020-05-16 19:36:12 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-05-16 19:36:12 +0000 |
| commit | 2c29d057c8676f30efd6c1196cc1512ceab2f479 (patch) | |
| tree | 5e82106be684fdb506b0ddeb39afe7218be407b7 /lang | |
| parent | a4aad77f2b0095e02b3a1aec850929685195bf55 (diff) | |
| download | pkgsrc-2c29d057c8676f30efd6c1196cc1512ceab2f479.tar.gz | |
rust: try to fix some llvm-10 fallout
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/rust/distinfo | 4 | ||||
| -rw-r--r-- | lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp | 15 | ||||
| -rw-r--r-- | lang/rust/patches/patch-src_rustllvm_RustWrapper.cpp | 20 |
3 files changed, 38 insertions, 1 deletions
diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 7141dd5bbbd..5aa1b17243a 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.109 2020/05/16 10:39:51 he Exp $ +$NetBSD: distinfo,v 1.110 2020/05/16 19:36:12 tnn Exp $ SHA1 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 91517fa95f954427c627cf63eb7c518abd068f3e RMD160 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 06a3d922b27aac2deb570301542897a131b47cd0 @@ -120,6 +120,8 @@ SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = c5e74d0e8deb555 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6 SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2675b93a1d636b297a3e1e84b915a15a3da67939 +SHA1 (patch-src_rustllvm_PassWrapper.cpp) = 057b21eb100613d24a496b72a0d6e22548101a96 +SHA1 (patch-src_rustllvm_RustWrapper.cpp) = 3440de7536d05ea93c1d5c01bb09f5472e830ca8 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7 diff --git a/lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp b/lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp new file mode 100644 index 00000000000..686350201e7 --- /dev/null +++ b/lang/rust/patches/patch-src_rustllvm_PassWrapper.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_rustllvm_PassWrapper.cpp,v 1.1 2020/05/16 19:36:13 tnn Exp $ + +LLVM 10 compatibility + +--- src/rustllvm/PassWrapper.cpp.orig 2020-04-20 22:17:56.000000000 +0000 ++++ src/rustllvm/PassWrapper.cpp +@@ -67,7 +67,7 @@ extern "C" void LLVMInitializePasses() { + } + + extern "C" void LLVMTimeTraceProfilerInitialize() { +-#if LLVM_VERSION_GE(9, 0) ++#if LLVM_VERSION_GE(9, 0) && LLVM_VERSION_LT(10, 0) + timeTraceProfilerInitialize(); + #endif + } diff --git a/lang/rust/patches/patch-src_rustllvm_RustWrapper.cpp b/lang/rust/patches/patch-src_rustllvm_RustWrapper.cpp new file mode 100644 index 00000000000..cf27924d3c5 --- /dev/null +++ b/lang/rust/patches/patch-src_rustllvm_RustWrapper.cpp @@ -0,0 +1,20 @@ +$NetBSD: patch-src_rustllvm_RustWrapper.cpp,v 1.1 2020/05/16 19:36:13 tnn Exp $ + +LLVM 10 compatibility + +--- src/rustllvm/RustWrapper.cpp.orig 2020-04-20 22:17:56.000000000 +0000 ++++ src/rustllvm/RustWrapper.cpp +@@ -1328,8 +1328,13 @@ extern "C" LLVMValueRef LLVMRustBuildMem + LLVMValueRef Dst, unsigned DstAlign, + LLVMValueRef Val, + LLVMValueRef Size, bool IsVolatile) { ++#if LLVM_VERSION_GE(10, 0) ++ return wrap(unwrap(B)->CreateMemSet( ++ unwrap(Dst), unwrap(Val), unwrap(Size), MaybeAlign(DstAlign), IsVolatile)); ++#else + return wrap(unwrap(B)->CreateMemSet( + unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile)); ++#endif + } + + extern "C" LLVMValueRef |