[0.2] Backports #4006
Merged
[0.2] Backports #4006
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @JohnTitor rustbot has assigned @JohnTitor. Use |
tgross35
force-pushed
the
backport-spinach
branch
3 times, most recently
from
3f5b9fd to
4deac8e
Compare
tgross35
force-pushed
the
backport-spinach
branch
6 times, most recently
from
73a04f0 to
49e82b6
Compare
|
Included #4019 so this can merge without conflict. |
[ gate ppc under `cfg(libc_align)` and adjust `Debug` implementations to meet msrv - Trevor ] (backport <rust-lang#3848>) (cherry picked from commit 2053d5b)
[ change `core` to `::core` and move ucontext_t to s_no_extra_traits for backport - Trevor ] (backport <rust-lang#3894>) (cherry picked from commit 707d32c)
The definition added in b811b70 was technically wrong even though the type size was correct. It was probably defined this way because earlier versions of Rust had difficulty with fixed-size arrays of size greater than 32. This change is necessary for CI to pass on x86 FreeBSD. https://github.com/freebsd/freebsd-src/blob/main/sys/x86/include/ucontext.h (backport <rust-lang#3948>) (cherry picked from commit ad2d864)
https://github.com/freebsd/freebsd-src/blob/main/sys/x86/include/ucontext.h (backport <rust-lang#3948>) (cherry picked from commit 908fc71)
Enable this backport by just dropping support for FreeBSD mcontext_t without `libc_align`, i.e. with Rust < 1.25 (2018). This is sufficiently niche that it is not worth adding a new `align` module.
It's always had the wrong size, but apparently never been tested on 32-bit FreeBSD. In addition to fixing its size, it ought to be moved info freebsd/mod.rs . Otherwise it's pretty much inaccessible to everyone. https://github.com/freebsd/freebsd-src/blob/main/sys/sys/_domainset.h (backport <rust-lang#3948>) (cherry picked from commit 19d213d)
https://github.com/freebsd/freebsd-src/blob/main/sys/sys/ttycom.h (backport <rust-lang#3948>) (cherry picked from commit 60cf16d)
https://github.com/freebsd/freebsd-src/blob/main/sys/net/bpf.h (backport <rust-lang#3948>) (cherry picked from commit cfbc120)
https://github.com/freebsd/freebsd-src/blob/main/sys/arm/include/_types.h https://github.com/freebsd/freebsd-src/blob/main/sys/arm64/include/_types.h https://github.com/freebsd/freebsd-src/blob/main/sys/powerpc/include/_types.h https://github.com/freebsd/freebsd-src/blob/main/sys/riscv/include/_types.h https://github.com/freebsd/freebsd-src/blob/main/sys/x86/include/_types.h (backport <rust-lang#3948>) (cherry picked from commit 6605f08)
https://github.com/freebsd/freebsd-src/blob/main/sys/sys/user.h (backport <rust-lang#3948>) (cherry picked from commit f2b8b8f)
https://github.com/freebsd/freebsd-src/blob/main/sys/sys/filio.h (backport <rust-lang#3948>) (cherry picked from commit 0b6cab8)
tgross35
force-pushed
the
backport-spinach
branch
from
49e82b6 to
073c7b4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport the following: