summaryrefslogtreecommitdiff
path: root/rust
diff options
context:
space:
mode:
authorDanny Rawlins <contact@romster.me>2021-08-30 21:00:09 +1000
committerDanny Rawlins <contact@romster.me>2021-08-30 23:49:10 +1000
commitc7399125acc9f68231c1a080d4fa7fcf18d4a7e6 (patch)
tree9412631fd3d8f5527e7a47bce8c92d4e71809a2b /rust
parentc5d5199ddd50d9a5986f78f50126b04e796ccab8 (diff)
downloadopt-c7399125acc9f68231c1a080d4fa7fcf18d4a7e6.tar.gz
opt-c7399125acc9f68231c1a080d4fa7fcf18d4a7e6.tar.xz
rust: 1.53.0 -> 1.54.0
Diffstat (limited to 'rust')
-rw-r--r--rust/.footprint170
-rw-r--r--rust/.signature16
-rw-r--r--rust/0002-compiler-Change-LLVM-targets.patch84
-rw-r--r--rust/1.53.0-miri-vergen.patch53
-rw-r--r--rust/Pkgfile27
5 files changed, 193 insertions, 157 deletions
diff --git a/rust/.footprint b/rust/.footprint
index 458e61693..b3bb4e134 100644
--- a/rust/.footprint
+++ b/rust/.footprint
@@ -6,10 +6,9 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/cargo
-rwxr-xr-x root/root usr/bin/cargo-clippy
-rwxr-xr-x root/root usr/bin/cargo-fmt
--rwxr-xr-x root/root usr/bin/cargo-miri
-rwxr-xr-x root/root usr/bin/clippy-driver
--rwxr-xr-x root/root usr/bin/miri
-rwxr-xr-x root/root usr/bin/rls
+-rwxr-xr-x root/root usr/bin/rust-demangler
-rwxr-xr-x root/root usr/bin/rust-gdb
-rwxr-xr-x root/root usr/bin/rust-gdbgui
-rwxr-xr-x root/root usr/bin/rust-lldb
@@ -17,7 +16,6 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/rustdoc
-rwxr-xr-x root/root usr/bin/rustfmt
drwxr-xr-x root/root usr/lib/
--rwxr-xr-x root/root usr/lib/cargo-credential-1password
drwxr-xr-x root/root usr/lib/rustlib/
drwxr-xr-x root/root usr/lib/rustlib/etc/
-rw-r--r-- root/root usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
@@ -30,10 +28,10 @@ drwxr-xr-x root/root usr/lib/rustlib/etc/
-rw-r--r-- root/root usr/lib/rustlib/install.log
-rw-r--r-- root/root usr/lib/rustlib/manifest-cargo
-rw-r--r-- root/root usr/lib/rustlib/manifest-clippy-preview
--rw-r--r-- root/root usr/lib/rustlib/manifest-miri-preview
-rw-r--r-- root/root usr/lib/rustlib/manifest-rls-preview
-rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analysis-i686-unknown-linux-gnu
-rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analysis-x86_64-unknown-linux-gnu
+-rw-r--r-- root/root usr/lib/rustlib/manifest-rust-demangler-preview
-rw-r--r-- root/root usr/lib/rustlib/manifest-rust-src
-rw-r--r-- root/root usr/lib/rustlib/manifest-rust-std-i686-unknown-linux-gnu
-rw-r--r-- root/root usr/lib/rustlib/manifest-rust-std-x86_64-unknown-linux-gnu
@@ -634,8 +632,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/diagnostic.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/lib.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/quote.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/proc_macro/tests/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/tests/test.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/profiler_builtins/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/profiler_builtins/Cargo.toml
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/profiler_builtins/build.rs
@@ -736,9 +732,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/lazy/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/lazy/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/lib.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/macros.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/memchr.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/memchr/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/memchr/tests.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/net/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/net/addr.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/net/addr/
@@ -775,6 +768,9 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/emscripten/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/emscripten/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/emscripten/raw.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/fortanix_sgx/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/fortanix_sgx/arch.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/fortanix_sgx/ffi.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/fortanix_sgx/io.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/fortanix_sgx/mod.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/freebsd/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/freebsd/fs.rs
@@ -788,6 +784,9 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/haiku/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/haiku/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/haiku/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/haiku/raw.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/hermit/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/hermit/ffi.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/hermit/mod.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/illumos/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/illumos/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/illumos/mod.rs
@@ -837,11 +836,43 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/solaris/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/solaris/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/solaris/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/solaris/raw.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/ffi.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/fs.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/io.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/mod.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/addr.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/ancillary.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/datagram.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/listener.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/mod.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/raw_fd.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/stream.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/tests.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/process.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/raw.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/thread.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/ucred.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/ucred/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/ucred/tests.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/vxworks/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/vxworks/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/vxworks/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/vxworks/raw.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/ffi.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/fs.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/io.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/mod.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/ffi.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/fs.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/io.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/mod.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/process.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/raw.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/thread.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/panic.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/panic/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/panic/tests.rs
@@ -900,9 +931,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/args.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/condvar.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/env.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ext/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ext/ffi.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ext/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/fd.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/memchr.rs
@@ -924,8 +952,8 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/panic.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/reloc.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/thread.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/sync_bitset.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/sync_bitset/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/sync_bitset/tests.rs
@@ -937,11 +965,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/userca
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/args.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/condvar.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/env.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/arch.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/ffi.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/io.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/fd.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/memchr.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/mod.rs
@@ -956,8 +979,8 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/rwlock/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/thread.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/thread_local_key.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/time.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/spin_mutex.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/spin_mutex/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/spin_mutex/tests.rs
@@ -972,26 +995,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/cmath.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/condvar.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/env.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/ffi.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/fs.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/io.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/mod.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/addr.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/ancillary.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/datagram.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/listener.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/raw_fd.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/stream.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/tests.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/process.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/raw.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/thread.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/ucred.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/ucred/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/ucred/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/fd.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/fd/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/fd/tests.rs
@@ -1054,11 +1057,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/args.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/env.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ext/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ext/ffi.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ext/fs.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ext/io.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ext/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/fd.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/io.rs
@@ -1070,14 +1068,14 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ext/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/time.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/alloc.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/args.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/condvar_atomics.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/atomics/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/atomics/condvar.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/atomics/futex.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/atomics/mutex.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/atomics/rwlock.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/atomics/thread.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/env.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/futex_atomics.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/mutex_atomics.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/rwlock_atomics.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/thread.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/alloc.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/alloc/
@@ -1090,14 +1088,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/args/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/compat.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/condvar.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/env.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/ffi.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/fs.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/io.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/process.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/raw.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/thread.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/handle.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/io.rs
@@ -1137,6 +1127,9 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar/check.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/io.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/memchr.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/memchr/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/memchr/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/mutex.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/net.rs
@@ -1160,7 +1153,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/futex.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/generic.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/util.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/tests.rs
@@ -1258,6 +1250,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/rustfmt.toml
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/armclang.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/crc.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/mod.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/neon/
@@ -1267,38 +1260,40 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/s
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/test_support.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/tme.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/v8.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/barrier/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/barrier/common.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/barrier/cp15.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/barrier/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/barrier/not_mclass.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/barrier/v8.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/dsp.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/ex.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/hints.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/mod.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/registers/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/registers/aarch32.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/registers/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/registers/v6m.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/registers/v7m.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/sat.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/acle/simd32.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/armclang.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/crc.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/crypto.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/dsp.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/ex.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/mod.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/neon/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/neon/generated.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/neon/load_tests.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/neon/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/neon/shift_and_insert_tests.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/neon/table_lookup_tests.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/test_support.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/neon.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/sat.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/simd32.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/v6.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm/v7.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/barrier/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/barrier/common.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/barrier/cp15.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/barrier/mod.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/barrier/not_mclass.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/barrier/v8.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/crc.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/crypto.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/hints.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/mod.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/neon/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/neon/generated.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/neon/load_tests.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/neon/mod.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/neon/shift_and_insert_tests.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/neon/store_tests.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/neon/table_lookup_tests.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/registers/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/registers/aarch32.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/registers/mod.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/registers/v6m.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/registers/v7m.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/arm_shared/test_support.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/core_arch_docs.md
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/lib.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/macros.rs
@@ -1501,6 +1496,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/test/src/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/event.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/test/src/formatters/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/formatters/json.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/formatters/junit.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/formatters/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/formatters/pretty.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/formatters/terse.rs
diff --git a/rust/.signature b/rust/.signature
index 92f2378c5..cc5a31821 100644
--- a/rust/.signature
+++ b/rust/.signature
@@ -1,10 +1,10 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Qs9rCUE6aAzTtwtzgaFmCxhFzpYh2n9pO9mtXli0pkEuSTjsH93jAeI+PqfYXJJIIWrQP4BCxgwJ9/o2jecxQM=
-SHA256 (Pkgfile) = db3ae4f33630220aaec23ab0f3fe1c2fef4bbdae9d8e9ed1b18d2cb29c79b5c3
-SHA256 (.footprint) = 0bfea3e1f330a808d5803ff73ef1e9c116836af1bab245a20c6d3be37b342f9b
-SHA256 (rustc-1.53.0-src.tar.xz) = e53a2df2c2c26f8929d551852eeae242b9a6167fba34481f92010b30def32dec
-SHA256 (rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = dcdc0083facd6484527494ee5b8f72e040a095ab346bb658ce176be573d5c9b4
-SHA256 (rustc-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = a5ce7d951dbebd815530c3c571c193c24ae4b83bc1bf431845c0dbfbe1280476
-SHA256 (cargo-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = d0931a1e728afdfbe3390a2ff3a5256d1668402298a3a6c050ac65ad01c4db2b
+RWSE3ohX2g5d/ZsgPfuGM/3PT2r/TWRAwIQXqbD2+jjGiwWxuWuMp1QGc9xQifHBZpwHJmzxYZYtEVYQ/TDHgNLRUYZxBi0D7Ac=
+SHA256 (Pkgfile) = f1f2224336e8cd3695026750a071dc7ea6ff164e829e102537dde1e3c91a59ea
+SHA256 (.footprint) = 47443f65e93a807d7c2e2ee3f486de364db1ab221b0fd526b118234760955260
+SHA256 (rustc-1.54.0-src.tar.xz) = a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4
+SHA256 (rust-std-1.53.0-x86_64-unknown-linux-gnu.tar.xz) = 66d5257bbd194db08e67ca63a74cc80cdc4a36eaa30bf7dfe65861d9deaff7f7
+SHA256 (rustc-1.53.0-x86_64-unknown-linux-gnu.tar.xz) = 9c2f0443a546dd18f1f020c7711a7b9864432545ceb812e79315c1e76508b193
+SHA256 (cargo-1.53.0-x86_64-unknown-linux-gnu.tar.xz) = e4437f6c83574fc60e183f4df439190f7610e4a669476802795645da66fbb83b
SHA256 (libexec.patch) = 9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514
-SHA256 (1.53.0-miri-vergen.patch) = 309835d35a77eab776b5e1262f7389e71b64cf0712cad64ae78ed6c0208b19a2
+SHA256 (0002-compiler-Change-LLVM-targets.patch) = 851172a5a3c35e209d455232d0572f51b6d34d3bc5f1a0416c01f426fdf60e92
diff --git a/rust/0002-compiler-Change-LLVM-targets.patch b/rust/0002-compiler-Change-LLVM-targets.patch
new file mode 100644
index 000000000..72696ed37
--- /dev/null
+++ b/rust/0002-compiler-Change-LLVM-targets.patch
@@ -0,0 +1,84 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Fri, 12 Mar 2021 17:31:56 +0100
+Subject: [PATCH] compiler: Change LLVM targets
+
+ - Change x86_64-unknown-linux-gnu to use x86_64-pc-linux-gnu
+ - Change i686-unknown-linux-gnu to use i686-pc-linux-gnu
+
+Reintroduce the aliasing that was removed in 1.52.0 and alias the -pc-
+triples to the -unknown- triples. This avoids defining proper -pc-
+targets, as things break when this is done:
+
+ - The crate ecosystem expects the -unknown- targets. Making -pc-
+ rustc's host triple (and thus default target) would break various
+ crates.
+ - Firefox's build breaks when the host triple (from
+ `rustc --version --verbose`) is different from the target triple
+ (from `rustc --print target-list`) that best matches autoconf.
+---
+ compiler/rustc_session/src/config.rs | 2 +-
+ compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +-
+ compiler/rustc_target/src/spec/mod.rs | 9 +++++++++
+ .../rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +-
+ 4 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
+index 2b547f8be92..09e1152dde4 100644
+--- a/compiler/rustc_session/src/config.rs
++++ b/compiler/rustc_session/src/config.rs
+@@ -1538,7 +1538,7 @@ pub fn parse_target_triple(
+ early_error(error_format, &format!("target file {:?} does not exist", path))
+ })
+ }
+- Some(target) => TargetTriple::TargetTriple(target),
++ Some(target) => TargetTriple::from_alias(target),
+ _ => TargetTriple::from_triple(host_triple()),
+ }
+ }
+diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
+index 165505ee731..00a7f5c2f8c 100644
+--- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
+@@ -9,7 +9,7 @@ pub fn target() -> Target {
+ base.stack_probes = StackProbeType::Call;
+
+ Target {
+- llvm_target: "i686-unknown-linux-gnu".to_string(),
++ llvm_target: "i686-pc-linux-gnu".to_string(),
+ pointer_width: 32,
+ data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
+ f64:32:64-f80:32-n8:16:32-S128"
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index 0f2aaeb533a..ce27142ec86 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -2164,6 +2164,15 @@ pub fn from_path(path: &Path) -> Result<Self, io::Error> {
+ Ok(TargetTriple::TargetPath(canonicalized_path))
+ }
+
++ /// Creates a target triple from its alias
++ pub fn from_alias(triple: String) -> Self {
++ match triple.as_str() {
++ "x86_64-pc-linux-gnu" => TargetTriple::from_triple("x86_64-unknown-linux-gnu"),
++ "i686-pc-linux-gnu" => TargetTriple::from_triple("i686-unknown-linux-gnu"),
++ _ => TargetTriple::TargetTriple(triple),
++ }
++ }
++
+ /// Returns a string triple for this target.
+ ///
+ /// If this target is a path, the file name (without extension) is returned.
+diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+index 085079e06e5..2dfa6a040b1 100644
+--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+@@ -11,7 +11,7 @@ pub fn target() -> Target {
+ SanitizerSet::ADDRESS | SanitizerSet::LEAK | SanitizerSet::MEMORY | SanitizerSet::THREAD;
+
+ Target {
+- llvm_target: "x86_64-unknown-linux-gnu".to_string(),
++ llvm_target: "x86_64-pc-linux-gnu".to_string(),
+ pointer_width: 64,
+ data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+ .to_string(),
diff --git a/rust/1.53.0-miri-vergen.patch b/rust/1.53.0-miri-vergen.patch
deleted file mode 100644
index 347f147c9..000000000
--- a/rust/1.53.0-miri-vergen.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 64f128c45687d18d64fc6856a30fde585b007e00 Mon Sep 17 00:00:00 2001
-From: Ralf Jung <post@ralfj.de>
-Date: Sat, 15 May 2021 14:17:30 +0200
-Subject: [PATCH] support building Miri outside a git repo
-
----
- cargo-miri/bin.rs | 14 ++++++++------
- cargo-miri/build.rs | 2 +-
- 2 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/cargo-miri/bin.rs b/cargo-miri/bin.rs
-index e29bdc771..84447b3a1 100644
---- a/src/tools/miri/cargo-miri/bin.rs
-+++ b/src/tools/miri/cargo-miri/bin.rs
-@@ -6,6 +6,7 @@ use std::io::{self, BufRead, BufReader, BufWriter, Read, Write};
- use std::ops::Not;
- use std::path::{Path, PathBuf};
- use std::process::Command;
-+use std::fmt::{Write as _};
-
- use serde::{Deserialize, Serialize};
-
-@@ -90,12 +91,13 @@ fn show_help() {
- }
-
- fn show_version() {
-- println!(
-- "miri {} ({} {})",
-- env!("CARGO_PKG_VERSION"),
-- env!("VERGEN_GIT_SHA_SHORT"),
-- env!("VERGEN_GIT_COMMIT_DATE")
-- );
-+ let mut version = format!("miri {}", env!("CARGO_PKG_VERSION"));
-+ // Only use `option_env` on vergen variables to ensure the build succeeds
-+ // when vergen failed to find the git info.
-+ if let Some(sha) = option_env!("VERGEN_GIT_SHA_SHORT") {
-+ write!(&mut version, " ({} {})", sha, option_env!("VERGEN_GIT_COMMIT_DATE").unwrap()).unwrap();
-+ }
-+ println!("{}", version);
- }
-
- fn show_error(msg: String) -> ! {
-diff --git a/cargo-miri/build.rs b/cargo-miri/build.rs
-index cff135fe4..ebd8e7003 100644
---- a/src/tools/miri/cargo-miri/build.rs
-+++ b/src/tools/miri/cargo-miri/build.rs
-@@ -7,5 +7,5 @@ fn main() {
- let mut gen_config = vergen::Config::default();
- *gen_config.git_mut().sha_kind_mut() = vergen::ShaKind::Short;
- *gen_config.git_mut().commit_timestamp_kind_mut() = vergen::TimestampKind::DateOnly;
-- vergen(gen_config).expect("Unable to generate vergen keys!");
-+ vergen(gen_config).ok(); // Ignore failure (in case we are built outside a git repo)
- }
diff --git a/rust/Pkgfile b/rust/Pkgfile
index 081a5db0f..4d5552cbb 100644
--- a/rust/Pkgfile
+++ b/rust/Pkgfile
@@ -5,9 +5,9 @@
# Optional: sccache ccache
name=rust
-version=1.53.0
-_date=2021-05-06
-_rustc=1.52.0
+version=1.54.0
+_date=2021-06-17
+_rustc=1.53.0
_cargo=$_rustc
release=1
source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
@@ -15,7 +15,7 @@ source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-gnu.tar.xz
https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-gnu.tar.xz
libexec.patch
- 1.53.0-miri-vergen.patch)
+ 0002-compiler-Change-LLVM-targets.patch)
unpack_source() {
for file in ${source[@]}; do
@@ -39,8 +39,8 @@ build() {
# Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec
patch -p1 -i $SRC/libexec.patch
- # https://github.com/rust-lang/rust/issues/84182
- patch -p1 -i $SRC/1.53.0-miri-vergen.patch
+ # Use our *-pc-linux-gnu targets, making LTO with clang simpler
+ patch -p1 -i $SRC/0002-compiler-Change-LLVM-targets.patch
local ERROR
local DATE="$(awk '/^date: / { print $2 }' src/stage0.txt)"
@@ -66,12 +66,18 @@ cat <<- EOF > $SRC/config.toml
prefix = "/usr"
[rust]
+ # LLVM crashes when passing an object through ThinLTO twice. This is triggered
+ # when using rust code in cross-language LTO if libstd was built using ThinLTO.
+ # http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
+ # https://github.com/rust-lang/rust/issues/54872
+ codegen-units-std = 1
+
+ debuginfo-level-std = 2
channel = "stable"
rpath = false
[build]
target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
- tools = ["cargo", "rls", "clippy", "miri", "rustfmt", "analysis", "src"]
docs = false
extended = true
sanitizers = false
@@ -80,22 +86,25 @@ cat <<- EOF > $SRC/config.toml
python = "/usr/bin/python3"
@CARGO@
@RUST@
+ @RUSTFMT@
[target.x86_64-unknown-linux-gnu]
llvm-config = "/usr/bin/llvm-config"
+ llvm-filecheck = "/usr/bin/FileCheck"
EOF
if [ -e '/usr/bin/rustc' ]; then
if [ -z "$(/usr/bin/ldd /usr/bin/rustc | egrep '.*libLLVM.*.so => not found')" ]; then
sed -e 's|@CARGO@|cargo = "/usr/bin/cargo"|' \
-e 's|@RUST@|rustc = "/usr/bin/rustc"|' \
+ -e 's|@RUSTFMT@|rustfmt = "/usr/bin/rustfmt"|' \
-i $SRC/config.toml
else
- sed -e 's|@CARGO@||' -e 's|@RUST@||' -i $SRC/config.toml
+ sed -e 's|@CARGO@||' -e 's|@RUST@||' -e 's|@RUSTFMT@||' -i $SRC/config.toml
printf "\e[031mllvm broken symlink detected, not using system rust to bootstrap\033[0m\n"
fi
else
- sed -e 's|@CARGO@||' -e 's|@RUST@||' -i $SRC/config.toml
+ sed -e 's|@CARGO@||' -e 's|@RUST@||' -e 's|@RUSTFMT@||' -i $SRC/config.toml
fi
if [ -e '/usr/bin/ccache' ]; then

Generated by cgit