mirror of
https://github.com/rust-lang/rust.git
synced 2026-06-02 06:28:20 +03:00
Auto merge of #2108 - RalfJung:rustup, r=RalfJung
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:
+1
-1
@@ -1 +1 @@
|
||||
9a251644fa2adde5f46eea8d342b7e60e4716039
|
||||
8fbd92d0b95d847c68948d8dbbfaccb470db4f92
|
||||
|
||||
+1
-1
@@ -380,7 +380,7 @@ fn init_extern_statics(this: &mut MiriEvalContext<'mir, 'tcx>) -> InterpResult<'
|
||||
// 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())?;
|
||||
|
||||
Reference in New Issue
Block a user