Skip to content

Commit 2034aa4

Browse files
committed
xous: fix unwinding and unused symbol errors
The unwinding feature is called `panic-unwind` and not `panic_unwind`. Adjust the feature gate to look for these values. Additionally, the `abort_internal()` call is no longer used. Signed-off-by: Sean Cross <sean@xobs.io>
1 parent b84478a commit 2034aa4

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![forbid(unsafe_op_in_unsafe_fn)]
22

3-
use crate::os::xous::ffi::exit;
4-
53
pub mod os;
64
#[path = "../unsupported/pipe.rs"]
75
pub mod pipe;
@@ -10,7 +8,3 @@ pub mod time;
108
#[path = "../unsupported/common.rs"]
119
mod common;
1210
pub use common::*;
13-
14-
pub fn abort_internal() -> ! {
15-
exit(101);
16-
}

library/std/src/sys/pal/xous/os.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub(crate) mod params;
1111
static PARAMS_ADDRESS: Atomic<*mut u8> = AtomicPtr::new(core::ptr::null_mut());
1212

1313
#[cfg(not(test))]
14-
#[cfg(feature = "panic_unwind")]
14+
#[cfg(feature = "panic-unwind")]
1515
mod eh_unwinding {
1616
pub(crate) struct EhFrameFinder;
1717
pub(crate) static mut EH_FRAME_ADDRESS: usize = 0;
@@ -45,7 +45,7 @@ mod c_compat {
4545

4646
#[unsafe(no_mangle)]
4747
pub extern "C" fn _start(eh_frame: usize, params_address: usize) {
48-
#[cfg(feature = "panic_unwind")]
48+
#[cfg(feature = "panic-unwind")]
4949
{
5050
unsafe { super::eh_unwinding::EH_FRAME_ADDRESS = eh_frame };
5151
unwind::set_custom_eh_frame_finder(&super::eh_unwinding::EH_FRAME_SETTINGS).ok();

0 commit comments

Comments
 (0)