1 files changed, 14 insertions, 14 deletions

diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index ee5df1d6d2f..548782216bb 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -557,7 +557,8 @@ pub mod types {
                 pub type mode_t = u16;
                 pub type ssize_t = i32;
             }
-            #[cfg(target_arch = "x86")]
+            #[cfg(any(target_arch = "x86",
+                      target_arch = "powerpc"))]
             pub mod posix01 {
                 use types::os::arch::c95::{c_short, c_long, time_t};
                 use types::os::arch::posix88::{dev_t, gid_t, ino_t};
@@ -648,8 +649,7 @@ pub mod types {
                 }
             }
             #[cfg(any(target_arch = "mips",
-                      target_arch = "mipsel",
-                      target_arch = "powerpc"))]
+                      target_arch = "mipsel"))]
             pub mod posix01 {
                 use types::os::arch::c95::{c_long, c_ulong, time_t};
                 use types::os::arch::posix88::{gid_t, ino_t};
@@ -2493,7 +2493,8 @@ pub mod consts {
         #[cfg(any(target_arch = "x86",
                   target_arch = "x86_64",
                   target_arch = "arm",
-                  target_arch = "aarch64"))]
+                  target_arch = "aarch64",
+                  target_arch = "powerpc"))]
         pub mod posix88 {
             use types::os::arch::c95::c_int;
             use types::common::c95::c_void;
@@ -2706,8 +2707,7 @@ pub mod consts {
         }
 
         #[cfg(any(target_arch = "mips",
-                  target_arch = "mipsel",
-                  target_arch = "powerpc"))]
+                  target_arch = "mipsel"))]
         pub mod posix88 {
             use types::os::arch::c95::c_int;
             use types::common::c95::c_void;
@@ -3004,7 +3004,8 @@ pub mod consts {
         #[cfg(any(target_arch = "arm",
                   target_arch = "aarch64",
                   target_arch = "x86",
-                  target_arch = "x86_64"))]
+                  target_arch = "x86_64",
+                  target_arch = "powerpc"))]
         pub mod bsd44 {
             use types::os::arch::c95::c_int;
 
@@ -3052,8 +3053,7 @@ pub mod consts {
             pub const SHUT_RDWR: c_int = 2;
         }
         #[cfg(any(target_arch = "mips",
-                  target_arch = "mipsel",
-                  target_arch = "powerpc"))]
+                  target_arch = "mipsel"))]
         pub mod bsd44 {
             use types::os::arch::c95::c_int;
 
@@ -3101,7 +3101,8 @@ pub mod consts {
         #[cfg(any(target_arch = "x86",
                   target_arch = "x86_64",
                   target_arch = "arm",
-                  target_arch = "aarch64"))]
+                  target_arch = "aarch64",
+                  target_arch = "powerpc"))]
         pub mod extra {
             use types::os::arch::c95::c_int;
 
@@ -3129,8 +3130,7 @@ pub mod consts {
             pub const MAP_STACK : c_int = 0x020000;
         }
         #[cfg(any(target_arch = "mips",
-                  target_arch = "mipsel",
-                  target_arch = "powerpc"))]
+                  target_arch = "mipsel"))]
         pub mod extra {
             use types::os::arch::c95::c_int;
 
@@ -4650,13 +4650,13 @@ pub mod funcs {
             use types::os::arch::c95::c_int;
             use types::os::common::posix01::sighandler_t;
 
-            #[cfg(not(target_os = "android"))]
+            #[cfg(not(all(target_os = "android", target_arch = "arm")))]
             extern {
                 pub fn signal(signum: c_int,
                               handler: sighandler_t) -> sighandler_t;
             }
 
-            #[cfg(target_os = "android")]
+            #[cfg(all(target_os = "android", target_arch = "arm"))]
             extern {
                 #[link_name = "bsd_signal"]
                 pub fn signal(signum: c_int,