Skip to content

Commit

Permalink
Merge pull request rust-lang#4098 from tgross35/sync-build-main
Browse files Browse the repository at this point in the history
Sync `libc-test/build.rs` with `libc-0.2` where possible
  • Loading branch information
tgross35 authored Nov 18, 2024
2 parents 0e5e6e2 + 90b2874 commit c451445
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .release-plz.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[workspace]
git_release_name = "{{ version }}"
git_tag_name = "{{ version }}"
12 changes: 8 additions & 4 deletions libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2617,6 +2617,7 @@ fn test_freebsd(target: &str) {
match name {
// This is introduced in FreeBSD 14.1
"execvpe" => true,

// The `uname` function in the `utsname.h` FreeBSD header is a C
// inline function (has no symbol) that calls the `__xuname` symbol.
// Therefore the function pointer comparison does not make sense for it.
Expand Down Expand Up @@ -3704,17 +3705,19 @@ fn test_linux(target: &str) {
if musl && (ty.ends_with("64") || ty.ends_with("64_t")) {
return true;
}

// FIXME: sparc64 CI has old headers
if sparc64 && (ty == "uinput_ff_erase" || ty == "uinput_abs_setup") {
return true;
}
// FIXME(https://github.com/rust-lang/libc/issues/1558): passing by
// value corrupts the value for reasons not understood.

// FIXME(#1558): passing by value corrupts the value for reasons not understood.
if (gnu && sparc64) && (ty == "ip_mreqn" || ty == "hwtstamp_config") {
return true;
}
// FIXME: pass by value for structs that are not an even 32/64 bits on
// big-endian systems corrupts the value for unknown reasons.

// FIXME(rust-lang/rust#43894): pass by value for structs that are not an even 32/64 bits
// on big-endian systems corrupts the value for unknown reasons.
if (sparc64 || ppc || ppc64 || s390x)
&& (ty == "sockaddr_pkt"
|| ty == "tpacket_auxdata"
Expand All @@ -3725,6 +3728,7 @@ fn test_linux(target: &str) {
{
return true;
}

// FIXME: musl doesn't compile with `struct fanout_args` for unknown reasons.
if musl && ty == "fanout_args" {
return true;
Expand Down

0 comments on commit c451445

Please sign in to comment.