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

Add missing CPU_* macros to android, and sync with Linux #2470

Merged
merged 1 commit into from
Oct 21, 2021

Conversation

joshtriplett
Copy link
Member

Linux had the full set of CPU_* macros, but Android missed a few. Add
the missing ones: CPU_ALLOC_SIZE, CPU_COUNT_S, and CPU_COUNT.

Sync the definitions more closely with the Linux versions, so that
they're easier to keep in sync. The only differences now are the field
name: bits for Linux vs __bits for Android.

Linux had the full set of CPU_* macros, but Android missed a few. Add
the missing ones: CPU_ALLOC_SIZE, CPU_COUNT_S, and CPU_COUNT.

Sync the definitions more closely with the Linux versions, so that
they're easier to keep in sync. The only differences now are the field
name: bits for Linux vs __bits for Android.
@rust-highfive
Copy link

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

@Amanieu
Copy link
Member

Amanieu commented Oct 21, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Oct 21, 2021

📌 Commit 59eb759 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Oct 21, 2021

⌛ Testing commit 59eb759 with merge 21ad06f...

@bors
Copy link
Contributor

bors commented Oct 21, 2021

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing 21ad06f to master...

@bors bors merged commit 21ad06f into rust-lang:master Oct 21, 2021
@joshtriplett joshtriplett deleted the cpu-macros branch October 24, 2021 15:49
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.

4 participants