Remove use of the start feature
`#![feature(start)]` was removed in [1], but we make use of it in the intrinsics example. Replace use of this feature with `#[no_mangle]` applied to `#[main]`. We don't actually run this example so it is not a problem if this is not entirely accurate. Currently the example does not run to completion, instead invoking `rust_begin_unwind`. [1]: https://github.com/rust-lang/rust/pull/134299
This commit is contained in:
parent
ffefc5ad82
commit
64e0a0a68d
1 changed files with 5 additions and 7 deletions
|
|
@ -5,14 +5,13 @@
|
|||
|
||||
#![allow(unused_features)]
|
||||
#![allow(internal_features)]
|
||||
#![cfg_attr(thumb, no_main)]
|
||||
#![deny(dead_code)]
|
||||
#![feature(allocator_api)]
|
||||
#![feature(f128)]
|
||||
#![feature(f16)]
|
||||
#![feature(lang_items)]
|
||||
#![feature(start)]
|
||||
#![no_std]
|
||||
#![no_main]
|
||||
|
||||
extern crate panic_handler;
|
||||
|
||||
|
|
@ -630,11 +629,10 @@ fn run() {
|
|||
extern "C" {
|
||||
fn rust_begin_unwind(x: usize);
|
||||
}
|
||||
// if bb(false) {
|
||||
|
||||
unsafe {
|
||||
rust_begin_unwind(0);
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
fn something_with_a_dtor(f: &dyn Fn()) {
|
||||
|
|
@ -649,15 +647,15 @@ fn something_with_a_dtor(f: &dyn Fn()) {
|
|||
f();
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
#[cfg(not(thumb))]
|
||||
#[start]
|
||||
fn main(_: isize, _: *const *const u8) -> isize {
|
||||
fn main(_argc: core::ffi::c_int, _argv: *const *const u8) -> core::ffi::c_int {
|
||||
run();
|
||||
0
|
||||
}
|
||||
|
||||
#[cfg(thumb)]
|
||||
#[no_mangle]
|
||||
#[cfg(thumb)]
|
||||
pub fn _start() -> ! {
|
||||
run();
|
||||
loop {}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue