From 8fb868c801971466d21fb2542994e74fa0e46e6d Mon Sep 17 00:00:00 2001
From: Steve Lau <stevelauc@outlook.com>
Date: Thu, 3 Oct 2024 11:07:30 +0800
Subject: [PATCH] linux: Make elf name type constants always available

---
 libc-test/semver/linux-gnu.txt       | 17 -----------------
 libc-test/semver/linux.txt           | 17 +++++++++++++++++
 src/unix/linux_like/linux/gnu/mod.rs | 19 -------------------
 src/unix/linux_like/linux/mod.rs     | 19 +++++++++++++++++++
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/libc-test/semver/linux-gnu.txt b/libc-test/semver/linux-gnu.txt
index ce4f85484eee..6f0ce2ac14e7 100644
--- a/libc-test/semver/linux-gnu.txt
+++ b/libc-test/semver/linux-gnu.txt
@@ -337,23 +337,6 @@ NFT_USERDATA_MAXLEN
 NF_NETDEV_INGRESS
 NF_NETDEV_NUMHOOKS
 NILFS_SUPER_MAGIC
-NT_PRSTATUS
-NT_PRFPREG
-NT_FPREGSET
-NT_PRPSINFO
-NT_PRXREG
-NT_TASKSTRUCT
-NT_PLATFORM
-NT_AUXV
-NT_GWINDOWS
-NT_ASRS
-NT_PSTATUS
-NT_PSINFO
-NT_PRCRED
-NT_UTSNAME
-NT_LWPSTATUS
-NT_LWPSINFO
-NT_PRFPXREG
 NTF_EXT_LEARNED
 NTF_MASTER
 NTF_OFFLOADED
diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
index ebbe04d1b726..3727324f1adc 100644
--- a/libc-test/semver/linux.txt
+++ b/libc-test/semver/linux.txt
@@ -3949,3 +3949,20 @@ eventfd_write
 __c_anonymous_ifru_map
 __c_anonymous_ifr_ifru
 __c_anonymous_ifc_ifcu
+NT_PRSTATUS
+NT_PRFPREG
+NT_FPREGSET
+NT_PRPSINFO
+NT_PRXREG
+NT_TASKSTRUCT
+NT_PLATFORM
+NT_AUXV
+NT_GWINDOWS
+NT_ASRS
+NT_PSTATUS
+NT_PSINFO
+NT_PRCRED
+NT_UTSNAME
+NT_LWPSTATUS
+NT_LWPSINFO
+NT_PRFPXREG
diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
index 75d150c90d58..5533008e2541 100644
--- a/src/unix/linux_like/linux/gnu/mod.rs
+++ b/src/unix/linux_like/linux/gnu/mod.rs
@@ -1054,25 +1054,6 @@ pub const XSK_UNALIGNED_BUF_ADDR_MASK: ::c_ulonglong = (1 << XSK_UNALIGNED_BUF_O
 
 pub const XDP_PKT_CONTD: ::__u32 = 1 << 0;
 
-// elf.h
-pub const NT_PRSTATUS: ::c_int = 1;
-pub const NT_PRFPREG: ::c_int = 2;
-pub const NT_FPREGSET: ::c_int = 2;
-pub const NT_PRPSINFO: ::c_int = 3;
-pub const NT_PRXREG: ::c_int = 4;
-pub const NT_TASKSTRUCT: ::c_int = 4;
-pub const NT_PLATFORM: ::c_int = 5;
-pub const NT_AUXV: ::c_int = 6;
-pub const NT_GWINDOWS: ::c_int = 7;
-pub const NT_ASRS: ::c_int = 8;
-pub const NT_PSTATUS: ::c_int = 10;
-pub const NT_PSINFO: ::c_int = 13;
-pub const NT_PRCRED: ::c_int = 14;
-pub const NT_UTSNAME: ::c_int = 15;
-pub const NT_LWPSTATUS: ::c_int = 16;
-pub const NT_LWPSINFO: ::c_int = 17;
-pub const NT_PRFPXREG: ::c_int = 20;
-
 pub const ELFOSABI_ARM_AEABI: u8 = 64;
 
 // linux/sched.h
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
index a7815ddfc3c1..54826b015212 100644
--- a/src/unix/linux_like/linux/mod.rs
+++ b/src/unix/linux_like/linux/mod.rs
@@ -1598,6 +1598,25 @@ cfg_if! {
     }
 }
 
+// elf.h
+pub const NT_PRSTATUS: ::c_int = 1;
+pub const NT_PRFPREG: ::c_int = 2;
+pub const NT_FPREGSET: ::c_int = 2;
+pub const NT_PRPSINFO: ::c_int = 3;
+pub const NT_PRXREG: ::c_int = 4;
+pub const NT_TASKSTRUCT: ::c_int = 4;
+pub const NT_PLATFORM: ::c_int = 5;
+pub const NT_AUXV: ::c_int = 6;
+pub const NT_GWINDOWS: ::c_int = 7;
+pub const NT_ASRS: ::c_int = 8;
+pub const NT_PSTATUS: ::c_int = 10;
+pub const NT_PSINFO: ::c_int = 13;
+pub const NT_PRCRED: ::c_int = 14;
+pub const NT_UTSNAME: ::c_int = 15;
+pub const NT_LWPSTATUS: ::c_int = 16;
+pub const NT_LWPSINFO: ::c_int = 17;
+pub const NT_PRFPXREG: ::c_int = 20;
+
 pub const RUSAGE_CHILDREN: ::c_int = -1;
 pub const L_tmpnam: ::c_uint = 20;
 pub const _PC_LINK_MAX: ::c_int = 0;