diff options
| author | bors <bors@rust-lang.org> | 2014-02-06 06:06:35 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-06 06:06:35 -0800 |
| commit | 27dcd873cb63ddf2057cbae341be9ccae7b011c3 (patch) | |
| tree | 158066282e3dc21a1c8232f5aa1946d76f310198 /src/libstd | |
| parent | 9a9a70b3fde3690e710fddb3d5d3b2f580ee07fb (diff) | |
| parent | f286859c1e918107b2de5d9ac1ea07c5b8faae82 (diff) | |
| download | rust-27dcd873cb63ddf2057cbae341be9ccae7b011c3.tar.gz rust-27dcd873cb63ddf2057cbae341be9ccae7b011c3.zip | |
auto merge of #12051 : luqmana/rust/arm-fix, r=alexcrichton
Fix building for arm/Linux.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/unstable/mutex.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libstd/unstable/mutex.rs b/src/libstd/unstable/mutex.rs index 82957cd93ce..e9df17ef514 100644 --- a/src/libstd/unstable/mutex.rs +++ b/src/libstd/unstable/mutex.rs @@ -153,13 +153,17 @@ mod imp { static __SIZEOF_PTHREAD_MUTEX_T: uint = 40 - 8; #[cfg(target_arch = "x86")] static __SIZEOF_PTHREAD_MUTEX_T: uint = 24 - 8; + #[cfg(target_arch = "arm")] + 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")] static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8; + #[cfg(target_arch = "arm")] + static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8; pub struct pthread_mutex_t { - __align: libc::c_long, + __align: libc::c_longlong, size: [u8, ..__SIZEOF_PTHREAD_MUTEX_T], } pub struct pthread_cond_t { |