linux: Move membarrier.h constants to src/new

(backport <#4915>)
(cherry picked from commit 68d3a77)

Author: tgross35

libc-test/build.rs

@@ -1737,7 +1737,6 @@ fn test_dragonflybsd(target: &str) {
             "sem_t" => true,
             // mqd_t is a pointer on DragonFly
             "mqd_t" => true,
-
             _ => false,
         }
     });
@@ -4653,16 +4652,23 @@ fn test_linux(target: &str) {
     });
 
     let c_enums = [
-        "tpacket_versions",
-        "proc_cn_mcast_op",
-        "proc_cn_event",
+        "membarrier_cmd",
         "pid_type",
+        "proc_cn_event",
+        "proc_cn_mcast_op",
+        "tpacket_versions",
     ];
     cfg.alias_is_c_enum(move |e| c_enums.contains(&e));
 
     // FIXME(libc): `pid_type` and `proc_cn_event` is hidden.
     cfg.skip_c_enum(|e| e == "pid_type" || e == "proc_cn_event");
 
+    cfg.skip_signededness(move |c| match c {
+        // FIXME(1.0): uses the enum default signedness
+        "membarrier_cmd" => true,
+        _ => false,
+    });
+
     cfg.skip_fn(move |function| {
         let name = function.ident();
         // skip those that are manually verified

libc-test/semver/linux.txt

@@ -4086,6 +4086,7 @@ madvise
 major
 makedev
 memalign
+membarrier_cmd
 memmem
 memrchr
 mincore

src/new/linux_uapi/linux/membarrier.rs

@@ -0,0 +1,20 @@
+//! Header: `uapi/linux/membarrier.h`
+
+use crate::prelude::*;
+
+c_enum! {
+    // FIXME(1.0): incorrect repr signedness, this should be removed in a breaking change.
+    #[repr(c_int)]
+    pub enum membarrier_cmd {
+        pub MEMBARRIER_CMD_QUERY = 0,
+        pub MEMBARRIER_CMD_GLOBAL = 1 << 0,
+        pub MEMBARRIER_CMD_GLOBAL_EXPEDITED = 1 << 1,
+        pub MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED = 1 << 2,
+        pub MEMBARRIER_CMD_PRIVATE_EXPEDITED = 1 << 3,
+        pub MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 1 << 4,
+        pub MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE = 1 << 5,
+        pub MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 1 << 6,
+        pub MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ = 1 << 7,
+        pub MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ = 1 << 8,
+    }
+}

src/new/linux_uapi/linux/mod.rs

@@ -4,4 +4,5 @@
 
 pub(crate) mod can;
 pub(crate) mod keyctl;
+pub(crate) mod membarrier;
 pub(crate) mod netlink;

src/new/mod.rs

@@ -181,6 +181,7 @@ cfg_if! {
         pub use linux::can::raw::*;
         pub use linux::can::*;
         pub use linux::keyctl::*;
+        pub use linux::membarrier::*;
         pub use linux::netlink::*;
         #[cfg(target_env = "gnu")]
         pub use net::route::*;

src/unix/linux_like/linux/mod.rs

@@ -1557,18 +1557,6 @@ pub const MPOL_F_NUMA_BALANCING: c_int = 1 << 13;
 pub const MPOL_F_RELATIVE_NODES: c_int = 1 << 14;
 pub const MPOL_F_STATIC_NODES: c_int = 1 << 15;
 
-// linux/membarrier.h
-pub const MEMBARRIER_CMD_QUERY: c_int = 0;
-pub const MEMBARRIER_CMD_GLOBAL: c_int = 1 << 0;
-pub const MEMBARRIER_CMD_GLOBAL_EXPEDITED: c_int = 1 << 1;
-pub const MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED: c_int = 1 << 2;
-pub const MEMBARRIER_CMD_PRIVATE_EXPEDITED: c_int = 1 << 3;
-pub const MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED: c_int = 1 << 4;
-pub const MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE: c_int = 1 << 5;
-pub const MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE: c_int = 1 << 6;
-pub const MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ: c_int = 1 << 7;
-pub const MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ: c_int = 1 << 8;
-
 pub const PTHREAD_MUTEX_INITIALIZER: crate::pthread_mutex_t = crate::pthread_mutex_t {
     size: [0; crate::__SIZEOF_PTHREAD_MUTEX_T],
 };