diff options
| author | bors <bors@rust-lang.org> | 2014-06-24 13:46:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-24 13:46:54 +0000 |
| commit | 82ec1aef293ddc5c6373bd7f5ec323fafbdf7901 (patch) | |
| tree | 52730fbfa9ef29c85dd537fbd13829275e180504 /src/librustrt | |
| parent | 71fe44def9676d519f5ce5d7304e581a42cf2c70 (diff) | |
| parent | 34a384a128d9630679f9c90bb27eaa0822e5b798 (diff) | |
| download | rust-82ec1aef293ddc5c6373bd7f5ec323fafbdf7901.tar.gz rust-82ec1aef293ddc5c6373bd7f5ec323fafbdf7901.zip | |
auto merge of #14963 : w3ln4/rust/master, r=alexcrichton
The aim of these changes is not working out a generic bi-endianness architectures support but to allow people develop for little endian MIPS machines (issue #7190).
Diffstat (limited to 'src/librustrt')
| -rw-r--r-- | src/librustrt/libunwind.rs | 1 | ||||
| -rw-r--r-- | src/librustrt/mutex.rs | 4 | ||||
| -rw-r--r-- | src/librustrt/stack.rs | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/librustrt/libunwind.rs b/src/librustrt/libunwind.rs index 2d58c1bee15..fe9b2b569c0 100644 --- a/src/librustrt/libunwind.rs +++ b/src/librustrt/libunwind.rs @@ -69,6 +69,7 @@ pub static unwinder_private_data_size: int = 20; pub static unwinder_private_data_size: int = 5; #[cfg(target_arch = "mips")] +#[cfg(target_arch = "mipsel")] pub static unwinder_private_data_size: int = 2; pub struct _Unwind_Exception { diff --git a/src/librustrt/mutex.rs b/src/librustrt/mutex.rs index ee696f2cf7c..2bbfcf73917 100644 --- a/src/librustrt/mutex.rs +++ b/src/librustrt/mutex.rs @@ -415,6 +415,8 @@ mod imp { static __SIZEOF_PTHREAD_MUTEX_T: uint = 24 - 8; #[cfg(target_arch = "mips")] static __SIZEOF_PTHREAD_MUTEX_T: uint = 24 - 8; + #[cfg(target_arch = "mipsel")] + static __SIZEOF_PTHREAD_MUTEX_T: uint = 24 - 8; #[cfg(target_arch = "x86_64")] static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8; #[cfg(target_arch = "x86")] @@ -423,6 +425,8 @@ mod imp { static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8; #[cfg(target_arch = "mips")] static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8; + #[cfg(target_arch = "mipsel")] + static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8; #[repr(C)] pub struct pthread_mutex_t { diff --git a/src/librustrt/stack.rs b/src/librustrt/stack.rs index 17e939ef430..36ddf764d5c 100644 --- a/src/librustrt/stack.rs +++ b/src/librustrt/stack.rs @@ -217,6 +217,7 @@ pub unsafe fn record_sp_limit(limit: uint) { // mips, arm - Some brave soul can port these to inline asm, but it's over // my head personally #[cfg(target_arch = "mips")] + #[cfg(target_arch = "mipsel")] #[cfg(target_arch = "arm", not(target_os = "ios"))] #[inline(always)] unsafe fn target_record_sp_limit(limit: uint) { use libc::c_void; @@ -298,6 +299,7 @@ pub unsafe fn get_sp_limit() -> uint { // mips, arm - Some brave soul can port these to inline asm, but it's over // my head personally #[cfg(target_arch = "mips")] + #[cfg(target_arch = "mipsel")] #[cfg(target_arch = "arm", not(target_os = "ios"))] #[inline(always)] unsafe fn target_get_sp_limit() -> uint { use libc::c_void; |