Skip to content

Commit f791e2e

Browse files
committed
Auto merge of #2108 - RalfJung:rustup, r=RalfJung
rustup Adjusts for rust-lang/rust#96657. For now we use the fallback path in libstd.
2 parents 8b9107a + 5a6c4a6 commit f791e2e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9a251644fa2adde5f46eea8d342b7e60e4716039
1+
8fbd92d0b95d847c68948d8dbbfaccb470db4f92

src/machine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ impl<'mir, 'tcx> Evaluator<'mir, 'tcx> {
380380
// Most of them are for weak symbols, which we all set to null (indicating that the
381381
// symbol is not supported, and triggering fallback code which ends up calling a
382382
// syscall that we do support).
383-
for name in &["__cxa_thread_atexit_impl", "getrandom", "statx"] {
383+
for name in &["__cxa_thread_atexit_impl", "getrandom", "statx", "__clock_gettime64"] {
384384
let layout = this.machine.layouts.usize;
385385
let place = this.allocate(layout, MiriMemoryKind::ExternStatic.into())?;
386386
this.write_scalar(Scalar::from_machine_usize(0, this), &place.into())?;

0 commit comments

Comments
 (0)