bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix compile errors for ARM.

Browse source
This commit is contained in:
Vadim Chugunov 2015-08-02 21:15:01 -07:00
parent e493027984
commit 96d1db2b1a
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/rt/libunwind.rs
View file

@ -36,6 +36,7 @@ pub enum _Unwind_Action {
#[cfg(target_arch = "arm")] #[cfg(target_arch = "arm")]
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone)]
pub enum _Unwind_State { pub enum _Unwind_State {
_US_VIRTUAL_UNWIND_FRAME = 0, _US_VIRTUAL_UNWIND_FRAME = 0,
_US_UNWIND_FRAME_STARTING = 1, _US_UNWIND_FRAME_STARTING = 1,
@ -46,6 +47,7 @@ pub enum _Unwind_State {
} }
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone)]
pub enum _Unwind_Reason_Code { pub enum _Unwind_Reason_Code {
_URC_NO_REASON = 0, _URC_NO_REASON = 0,
_URC_FOREIGN_EXCEPTION_CAUGHT = 1, _URC_FOREIGN_EXCEPTION_CAUGHT = 1,

4
src/libstd/rt/unwind/gcc.rs
View file

@ -179,8 +179,8 @@ pub mod eabi {
} }
else { // cleanup phase else { // cleanup phase
unsafe { unsafe {
__gcc_personality_sj0(_version, actions, _exception_class, _ue_header, __gcc_personality_sj0(version, actions, exception_class, ue_header,
_context) context)
} }
} }
} }