diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index e066f8c0bbf..be6b79059a9 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -99,7 +99,18 @@ pub struct uv_tcp_t {
     a08: *u8, a09: *u8, a10: *u8, a11: *u8,
     a12: *u8, a13: *u8, a14: *u8, a15: *u8,
     a16: *u8, a17: *u8, a18: *u8, a19: *u8,
-    a20: *u8, a21: *u8, a22: *u8, a23: *u8
+    a20: *u8, a21: *u8, a22: *u8,
+    a23: uv_tcp_t_osx_riders
+}
+#[cfg(target_arch="x86_64")]
+pub struct uv_tcp_t_osx_riders {
+    a23: *u8,
+}
+#[cfg(target_arch="x86")]
+#[cfg(target_arch="arm")]
+pub struct uv_tcp_t_osx_riders {
+    a23: *u8,
+    a24: *u8, a25: *u8,
 }
 #[cfg(target_os="linux")]
 #[cfg(target_os="freebsd")]
@@ -440,24 +451,60 @@ pub mod uv_ll_struct_stubgen {
         }
         #[cfg(target_os = "macos")]
         pub fn gen_stub_os() -> uv_tcp_t {
-            uv_tcp_t {
-                fields: uv_handle_fields {
-                    loop_handle: ptr::null(), type_: 0u32,
-                    close_cb: ptr::null(),
-                    data: ptr::null(),
-                },
-                a00: 0 as *u8, a01: 0 as *u8, a02: 0 as *u8,
-                a03: 0 as *u8,
-                a04: 0 as *u8, a05: 0 as *u8, a06: 0 as *u8,
-                a07: 0 as *u8,
-                a08: 0 as *u8, a09: 0 as *u8, a10: 0 as *u8,
-                a11: 0 as *u8,
-                a12: 0 as *u8, a13: 0 as *u8, a14: 0 as *u8,
-                a15: 0 as *u8,
-                a16: 0 as *u8, a17: 0 as *u8, a18: 0 as *u8,
-                a19: 0 as *u8,
-                a20: 0 as *u8, a21: 0 as *u8, a22: 0 as *u8,
-                a23: 0 as *u8,
+            use super::uv_tcp_t_osx_riders;
+
+            return gen_stub_arch();
+
+            #[cfg(target_arch = "x86_64")]
+            fn gen_stub_arch() -> uv_tcp_t {
+                uv_tcp_t {
+                    fields: uv_handle_fields {
+                        loop_handle: ptr::null(), type_: 0u32,
+                        close_cb: ptr::null(),
+                        data: ptr::null(),
+                    },
+                    a00: 0 as *u8, a01: 0 as *u8, a02: 0 as *u8,
+                    a03: 0 as *u8,
+                    a04: 0 as *u8, a05: 0 as *u8, a06: 0 as *u8,
+                    a07: 0 as *u8,
+                    a08: 0 as *u8, a09: 0 as *u8, a10: 0 as *u8,
+                    a11: 0 as *u8,
+                    a12: 0 as *u8, a13: 0 as *u8, a14: 0 as *u8,
+                    a15: 0 as *u8,
+                    a16: 0 as *u8, a17: 0 as *u8, a18: 0 as *u8,
+                    a19: 0 as *u8,
+                    a20: 0 as *u8, a21: 0 as *u8, a22: 0 as *u8,
+                    a23: uv_tcp_t_osx_riders {
+                        a23: 0 as *u8,
+                    }
+                }
+            }
+
+            #[cfg(target_arch = "x86")]
+            #[cfg(target_arch = "arm")]
+            fn gen_stub_arch() -> uv_tcp_t {
+                uv_tcp_t {
+                    fields: uv_handle_fields {
+                        loop_handle: ptr::null(), type_: 0u32,
+                        close_cb: ptr::null(),
+                        data: ptr::null(),
+                    },
+                    a00: 0 as *u8, a01: 0 as *u8, a02: 0 as *u8,
+                    a03: 0 as *u8,
+                    a04: 0 as *u8, a05: 0 as *u8, a06: 0 as *u8,
+                    a07: 0 as *u8,
+                    a08: 0 as *u8, a09: 0 as *u8, a10: 0 as *u8,
+                    a11: 0 as *u8,
+                    a12: 0 as *u8, a13: 0 as *u8, a14: 0 as *u8,
+                    a15: 0 as *u8,
+                    a16: 0 as *u8, a17: 0 as *u8, a18: 0 as *u8,
+                    a19: 0 as *u8,
+                    a20: 0 as *u8, a21: 0 as *u8, a22: 0 as *u8,
+                    a23: uv_tcp_t_osx_riders {
+                        a23: 0 as *u8,
+                        a24: 0 as *u8, a25: 0 as *u8,
+                    }
+                }
             }
         }
     }