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.

Sign up for GitHub

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

[0.2] Backports #4006

Merged
merged 11 commits into from
Nov 7, 2024
Merged

[0.2] Backports #4006

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2518f3e
FreeBSD: Add ucontext_t, mcontext_t for all archs (#3848)
nathaniel-bennett Oct 1, 2024
fabc6d1
Fix alignment of uc_ucontext fields on arm64 android (#3894)
CUB3D Sep 24, 2024
39e6c09
Fix the definition of mc_fpstate on FreeBSD x86
asomers Sep 23, 2024
c8a0faf
Fix alignment of mcontext_t on FreeBSD x86
asomers Sep 27, 2024
b5aeb93
Gate FreeBSD `mcontext_t` under `libc_align`
tgross35 Nov 6, 2024
36b0349
Fix the definition of domainset_t in 32-bit FreeBSD
asomers Sep 23, 2024
d56110e
Fix definition of TIOCTIMESTAMP on FreeBSD x86
asomers Sep 27, 2024
edb6412
Fix the definition of several BPF related ioctls on 32-bit FreeBSD
asomers Sep 27, 2024
8286345
Fix definition of clock_t on FreeBSD x86, powerpc, powerpc64, and arm.
asomers Sep 27, 2024
255b039
Fix size of struct kinfo_file on 32-bit FreeBSD
asomers Sep 27, 2024
073c7b4
Fix definition of FIODGNAME on 32-bit FreeBSD
asomers Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix definition of TIOCTIMESTAMP on FreeBSD x86 
/~https://github.com/freebsd/freebsd-src/blob/main/sys/sys/ttycom.h

(backport <#3948>)
(cherry picked from commit 60cf16d)
  • Loading branch information
@asomers @tgross35
asomers authored and tgross35 committed Nov 7, 2024
commit d56110e5ad2365f880e42129bdb829b733c9635a
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/dragonfly/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,6 +1462,7 @@ pub const TIOCISPTMASTER: ::c_ulong = 0x20007455;
pub const TIOCMODG: ::c_ulong = 0x40047403;
pub const TIOCMODS: ::c_ulong = 0x80047404;
pub const TIOCREMOTE: ::c_ulong = 0x80047469;
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;

// Constants used by "at" family of system calls.
pub const AT_FDCWD: ::c_int = 0xFFFAFDCD; // invalid file descriptor
Expand Down
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/freebsd/aarch64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,4 @@ cfg_if! {

pub const MAP_32BIT: ::c_int = 0x00080000;
pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/freebsd/arm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ cfg_if! {

pub const MAP_32BIT: ::c_int = 0x00080000;
pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/freebsd/powerpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,4 @@ cfg_if! {

pub const MAP_32BIT: ::c_int = 0x00080000;
pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,4 @@ cfg_if! {

pub const MAP_32BIT: ::c_int = 0x00080000;
pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/freebsd/riscv64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,4 @@ cfg_if! {

pub const MAP_32BIT: ::c_int = 0x00080000;
pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/freebsd/x86.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,4 @@ cfg_if! {
pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4

pub const KINFO_FILE_SIZE: ::c_int = 1392;
pub const TIOCTIMESTAMP: ::c_ulong = 0x40087459;
2 changes: 2 additions & 0 deletions src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ pub const _MC_FPOWNED_PCB: c_long = 0x20002;

pub const KINFO_FILE_SIZE: ::c_int = 1392;

pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;

cfg_if! {
if #[cfg(libc_align)] {
mod align;
Expand Down
1 change: 0 additions & 1 deletion src/unix/bsd/freebsdlike/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,6 @@ pub const TIOCGETD: ::c_ulong = 0x4004741a;
pub const TIOCSETD: ::c_ulong = 0x8004741b;
pub const TIOCGDRAINWAIT: ::c_ulong = 0x40047456;
pub const TIOCSDRAINWAIT: ::c_ulong = 0x80047457;
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
pub const TIOCMGDTRWAIT: ::c_ulong = 0x4004745a;
pub const TIOCMSDTRWAIT: ::c_ulong = 0x8004745b;
pub const TIOCDRAIN: ::c_ulong = 0x2000745e;
Expand Down