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

membarrier flags constants addition #3039

Merged
merged 1 commit into from
Mar 3, 2023

Conversation

devnexen
Copy link
Contributor

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Dec 17, 2022

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@devnexen devnexen force-pushed the membarrier_flags_linux branch 3 times, most recently from 34c46a6 to ff9fd20 Compare December 17, 2022 19:38
@JohnTitor
Copy link
Member

Thank you! @bors r+

@bors
Copy link
Contributor

bors commented Dec 20, 2022

📌 Commit ff9fd20 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 20, 2022

⌛ Testing commit ff9fd20 with merge 40024e4...

bors added a commit that referenced this pull request Dec 20, 2022
@bors
Copy link
Contributor

bors commented Dec 20, 2022

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

Seems our musl image is too old, again 😢 Feel free to ignore them on musl.

   cargo:warning=/checkout/target/mipsel-unknown-linux-musl/debug/build/libc-test-c30ad3b5c559e4de/out/main.c:25965:87: error: 'MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ' undeclared here (not in a function); did you mean 'MEMBARRIER_CMD_PRIVATE_EXPEDITED'?
  cargo:warning=             static const int __test_const_MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ_val = MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ;
  cargo:warning=                                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  cargo:warning=                                                                                       MEMBARRIER_CMD_PRIVATE_EXPEDITED
  cargo:warning=/checkout/target/mipsel-unknown-linux-musl/debug/build/libc-test-c30ad3b5c559e4de/out/main.c:25971:96: error: 'MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ' undeclared here (not in a function); did you mean 'MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED'?
  cargo:warning=             static const int __test_const_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ_val = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ;
  cargo:warning=                                                                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  cargo:warning=                                                                                                MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED
  cargo:warning=cc1: error: unrecognized command line option '-Wno-unknown-warning-option' [-Werror]
  cargo:warning=cc1: error: unrecognized command line option '-Wno-address-of-packed-member' [-Werror]

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 8, 2023

📌 Commit 1c918f0 has been approved by JohnTitor

It is now in the queue for this repository.

bors added a commit that referenced this pull request Jan 8, 2023
@bors
Copy link
Contributor

bors commented Jan 8, 2023

⌛ Testing commit 1c918f0 with merge 7b5f915...

@bors
Copy link
Contributor

bors commented Jan 8, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

The failure seems valid:

  cargo:warning=/checkout/target/i686-linux-android/debug/build/libc-test-6f0facd5549984ca/out/main.c:33547:87: error: use of undeclared identifier 'MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ'; did you mean 'MEMBARRIER_CMD_PRIVATE_EXPEDITED'?
  cargo:warning=            static const int __test_const_MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ_val = MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ;
  cargo:warning=                                                                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  cargo:warning=                                                                                      MEMBARRIER_CMD_PRIVATE_EXPEDITED
  cargo:warning=/android/ndk-i686/bin/../sysroot/usr/include/linux/membarrier.h:26:3: note: 'MEMBARRIER_CMD_PRIVATE_EXPEDITED' declared here
  cargo:warning=  MEMBARRIER_CMD_PRIVATE_EXPEDITED = (1 << 3),
  cargo:warning=  ^
  cargo:warning=/checkout/target/i686-linux-android/debug/build/libc-test-6f0facd5549984ca/out/main.c:33553:96: error: use of undeclared identifier 'MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ'; did you mean 'MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED'?
  cargo:warning=            static const int __test_const_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ_val = MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ;
  cargo:warning=                                                                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  cargo:warning=                                                                                               MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED
  cargo:warning=/android/ndk-i686/bin/../sysroot/usr/include/linux/membarrier.h:27:3: note: 'MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED' declared here
  cargo:warning=  MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = (1 << 4),
  cargo:warning=  ^
  cargo:warning=2 errors generated.

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 28, 2023

📌 Commit f506ab9 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 28, 2023

⌛ Testing commit f506ab9 with merge bed7e79...

bors added a commit that referenced this pull request Jan 28, 2023
@bors
Copy link
Contributor

bors commented Jan 28, 2023

💔 Test failed - checks-actions

@@ -1768,6 +1769,8 @@ fn test_android(target: &str) {
// GRND_INSECURE was added in platform-tools-30.0.0
"GRND_INSECURE" => true,

"MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ" | "MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ" => true,
Copy link
Member

Choose a reason for hiding this comment

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

A comment explaining why it's ignored would be helpful.

Comment on lines +3431 to +3492
if name.starts_with("MEMBARRIER_CMD_REGISTER")
|| name.starts_with("MEMBARRIER_CMD_PRIVATE")
{
return true;
}
Copy link
Member

Choose a reason for hiding this comment

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

Ditto

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 3, 2023

📌 Commit 279d932 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 3, 2023

⌛ Testing commit 279d932 with merge b8e2476...

@bors
Copy link
Contributor

bors commented Mar 3, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing b8e2476 to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Mar 3, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing b8e2476 to master...

@bors bors merged commit b8e2476 into rust-lang:master Mar 3, 2023
@bors
Copy link
Contributor

bors commented Mar 3, 2023

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

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.

None yet

4 participants