Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream a few more constants from rustix. #3173

Merged
merged 1 commit into from
Apr 18, 2023

Conversation

sunfishcode
Copy link
Member

@sunfishcode sunfishcode commented Mar 28, 2023

Add a definition of CIBAUD for powerpc and powerpc64 on glibc.

And a definition for RLIM64_INFINITY on linux_like platforms.

@rustbot
Copy link
Collaborator

rustbot commented Mar 28, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Mar 31, 2023

Some changes occurred in solarish module

cc @jclulow, @pfmooney

@JohnTitor
Copy link
Member

@bors r+
Thanks!

@bors
Copy link
Contributor

bors commented Apr 3, 2023

📌 Commit b5aaa6f has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 3, 2023

⌛ Testing commit b5aaa6f with merge df60243...

bors added a commit that referenced this pull request Apr 3, 2023
Upstream a few more constants from rustix.

Add a definition of `CIBAUD` for powerpc and powerpc64 on glibc.

And a definition for `RLIM64_INFINITY` on linux_like platforms.
@bors
Copy link
Contributor

bors commented Apr 3, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 4, 2023

📌 Commit deec65c has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 4, 2023

⌛ Testing commit deec65c with merge ff90c47...

bors added a commit that referenced this pull request Apr 4, 2023
Upstream a few more constants from rustix.

Add a definition of `CIBAUD` for powerpc and powerpc64 on glibc.

And a definition for `RLIM64_INFINITY` on linux_like platforms.
@bors
Copy link
Contributor

bors commented Apr 4, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

JohnTitor commented Apr 12, 2023

Some jobs failed, could you check? It'd be great if you could squash commits into one once it's done.
@rustbot author

@sunfishcode
Copy link
Member Author

Fixed the declaration of rlim64_t on i686-linux-android, and squashed into a single commit.

@sunfishcode

This comment was marked as resolved.

@rustbot
Copy link
Collaborator

rustbot commented Apr 15, 2023

Could not assign reviewer from: JohnTitor.
User(s) JohnTitor are either the PR author or are already assigned, and there are no other candidates.
Use r? to specify someone else to assign.

@bors
Copy link
Contributor

bors commented Apr 15, 2023

⌛ Testing commit 5597f33 with merge 1bffdc6...

bors added a commit that referenced this pull request Apr 15, 2023
Upstream a few more constants from rustix.

Add a definition of `CIBAUD` for powerpc and powerpc64 on glibc.

And a definition for `RLIM64_INFINITY` on linux_like platforms.
@bors
Copy link
Contributor

bors commented Apr 15, 2023

💔 Test failed - checks-cirrus-freebsd-14

@sunfishcode
Copy link
Member Author

This PR doesn't touch any files used by FreeBSD, but CI is failing on FreeBSD like this:

RUNNING ALL TESTS
bad tcp_info size: rust: 240 (0xf0) != c 256 (0x100)
bad tcp_info align: rust: 4 (0x4) != c 8 (0x8)
bad field offset __tcpi_pad of tcp_info: rust: 164 (0xa4) != c 176 (0xb0)
bad field type __tcpi_pad of tcp_info: rust: 0x2b1529dd778c != c 0x2b1529dd7798
size of struct tcp_info is 256 in C and 240 in Rust
thread 'main' panicked at 'some tests failed', /tmp/cirrus-ci-build/target/x86_64-unknown-freebsd/debug/build/libc-test-6b8396ef363a1463/out/main.rs:12:21

@JohnTitor
Copy link
Member

The issue is now fixed on master, @bors retry

@bors
Copy link
Contributor

bors commented Apr 17, 2023

⌛ Testing commit 5597f33 with merge e499676...

bors added a commit that referenced this pull request Apr 17, 2023
Upstream a few more constants from rustix.

Add a definition of `CIBAUD` for powerpc and powerpc64 on glibc.

And a definition for `RLIM64_INFINITY` on linux_like platforms.
@bors
Copy link
Contributor

bors commented Apr 17, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

Seems there's a typo in cfg.

 - And a definition for `RLIM64_INFINITY` on linux_like platforms.
 - Declare the `sync` function on Android and solarish.
   - Solaris: https://docs.oracle.com/cd/E26502_01/html/E29032/sync-2.html
   - Illumos: https://illumos.org/man/2/sync
 - Enable `FICLONE` and `FICLONERANGE` on more architectures.
@sunfishcode
Copy link
Member Author

Oops, fixed.

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 18, 2023

📌 Commit 0ba1fc4 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 18, 2023

⌛ Testing commit 0ba1fc4 with merge 8077351...

@bors
Copy link
Contributor

bors commented Apr 18, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 8077351 to master...

@bors bors merged commit 8077351 into rust-lang:master Apr 18, 2023
10 of 11 checks passed
sunfishcode added a commit to sunfishcode/libc that referenced this pull request Apr 21, 2023
PR rust-lang#3173 added definitions of `FICLONE` for mips and power to
a generic file, however mips and power have their own versions of this
file, so move their `FICLONE` definitions into their own files.
bors added a commit that referenced this pull request Apr 22, 2023
…ohnTitor

Define `FICLONE` on mips and power.

PR #3173 added definitions of `FICLONE` for mips and power to a generic file, however mips and power have their own versions of this file, so move their `FICLONE` definitions into their own files.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants