about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2022-09-01 22:25:14 +0200
committerRalf Jung <post@ralfj.de>2022-09-01 22:25:14 +0200
commit5f3545e773f930c3345e7166b98bf9d2a76adff6 (patch)
treea01a8361770c6be9c1bf2d6b4d2997ae39a80b89 /src
parent2d50443401d04becfa13ad350d2fba1b9819a686 (diff)
downloadrust-5f3545e773f930c3345e7166b98bf9d2a76adff6.tar.gz
rust-5f3545e773f930c3345e7166b98bf9d2a76adff6.zip
disable extern-so ffi support for now due to licensing situation
Diffstat (limited to 'src')
-rw-r--r--src/shims/foreign_items.rs6
-rw-r--r--src/shims/mod.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
index b94b6bbb2b8..bd46e4ae80e 100644
--- a/src/shims/foreign_items.rs
+++ b/src/shims/foreign_items.rs
@@ -23,7 +23,7 @@ use rustc_target::{
 
 use super::backtrace::EvalContextExt as _;
 use crate::helpers::{convert::Truncate, target_os_is_unix};
-use crate::shims::ffi_support::EvalContextExt as _;
+//FIXME(miri#2526): use crate::shims::ffi_support::EvalContextExt as _;
 use crate::*;
 
 /// Returned by `emulate_foreign_item_by_name`.
@@ -375,9 +375,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             // An Ok(false) here means that the function being called was not exported
             // by the specified `.so` file; we should continue and check if it corresponds to
             // a provided shim.
-            if this.call_external_c_fct(link_name, dest, args)? {
+            /*FIXME(miri#2526): if this.call_external_c_fct(link_name, dest, args)? {
                 return Ok(EmulateByNameResult::NeedsJumping);
-            }
+            }*/
         }
 
         // When adding a new shim, you should follow the following pattern:
diff --git a/src/shims/mod.rs b/src/shims/mod.rs
index ee2145db7e1..8179d09defe 100644
--- a/src/shims/mod.rs
+++ b/src/shims/mod.rs
@@ -1,7 +1,7 @@
 #![warn(clippy::integer_arithmetic)]
 
 mod backtrace;
-pub mod ffi_support;
+//FIXME(miri#2526): pub mod ffi_support;
 pub mod foreign_items;
 pub mod intrinsics;
 pub mod unix;