Skip to content

Commit 3d025c9

Browse files
committed
updpatch: rust 1:1.79.0-1
rust-lang/rust#123612 has landed in 1.79.0
1 parent b68adab commit 3d025c9

File tree

2 files changed

+3
-285
lines changed

2 files changed

+3
-285
lines changed

rust/riscv-target-abi-fix.patch

Lines changed: 0 additions & 256 deletions
This file was deleted.

rust/riscv64.patch

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,7 @@
1717
libffi
1818
lld
1919
llvm
20-
@@ -65,7 +62,8 @@ b2sums=('3f43a1c50e268afbe76755ae24bccb3db9ff4dd8bbb8130c75d486c4c0e40f0253c4d4c
21-
'ef56a70741bae70a95695b4d05d1a6395f545e671c9d016c7180732f69a09b828ff5e16964ef16f9ebec55dd778a1b50927275cd4c21a7b78ae4959946a0657c'
22-
'd20861a8a8e16d4bb0143f00d4beb42e2c52eeb2c1894e9f9c04e3d74ecd750d9bdacf15bb39fd0ade4487b9d3d14da24cf5f25ceab112f096fddcd329320a15'
23-
'64391cf17e7d801fb263e9d637928c3a2f6aa11aca6afbf115be4e38e9afce42371ed4884929cf11d6c74c2aa497fb26abbba1812d4f31f44dcda38e4978a33f'
24-
- '23f399d5ea776df5dba1ec42a96020a7ae3b18f5a83121d90ca0256a90027529135bac751373a31480860c0dbad30598833a7da43d1e7f25ce5b6d5d945ce550')
25-
+ '23f399d5ea776df5dba1ec42a96020a7ae3b18f5a83121d90ca0256a90027529135bac751373a31480860c0dbad30598833a7da43d1e7f25ce5b6d5d945ce550'
26-
+ '3ea05305c1d87ed239df74b9e985ef8dfd05a50ad5fcf43e9ce4e9939244e7706a12dee93b730982684174be0f151cd53002e862098f7cb89bbe69e0a9068669')
27-
validpgpkeys=(
28-
108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) <[email protected]>
29-
)
30-
@@ -86,6 +84,9 @@ prepare() {
31-
# Use our wasm-ld
32-
patch -Np1 -i ../0004-compiler-Use-wasm-ld-for-wasm-targets.patch
33-
34-
+ # Backport https://github.com/rust-lang/rust/pull/123612 to fix cross-language LTO issues
35-
+ patch -Np1 -i ../riscv-target-abi-fix.patch
36-
+
37-
cat >config.toml <<END
38-
profile = "user"
39-
change-id = 121754
40-
@@ -95,9 +96,8 @@ link-shared = true
20+
@@ -95,9 +92,8 @@ link-shared = true
4121

4222
[build]
4323
target = [
@@ -49,7 +29,7 @@
4929
"wasm32-unknown-unknown",
5030
"wasm32-wasi",
5131
]
52-
@@ -141,22 +141,18 @@ jemalloc = true
32+
@@ -141,22 +137,18 @@ jemalloc = true
5333
[dist]
5434
compression-formats = ["gz"]
5535

@@ -76,7 +56,7 @@
7656

7757
[target.wasm32-unknown-unknown]
7858
sanitizers = false
79-
@@ -207,12 +203,9 @@ build() {
59+
@@ -207,12 +199,9 @@ build() {
8060

8161
# rustbuild always installs copies of the shared libraries to /usr/lib,
8262
# overwrite them with symlinks to the per-architecture versions
@@ -91,9 +71,3 @@
9171
_pick dest-wasm usr/lib/rustlib/wasm32-*
9272
_pick dest-src usr/lib/rustlib/src
9373
}
94-
@@ -292,3 +285,5 @@ package_rust-src() {
95-
}
96-
97-
# vim:set ts=2 sw=2 et:
98-
+
99-
+source+=(riscv-target-abi-fix.patch)

0 commit comments

Comments
 (0)