deps: upgrade libuv to 8e3e60f

2 files changed, 20 insertions, 1 deletions

diff --git a/deps/uv/gyp_uv b/deps/uv/gyp_uv
index 81cce5d52..ab594515a 100755
--- a/deps/uv/gyp_uv
+++ b/deps/uv/gyp_uv
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import glob
+import platform
 import os
 import subprocess
 import sys
@@ -18,6 +19,14 @@ except ImportError:
   sys.exit(42)
 
 
+def host_arch():
+  machine = platform.machine()
+  if machine == 'i386': return 'ia32'
+  if machine == 'x86_64': return 'x64'
+  if machine.startswith('arm'): return 'arm'
+  return machine  # Return as-is and hope for the best.
+
+
 def compiler_version():
   proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
   is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
@@ -72,8 +81,11 @@ if __name__ == '__main__':
     args.append('-Dgcc_version=%d' % (10 * major + minor))
     args.append('-Dclang=%d' % int(is_clang))
 
+  if not any(a.startswith('-Dhost_arch=') for a in args):
+    args.append('-Dhost_arch=%s' % host_arch())
+
   if not any(a.startswith('-Dtarget_arch=') for a in args):
-    args.append('-Dtarget_arch=ia32')
+    args.append('-Dtarget_arch=%s' % host_arch())
 
   if not any(a.startswith('-Dlibrary=') for a in args):
     args.append('-Dlibrary=static_library')
diff --git a/deps/uv/src/unix/linux/syscalls.h b/deps/uv/src/unix/linux/syscalls.h
index 71edde9c3..e65eb4589 100644
--- a/deps/uv/src/unix/linux/syscalls.h
+++ b/deps/uv/src/unix/linux/syscalls.h
@@ -69,10 +69,17 @@
 #define UV__IN_DELETE_SELF    0x400
 #define UV__IN_MOVE_SELF      0x800
 
+#if defined(__x86_64__)
 struct uv__epoll_event {
   __u32 events;
   __u64 data;
 } __attribute__((packed));
+#else
+struct uv__epoll_event {
+  __u32 events;
+  __u64 data;
+};
+#endif
 
 struct uv__inotify_event {
   __s32 wd;