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

[0.2] Backports #4014

Merged
merged 3 commits into from
Nov 7, 2024
Merged

[0.2] Backports #4014

merged 3 commits into from
Nov 7, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 7, 2024

tgross35 and others added 3 commits November 6, 2024 20:20
Since [1], the `wasm32-wasi` target is no longer supported (replaced by
`wasm32-wasip1` and `wasm32-wasip2`). This has made it into the latest
nightly, so remove it from our testing.

[1]: rust-lang/rust#132562

(backport <rust-lang#4013>)
(cherry picked from commit a4d3ca8)
In Linux 6.9 a new ioctl for epoll was added:
https://man.archlinux.org/man/ioctl_eventpoll.2.en

Add support for it. The ioctls constants are padded to
64 bits alignment even on 32 bits machines.

Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>

(backport <rust-lang#3922>)
(cherry picked from commit fb58c01)

Signed-off-by: Trevor Gross <tmgross@umich.edu>
Snippet from `host_info.h`:

```
struct host_cpu_load_info {             /* number of ticks while running... */
    natural_t       cpu_ticks[CPU_STATE_MAX]; /* ... in the given mode */
};

typedef struct host_cpu_load_info       host_cpu_load_info_data_t;
typedef struct host_cpu_load_info       *host_cpu_load_info_t;
```

(backport <rust-lang#3916>)
(cherry picked from commit f31fe2a)
@rustbot
Copy link
Collaborator

rustbot commented Nov 7, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@tgross35 tgross35 added this pull request to the merge queue Nov 7, 2024
Merged via the queue into rust-lang:libc-0.2 with commit e009851 Nov 7, 2024
53 checks passed
@tgross35 tgross35 deleted the backport-swiss-chard branch November 7, 2024 04:04
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.

5 participants