mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
rustup

Adjusts for https://github.com/rust-lang/rust/pull/96657. For now we use the fallback path in libstd.
This commit is contained in:
bors 2022-05-09 08:22:07 +00:00
commit f791e2ee50
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
9a251644fa2adde5f46eea8d342b7e60e4716039
8fbd92d0b95d847c68948d8dbbfaccb470db4f92

2
src/machine.rs
View File

@ -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())?;