Skip to content

Conversation

@Takashiidobe
Copy link
Contributor

@Takashiidobe Takashiidobe commented Nov 29, 2025

Description

This PR adds some of the newer m68k linux syscalls.

Unsure why I have merge conflicts since the diff looks clean on the files changed tab.

Sources

The new syscalls in linux/m68k

Checklist

  • Relevant tests in libc-test/semver have been updated
  • No placeholder or unstable values like *LAST or *MAX are
    included (see #3131)
  • Tested locally (cd libc-test && cargo test --target mytarget);
    especially relevant for platforms that may not be checked in CI

@Takashiidobe Takashiidobe changed the title add syscalls 451-469 for m68k linux m68k: add syscalls 451-469 for linux Nov 29, 2025
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 30, 2025
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but please rebase

@tgross35
Copy link
Contributor

Unsure why I have merge conflicts since the diff looks clean on the files changed tab.

It looks like this is based on 600e1d1, which was from about a year ago. This file doesn't get touched much, but there are a handful of changes since then.

@Takashiidobe Takashiidobe force-pushed the takashiidobe/add-missing-m68k-syscalls branch from 85f8bdf to 0eba32e Compare November 30, 2025 13:07
@rustbot
Copy link
Collaborator

rustbot commented Nov 30, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Takashiidobe
Copy link
Contributor Author

Unsure why I have merge conflicts since the diff looks clean on the files changed tab.

It looks like this is based on 600e1d1, which was from about a year ago. This file doesn't get touched much, but there are a handful of changes since then.

Ah right. I haven't upgraded my fork in a year 🤦. Fixed up.

Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@tgross35 tgross35 added this pull request to the merge queue Nov 30, 2025
Merged via the queue into rust-lang:main with commit b841a78 Nov 30, 2025
50 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-gnu O-linux O-unix stable-nominated This PR should be considered for cherry-pick to libc's stable release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants