File tree 2 files changed +13
-5
lines changed
src/unix/linux_like/linux/musl/b64/aarch64
2 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -3648,7 +3648,6 @@ fn test_linux(target: &str) {
3648
3648
let x32 = target. contains ( "x32" ) ;
3649
3649
let x86_32 = target. contains ( "i686" ) ;
3650
3650
let x86_64 = target. contains ( "x86_64" ) ;
3651
- let aarch64_musl = aarch64 && musl;
3652
3651
let gnueabihf = target. contains ( "gnueabihf" ) ;
3653
3652
let x86_64_gnux32 = target. contains ( "gnux32" ) && x86_64;
3654
3653
let riscv64 = target. contains ( "riscv64" ) ;
@@ -4761,8 +4760,8 @@ fn test_linux(target: &str) {
4761
4760
"sched_ss_init_budget" ,
4762
4761
"sched_ss_max_repl" ,
4763
4762
] . contains ( & field) && musl) ||
4764
- // FIXME(musl): After musl 1.1.24, the type becomes `int` instead of `unsigned short`.
4765
- ( struct_ == "ipc_perm" && field == "__seq" && aarch64_musl ) ||
4763
+ // After musl 1.1.24, the type becomes `int` instead of `unsigned short`.
4764
+ ( struct_ == "ipc_perm" && field == "__seq" && old_musl && aarch64 ) ||
4766
4765
// glibc uses unnamed fields here and Rust doesn't support that yet
4767
4766
( struct_ == "timex" && field. starts_with ( "__unused" ) ) ||
4768
4767
// FIXME(linux): It now takes mode_t since glibc 2.31 on some targets.
Original file line number Diff line number Diff line change 74
74
pub cuid: crate :: uid_t,
75
75
pub cgid: crate :: gid_t,
76
76
pub mode: crate :: mode_t,
77
+
78
+ #[ cfg( musl_v1_2_3) ]
79
+ pub __seq: c_int,
80
+ #[ cfg( not( musl_v1_2_3) ) ]
81
+ #[ deprecated(
82
+ since = "0.2.173" ,
83
+ note = "The type of this field has changed from c_ushort to c_int,
84
+ we'll follow that change in the future release."
85
+ ) ]
77
86
pub __seq: c_ushort,
78
- __unused1: c_ulong ,
79
- __unused2: c_ulong ,
87
+ __unused1: c_long ,
88
+ __unused2: c_long ,
80
89
}
81
90
82
91
pub struct ucontext_t {
You can’t perform that action at this time.
0 commit comments