musl: fix utmpx struct layout

This ut_session has changed from long to int + padding in newer
versions. This was already reflected on loongarch64 and ohos - this
commit adds this change, and re-enables the test, when musl_v1_2_3 is
set.

Co-authored-by: Ariadne Conill <ariadne@dereferenced.org>

Author: xbjfk

libc-test/build.rs

@@ -3658,6 +3658,8 @@ fn test_linux(target: &str) {
 
     let musl_v1_2_3 = env::var("RUST_LIBC_UNSTABLE_MUSL_1_2_3").is_ok();
 
+    let old_musl = musl && !musl_v1_2_3;
+
     let mut cfg = ctest_cfg();
     if musl_v1_2_3 {
         cfg.cfg("musl_v1_2_3", None);
@@ -4787,8 +4789,8 @@ fn test_linux(target: &str) {
         (struct_ == "statvfs64" && field == "__f_spare") ||
         // the `xsk_tx_metadata_union` field is an anonymous union
         (struct_ == "xsk_tx_metadata" && field == "xsk_tx_metadata_union") ||
-        // FIXME(musl): After musl 1.2.0, the type becomes `int` instead of `long`.
-        (struct_ == "utmpx" && field == "ut_session")
+        // After musl 1.2.0, the type becomes `int` instead of `long`.
+        (old_musl && struct_ == "utmpx" && field == "ut_session")
     });
 
     cfg.skip_roundtrip(move |s| match s {

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

@@ -440,13 +440,6 @@ s_no_extra_traits! {
         pub __reserved: [c_char; 256],
     }
 
-    // FIXME(musl): musl added paddings and adjusted
-    // layout in 1.2.0 but our CI is still 1.1.24.
-    // So, I'm leaving some fields as cfg for now.
-    // ref. https://github.com/bminor/musl/commit/
-    // 1e7f0fcd7ff2096904fd93a2ee6d12a2392be392
-    //
-    // OpenHarmony uses the musl 1.2 layout.
     pub struct utmpx {
         pub ut_type: c_short,
         __ut_pad1: c_short,
@@ -457,31 +450,26 @@ s_no_extra_traits! {
         pub ut_host: [c_char; 256],
         pub ut_exit: __exit_status,
 
-        #[cfg(target_env = "musl")]
-        #[cfg(not(target_arch = "loongarch64"))]
+        // loongarch64 and ohos already use the new ABI
+        #[cfg(not(any(target_arch = "loongarch64", target_env = "ohos", musl_v1_2_3)))]
+        #[deprecated(
+            since = "0.2.173",
+            note = "The ABI of this field has changed from c_long to c_int with padding, \
+                we'll follow that change in the future release as part of an effort to \
+                update the musl API to reflect upstream. See #4443 for more info."
+        )]
         pub ut_session: c_long,
 
-        #[cfg(target_env = "musl")]
-        #[cfg(target_arch = "loongarch64")]
-        pub ut_session: c_int,
-
-        #[cfg(target_env = "musl")]
-        #[cfg(target_arch = "loongarch64")]
+        #[cfg(any(target_arch = "loongarch64", target_env = "ohos", musl_v1_2_3))]
+        #[cfg(not(target_endian = "little"))]
         __ut_pad2: c_int,
 
-        #[cfg(target_env = "ohos")]
-        #[cfg(target_endian = "little")]
+        #[cfg(any(target_arch = "loongarch64", target_env = "ohos", musl_v1_2_3))]
         pub ut_session: c_int,
-        #[cfg(target_env = "ohos")]
-        #[cfg(target_endian = "little")]
-        __ut_pad2: c_int,
 
-        #[cfg(target_env = "ohos")]
-        #[cfg(not(target_endian = "little"))]
+        #[cfg(any(target_arch = "loongarch64", target_env = "ohos", musl_v1_2_3))]
+        #[cfg(target_endian = "little")]
         __ut_pad2: c_int,
-        #[cfg(target_env = "ohos")]
-        #[cfg(not(target_endian = "little"))]
-        pub ut_session: c_int,
 
         pub ut_tv: crate::timeval,
         pub ut_addr_v6: [c_uint; 4],