diff options
| -rw-r--r-- | community/rust/497f879b1e24c369362bcd821959ffabc50a8a31.patch | 28 | ||||
| -rw-r--r-- | community/rust/APKBUILD | 17 | ||||
| -rw-r--r-- | community/rust/a94fa896cc92d5e0678376cf5aa8b64af0899732.patch | 28 |
3 files changed, 67 insertions, 6 deletions
diff --git a/community/rust/497f879b1e24c369362bcd821959ffabc50a8a31.patch b/community/rust/497f879b1e24c369362bcd821959ffabc50a8a31.patch new file mode 100644 index 0000000000..7432cd705d --- /dev/null +++ b/community/rust/497f879b1e24c369362bcd821959ffabc50a8a31.patch @@ -0,0 +1,28 @@ +Upstream: Yes +From 497f879b1e24c369362bcd821959ffabc50a8a31 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv@gmail.com> +Date: Mon, 2 Mar 2020 22:37:55 +0100 +Subject: [PATCH] Update CreateMemSet() usage for LLVM 10 + +--- + src/rustllvm/RustWrapper.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp +index 25cfee3373dc4..799adb418822d 100644 +--- a/src/rustllvm/RustWrapper.cpp ++++ b/src/rustllvm/RustWrapper.cpp +@@ -1333,8 +1333,13 @@ extern "C" LLVMValueRef LLVMRustBuildMemSet(LLVMBuilderRef B, + 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 diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD index eb7746dd1c..e9d675ebef 100644 --- a/community/rust/APKBUILD +++ b/community/rust/APKBUILD @@ -4,10 +4,10 @@ # Contributor: Jeizsm <jeizsm@gmail.com> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=rust -pkgver=1.42.0 +pkgver=1.43.0 _llvmver=10 -_bootver=1.41.1 -pkgrel=2 +_bootver=1.42.0 +pkgrel=0 pkgdesc="The Rust Programming Language" url="https://www.rust-lang.org" arch="x86_64 armv7 armhf aarch64 x86 ppc64le" @@ -72,7 +72,10 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz python3.patch link-musl-dynamically.patch musl-dont-use-crt-static.patch - 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch" + 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch + a94fa896cc92d5e0678376cf5aa8b64af0899732.patch + 497f879b1e24c369362bcd821959ffabc50a8a31.patch + " builddir="$srcdir/rustc-$pkgver-src" # secfixes: @@ -292,7 +295,7 @@ _mv() { mv "$@" } -sha512sums="00359778ba886393e9792763ebd2754ee0b0db535a246ce9dcbbedd63b6eb414e321b552c88d4347ca355b8066492ef657aa3ceca2bcf00dfd80e1a92fac24b0 rustc-1.42.0-src.tar.gz +sha512sums="99c01719cdfc2e573d7d25472238c52e500467301e63e1ea70e2d5edf6bf879dedcde99f77c66ceb9d4d114cafaa3bd5bd125d11a9ccecdf81094312db65c9c1 rustc-1.43.0-src.tar.gz 8d52048070e9a158810f5ef71eae07a3b107b60986375a593c3509f4c47f8e2f7fcdff8bc558c03c46127dbf66c4077dd7b5b422a83f2c49fb5d52ecfae5697e musl-fix-static-linking.patch 41fd9e8a8dd99074d95d664e65f92dba644b8ef9fa37b9a1d781a01fe49eaa254c430f0f277622dc4f8203aad2d129a045fdf1679a0da526d549fac60654be26 musl-fix-linux_musl_base.patch 97e81c57af93df550577f41d795185a9eb0c37528776c250076cc57f06c87e81139eb71cd6b6a4730528511821ae50c304d7deb534d6422cd08bb44193ae605d static-pie.patch @@ -305,4 +308,6 @@ c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20 f71f25f4b5a0a8c3ab20ca75a63b891a89983c5ab1b25283934b175bb5142aa094f1fef515ac223ab2fa1211f2d018016e7756adb125f96f52fc35b1916a53c3 python3.patch 2a91c0d149f19a2268b2db8e375e0c10820529f588161d8d8e68900d929235d9b1cb4f0d64539c1e20ecca3948b4715f2d9d3d16a2754373d56b4b5808bed6bd link-musl-dynamically.patch 795194976763326c5e4a9eefc8b651b6d5fb533d2d000631ed48a92bafac90e9ca33b8d662e6c53ef109ea1a90c69def715d7d7154e3f9fb9035a58a313a7db3 musl-dont-use-crt-static.patch -9cb9542a13cc356b9f67be02cbe43cfd8d95c79fd561ed5ff5fe1741219e7571904046312be7ab3bda0944ce83bf10c5ddd3e32f19a16334ee445031128354da 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch" +9cb9542a13cc356b9f67be02cbe43cfd8d95c79fd561ed5ff5fe1741219e7571904046312be7ab3bda0944ce83bf10c5ddd3e32f19a16334ee445031128354da 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +93b6807f5b1110a09512cae9e4f65156eee9d878d52f320a410552f0d0daf190d5803bd577537adf33d3469b0e6796e3294f068509b92fa48ee786259b8c7dd6 a94fa896cc92d5e0678376cf5aa8b64af0899732.patch +4d72efbd9ebd09b06631f3c121cbe3a080a1f9cac4ff1dab80000a841909131c1b8c8caed48f8d15971122d18878e4c9f7ebab35c77400e972f55f39016d84c0 497f879b1e24c369362bcd821959ffabc50a8a31.patch" diff --git a/community/rust/a94fa896cc92d5e0678376cf5aa8b64af0899732.patch b/community/rust/a94fa896cc92d5e0678376cf5aa8b64af0899732.patch new file mode 100644 index 0000000000..16f05f5fb8 --- /dev/null +++ b/community/rust/a94fa896cc92d5e0678376cf5aa8b64af0899732.patch @@ -0,0 +1,28 @@ +Reason: Fixes LLVM10 +Upstream: Yes +From a94fa896cc92d5e0678376cf5aa8b64af0899732 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv@gmail.com> +Date: Tue, 4 Feb 2020 20:35:50 +0100 +Subject: [PATCH] Fix timeTraceProfilerInitialize for LLVM 10 + +--- + src/rustllvm/PassWrapper.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp +index 90d24d20737db..9e8614e3b6d34 100644 +--- a/src/rustllvm/PassWrapper.cpp ++++ b/src/rustllvm/PassWrapper.cpp +@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() { + } + + extern "C" void LLVMTimeTraceProfilerInitialize() { +-#if LLVM_VERSION_GE(9, 0) ++#if LLVM_VERSION_GE(10, 0) ++ timeTraceProfilerInitialize( ++ /* TimeTraceGranularity */ 0, ++ /* ProcName */ "rustc"); ++#elif LLVM_VERSION_GE(9, 0) + timeTraceProfilerInitialize(); + #endif + } |