diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-02-11 18:36:53 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-02-11 18:36:53 -0800 |
| commit | 27d4a94d33067ffac4c4746830a27979874a4949 (patch) | |
| tree | db0c0f6bcea490ee697d0bf76d2ff48477aa5ab8 | |
| parent | 1179ac7c6b57862aa06fab556b6e58e186fd735b (diff) | |
| parent | 9e1a38ee2cec9c9151d3750d027ae5a839f4b113 (diff) | |
| download | rust-libc-27d4a94d33067ffac4c4746830a27979874a4949.tar.gz | |
Merge pull request #183 from antonblanchard/powerpc64_merge2
PowerPC64 fixes
| -rw-r--r-- | src/unix/notbsd/linux/mod.rs | 6 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/b64/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/b64/powerpc64.rs | 2 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/mod.rs | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 5a392c02e2..a02efadd4d 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -84,11 +84,9 @@ s! { } pub struct pthread_mutexattr_t { - #[cfg(any(target_arch = "x86_64", target_arch = "powerpc64", - target_arch = "powerpc64le"))] + #[cfg(any(target_arch = "x86_64", target_arch = "powerpc64"))] __align: [::c_int; 0], - #[cfg(not(any(target_arch = "x86_64", target_arch = "powerpc64", - target_arch = "powerpc64le")))] + #[cfg(not(any(target_arch = "x86_64", target_arch = "powerpc64")))] __align: [::c_long; 0], size: [u8; __SIZEOF_PTHREAD_MUTEXATTR_T], } diff --git a/src/unix/notbsd/linux/other/b64/mod.rs b/src/unix/notbsd/linux/other/b64/mod.rs index c9d82af4b4..28d9e4d00f 100644 --- a/src/unix/notbsd/linux/other/b64/mod.rs +++ b/src/unix/notbsd/linux/other/b64/mod.rs @@ -22,7 +22,7 @@ cfg_if! { if #[cfg(target_arch = "aarch64")] { mod aarch64; pub use self::aarch64::*; - } else if #[cfg(any(target_arch = "powerpc64", target_arch = "powerpc64le"))] { + } else if #[cfg(any(target_arch = "powerpc64"))] { mod powerpc64; pub use self::powerpc64::*; } else { diff --git a/src/unix/notbsd/linux/other/b64/powerpc64.rs b/src/unix/notbsd/linux/other/b64/powerpc64.rs index c853a01fc5..742fb579ba 100644 --- a/src/unix/notbsd/linux/other/b64/powerpc64.rs +++ b/src/unix/notbsd/linux/other/b64/powerpc64.rs @@ -1,7 +1,7 @@ //! PowerPC64-specific definitions for 64-bit linux-like values pub type c_char = u8; -pub type wchar_t = u32; +pub type wchar_t = i32; pub type nlink_t = u64; pub type blksize_t = i64; diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs index 0a65f9540d..d043f22449 100644 --- a/src/unix/notbsd/linux/other/mod.rs +++ b/src/unix/notbsd/linux/other/mod.rs @@ -454,8 +454,7 @@ cfg_if! { pub use self::b32::*; } else if #[cfg(any(target_arch = "x86_64", target_arch = "aarch64", - target_arch = "powerpc64", - target_arch = "powerpc64le"))] { + target_arch = "powerpc64"))] { mod b64; pub use self::b64::*; } else { |