Skip to content

Commit c451445

Browse files
authored
Merge pull request #4098 from tgross35/sync-build-main
Sync `libc-test/build.rs` with `libc-0.2` where possible
2 parents 0e5e6e2 + 90b2874 commit c451445

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

.release-plz.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[workspace]
2+
git_release_name = "{{ version }}"
3+
git_tag_name = "{{ version }}"

libc-test/build.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -2617,6 +2617,7 @@ fn test_freebsd(target: &str) {
26172617
match name {
26182618
// This is introduced in FreeBSD 14.1
26192619
"execvpe" => true,
2620+
26202621
// The `uname` function in the `utsname.h` FreeBSD header is a C
26212622
// inline function (has no symbol) that calls the `__xuname` symbol.
26222623
// Therefore the function pointer comparison does not make sense for it.
@@ -3704,17 +3705,19 @@ fn test_linux(target: &str) {
37043705
if musl && (ty.ends_with("64") || ty.ends_with("64_t")) {
37053706
return true;
37063707
}
3708+
37073709
// FIXME: sparc64 CI has old headers
37083710
if sparc64 && (ty == "uinput_ff_erase" || ty == "uinput_abs_setup") {
37093711
return true;
37103712
}
3711-
// FIXME(https://github.com/rust-lang/libc/issues/1558): passing by
3712-
// value corrupts the value for reasons not understood.
3713+
3714+
// FIXME(#1558): passing by value corrupts the value for reasons not understood.
37133715
if (gnu && sparc64) && (ty == "ip_mreqn" || ty == "hwtstamp_config") {
37143716
return true;
37153717
}
3716-
// FIXME: pass by value for structs that are not an even 32/64 bits on
3717-
// big-endian systems corrupts the value for unknown reasons.
3718+
3719+
// FIXME(rust-lang/rust#43894): pass by value for structs that are not an even 32/64 bits
3720+
// on big-endian systems corrupts the value for unknown reasons.
37183721
if (sparc64 || ppc || ppc64 || s390x)
37193722
&& (ty == "sockaddr_pkt"
37203723
|| ty == "tpacket_auxdata"
@@ -3725,6 +3728,7 @@ fn test_linux(target: &str) {
37253728
{
37263729
return true;
37273730
}
3731+
37283732
// FIXME: musl doesn't compile with `struct fanout_args` for unknown reasons.
37293733
if musl && ty == "fanout_args" {
37303734
return true;

0 commit comments

Comments
 (0)