Auto merge of #2108 - RalfJung:rustup, r=RalfJung

rustup Adjusts for rust-lang/rust#96657. For now we use the fallback path in libstd.
rust-lang · May 9, 2022 · f791e2e · f791e2e
2 parents 8b9107a + 5a6c4a6
commit f791e2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-9a251644fa2adde5f46eea8d342b7e60e4716039
+8fbd92d0b95d847c68948d8dbbfaccb470db4f92
diff --git a/src/machine.rs b/src/machine.rs
@@ -380,7 +380,7 @@ impl<'mir, 'tcx> Evaluator<'mir, 'tcx> {
                 // Most of them are for weak symbols, which we all set to null (indicating that the
                 // symbol is not supported, and triggering fallback code which ends up calling a
                 // syscall that we do support).
-                for name in &["__cxa_thread_atexit_impl", "getrandom", "statx"] {
+                for name in &["__cxa_thread_atexit_impl", "getrandom", "statx", "__clock_gettime64"] {
                     let layout = this.machine.layouts.usize;
                     let place = this.allocate(layout, MiriMemoryKind::ExternStatic.into())?;
                     this.write_scalar(Scalar::from_machine_usize(0, this), &place.into())?;