diff options
| author | bors <bors@rust-lang.org> | 2023-03-03 12:09:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-03 12:09:12 +0000 |
| commit | b8e2476614b7b0a7c1eb6b6c7227c6c5be726062 (patch) | |
| tree | 1789a31b3403dd402c1a71d8edefdea86eb9df55 /libc-test | |
| parent | 6275bacfcbb18e27b2ffbff72680726304211d20 (diff) | |
| parent | 279d932447f67cf72a2c482a3d555a4684f776ec (diff) | |
| download | rust-libc-b8e2476614b7b0a7c1eb6b6c7227c6c5be726062.tar.gz | |
Auto merge of #3039 - devnexen:membarrier_flags_linux, r=JohnTitor
membarrier flags constants addition
Diffstat (limited to 'libc-test')
| -rw-r--r-- | libc-test/build.rs | 11 | ||||
| -rw-r--r-- | libc-test/semver/android.txt | 10 | ||||
| -rw-r--r-- | libc-test/semver/linux.txt | 10 |
3 files changed, 31 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index efa8f1304e..4e67c6eb5d 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -1632,6 +1632,7 @@ fn test_android(target: &str) { "linux/rtnetlink.h", "linux/if_tun.h", "linux/magic.h", + "linux/membarrier.h", "linux/memfd.h", "linux/mempolicy.h", "linux/module.h", @@ -1783,6 +1784,9 @@ fn test_android(target: &str) { // GRND_INSECURE was added in platform-tools-30.0.0 "GRND_INSECURE" => true, + // kernel 5.10 minimum required + "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ" | "MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ" => true, + _ => false, } }); @@ -3249,6 +3253,7 @@ fn test_linux(target: &str) { "linux/keyctl.h", "linux/magic.h", "linux/memfd.h", + "linux/membarrier.h", "linux/mempolicy.h", "linux/mman.h", "linux/module.h", @@ -3484,6 +3489,12 @@ fn test_linux(target: &str) { { return true; } + // FIXME: Requires >= 5.10 kernel headers + if name.starts_with("MEMBARRIER_CMD_REGISTER") + || name.starts_with("MEMBARRIER_CMD_PRIVATE") + { + return true; + } } match name { // These constants are not available if gnu headers have been included diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt index 3bee01ca18..d0017b846c 100644 --- a/libc-test/semver/android.txt +++ b/libc-test/semver/android.txt @@ -1164,6 +1164,16 @@ MCAST_MSFILTER MCAST_UNBLOCK_SOURCE MCL_CURRENT MCL_FUTURE +MEMBARRIER_CMD_GLOBAL +MEMBARRIER_CMD_GLOBAL_EXPEDITED +MEMBARRIER_CMD_QUERY +MEMBARRIER_CMD_PRIVATE_EXPEDITED +MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE +MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ +MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED +MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED +MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE +MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ MFD_ALLOW_SEALING MFD_CLOEXEC MFD_HUGETLB diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index daccc3c38d..e7eefafd18 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -1300,6 +1300,16 @@ MCAST_MSFILTER MCAST_UNBLOCK_SOURCE MCL_CURRENT MCL_FUTURE +MEMBARRIER_CMD_GLOBAL +MEMBARRIER_CMD_GLOBAL_EXPEDITED +MEMBARRIER_CMD_QUERY +MEMBARRIER_CMD_PRIVATE_EXPEDITED +MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE +MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ +MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED +MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED +MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE +MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ MFD_ALLOW_SEALING MFD_CLOEXEC MFD_HUGETLB |