move EPOLLEXCLUSIVE and EPOLLWAKEUP to linux/mod.rs

Author: skrap

libc-test/build.rs

@@ -2643,6 +2643,12 @@ fn test_linux(target: &str) {
 
             "MS_RMT_MASK" if uclibc => true, // updated in glibc 2.22 and musl 1.1.13
 
+            // These are not defined in uclibc but will be passed through to the kernel
+            // so they will be supported if the kernel supports them.  Otherwise the
+            // kernel will return runtime errors.  Since they're required for tokio 
+            // support, we except them from the tests here.
+            // See https://github.com/rust-lang/libc/pull/2019#issuecomment-754351482
+            "EPOLLEXCLUSIVE" | "EPOLLWAKEUP" if uclibc => true,
             _ => false,
         }
     });

src/unix/linux_like/linux/gnu/mod.rs

@@ -885,8 +885,6 @@ pub const PTRACE_INTERRUPT: ::c_uint = 0x4207;
 pub const PTRACE_LISTEN: ::c_uint = 0x4208;
 pub const PTRACE_PEEKSIGINFO: ::c_uint = 0x4209;
 
-pub const EPOLLWAKEUP: ::c_int = 0x20000000;
-
 // linux/rtnetlink.h
 pub const TCA_PAD: ::c_ushort = 9;
 pub const TCA_DUMP_INVISIBLE: ::c_ushort = 10;

src/unix/linux_like/linux/mod.rs

@@ -1373,6 +1373,8 @@ pub const SHM_HUGETLB: ::c_int = 0o4000;
 pub const SHM_NORESERVE: ::c_int = 0o10000;
 
 pub const EPOLLRDHUP: ::c_int = 0x2000;
+pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000;
+pub const EPOLLWAKEUP: ::c_int = 0x20000000;
 pub const EPOLLONESHOT: ::c_int = 0x40000000;
 
 pub const QFMT_VFS_OLD: ::c_int = 1;

src/unix/linux_like/linux/musl/mod.rs

@@ -582,8 +582,6 @@ pub const PF_NFC: ::c_int = AF_NFC;
 pub const PF_VSOCK: ::c_int = AF_VSOCK;
 pub const PF_XDP: ::c_int = AF_XDP;
 
-pub const EPOLLWAKEUP: ::c_int = 0x20000000;
-
 pub const EFD_NONBLOCK: ::c_int = ::O_NONBLOCK;
 
 pub const SFD_NONBLOCK: ::c_int = ::O_NONBLOCK;

src/unix/linux_like/linux/uclibc/mips/mod.rs

@@ -28,8 +28,6 @@ pub const SA_RESETHAND: ::c_int = 0x80000000;
 pub const SA_RESTART: ::c_int = 0x10000000;
 pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
 
-pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000; // from linux/mod.rs
-pub const EPOLLWAKEUP: ::c_int = 0x20000000; // from linux/other/mod.rs
 pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
 
 pub const EFD_CLOEXEC: ::c_int = 0x80000;