Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8475 from Rmys/master

Browse Source 
rust-1.43.0 ver. bump
This commit is contained in:
Rmys
2020-05-05 17:52:59 +03:00
committed by GitHub
parent a9895dfdc4 1c4f2792a8
commit e62882694a
2 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/rust/files/70163.patch
+54
View File
@@ -0,0 +1,54 @@
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 4/5] 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
}
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 5/5] 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
programming/language/rust/pspec.xml
+9 -2
View File
@@ -12,7 +12,7 @@
<IsA>app</IsA>
<Summary>Systems programming language focused on safety, speed and concurrency</Summary>
<Description>Systems programming language focused on safety, speed and concurrency</Description>
<Archive sha1sum="83cdb69cec9a47fb4fa2b5bc0d230750063f00ee" type="targz">https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.gz</Archive>
<Archive sha1sum="07a5a4ec536ee9e3408150f55812cd23d12071c4" type="targz">https://static.rust-lang.org/dist/rustc-1.43.0-src.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
</AdditionalFiles>
@@ -34,7 +34,7 @@
<Dependency>libffi-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">bootstrap-1.38.patch</Patch> -->
<Patch level="1">70163.patch</Patch>
<!-- <Patch level="1">0001-WIP-minimize-the-rust-std-component.patch</Patch> -->
</Patches>
</Source>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="14">
<Date>2020-05-05</Date>
<Version>1.43.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="13">
<Date>2020-03-28</Date>
<Version>1.42.0</Version>