diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2020-01-27 06:10:10 +0000 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2020-03-05 17:36:50 +0000 |
| commit | f4f91f0b2f98ddf9ea36c4bc200ebda2cd898230 (patch) | |
| tree | 97d2e63867c5bb5a636c4eb96f79576d625e88f7 /src/libpanic_abort | |
| parent | d73813ae62a2d7327f1e657f999ea7636c7a402d (diff) | |
| download | rust-f4f91f0b2f98ddf9ea36c4bc200ebda2cd898230.tar.gz rust-f4f91f0b2f98ddf9ea36c4bc200ebda2cd898230.zip | |
Remove eh_unwind_resume lang item
Diffstat (limited to 'src/libpanic_abort')
| -rw-r--r-- | src/libpanic_abort/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/libpanic_abort/lib.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libpanic_abort/Cargo.toml b/src/libpanic_abort/Cargo.toml index 8ebd95047ac..2bee0b716c7 100644 --- a/src/libpanic_abort/Cargo.toml +++ b/src/libpanic_abort/Cargo.toml @@ -14,4 +14,3 @@ doc = false core = { path = "../libcore" } libc = { version = "0.2", default-features = false } compiler_builtins = "0.1.0" -cfg-if = "0.1.8" diff --git a/src/libpanic_abort/lib.rs b/src/libpanic_abort/lib.rs index 6ea818ecef8..d894b50e077 100644 --- a/src/libpanic_abort/lib.rs +++ b/src/libpanic_abort/lib.rs @@ -115,7 +115,7 @@ pub mod personalities { // Note that we don't execute landing pads, so this is never called, so it's // body is empty. #[no_mangle] - #[cfg(all(target_os = "windows", target_env = "gnu"))] + #[cfg(all(bootstrap, target_os = "windows", target_env = "gnu"))] pub extern "C" fn rust_eh_unwind_resume() {} // These two are called by our startup objects on i686-pc-windows-gnu, but |